commit 79e7b4a1972f2946c5f346fe8c39656cc223fbfb parent 6c38ab6f0499537df9260dfaca31e2f92dec1aeb Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 10 Oct 2025 09:39:33 +0000 more whitespace fixes Diffstat:
190 files changed, 1671 insertions(+), 1509 deletions(-)
diff --git a/templates/generic b/templates/generic @@ -15,8 +15,8 @@ {{ value_error(pkg_source) }} {%- endif -%} {% endblock %} -{%- block script %} -{%- block prepare %} +{%- block script -%} +{% block prepare -%} prefix={{versions}}/$pthbs_package dest=${pthbs_destdir%/}${prefix} {% if src_dir is defined -%} @@ -28,20 +28,20 @@ cd '{{shortname}}' {% endif -%} {% endblock %} -{%- block configure %} +{% block configure -%} {% endblock %} -{%- block build_and_install %} -{%- block build %} +{% block build_and_install -%} +{% block build -%} {{make}} {% endblock %} -{%- block install %} +{%- block install -%} make DESTDIR="$pthbs_destdir" install {% endblock %} {% endblock %} -{%- block check %} +{% block check -%} {% endblock %} -{%- block finish %} +{% block finish -%} {% endblock %} {%- endblock %} diff --git a/templates/skaware b/templates/skaware @@ -1,10 +1,10 @@ {% extends "genlinks" %} -{%- block template_deps %} -{{ super() }} +{%- block template_deps -%} +{{ super() -}} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("skalibs")}} -{%- endblock %} +{% endblock %} {%- block configure %} ./configure {% block configure_args %}{% endblock %} \ --prefix="$prefix" \ diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 -#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 +#+pthbs-banginstall.f1d88327c7cccb70afb2ea7abeb1eb5339d4a9d90a276e86ae542430fac2abb3 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'aat' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -33,6 +33,7 @@ mv -v data.awk "$pkgdir/" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'abduco' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -36,13 +36,13 @@ sed 's/^/> /' config.mk make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install # the Makefile hardcodes 'bin' despite configure undersanding BINDIR mv "${dest}/bin" "${dest}/command" + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -59,6 +59,7 @@ check_static() { check_static command/abduco + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/acl b/variants/ccx-x86_64/acl @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 -#+attr.11e7f0ac6d7f0d3062c35a9df9314bb4834a468c71cbb69dca08e8b5bf9c4256 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef +#+attr.59c98c884db875d581c45273c5f7d1f4177ebbcd2e589b733cc2d44004978c9f #@untar:-z:sha256:5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c:. @@ -53,25 +53,26 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'acl-2.3.2' + autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/chacl + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/alpine-keys b/variants/ccx-x86_64/alpine-keys @@ -1,19 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'alpine-keys' + mkdir -p "${dest}/keys" mv alpine-keys/keys "${dest}/keys/alpine" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools @@ -1,25 +1,25 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 -#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 -#+zstd.90a7a74d0ca174c3fff868f77b2d35d292cafef51ba5f416940921188ff32212 -#+pkgconf-pkg-config.c6e3db01553a2cc6c92422f8d60a33dcb49f60862cded670dea79029b938af22 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+patch.a1d9db6514fc3a5600450ed53f5bff47a68723947d83df7a176f51c661bbcc57 +#+libressl.e31469de8d9f83ef20211810e18aee71c9dc87e5959467b598ddbc7337775e3e +#+zstd.c5b88cdcbc806df177db0876ad21ad1d5ea04501bd9ee99e3cf506ea244b806d +#+pkgconf-pkg-config.a88fae723a8c20fc2cc0f7c6ecba28ac1f4975b4b48a7074928cb9589b117898 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'apk-tools' patch -p1 <../apk-tools.patch + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -39,6 +39,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) STATIC=y LUA=no V=1 \ PKGCONFIGDIR="$prefix/library/pkgconfig" \ install-static + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -53,6 +54,7 @@ check_static() { fi } check_static command/apk.static + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps @@ -1,20 +1,21 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f -#+libcap.edba12ebbc6125fa22e3ae179b50d06c360eba333b3bdf20d8c82cb3f563f132 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 +#+libcap.6a4a031e0b4fb71a848f4102585d3f87c2c3ada49bdfbd3ad59d204a1d6eb7bc #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'applyuidgid-caps' name='applyuidgid-caps' + CFLAGS="-D_GNU_SOURCE" LDFLAGS="-lskarnet -lcap" + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -27,6 +28,7 @@ install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -43,6 +45,7 @@ check_static() { check_static "command/$name" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:. #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0 @@ -34,15 +34,16 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'argp-standalone-1.5.0' + autotools_config + make -j${JOBS:-1} -l$((1+${JOBS:-1})) libargp.a @@ -54,6 +55,7 @@ install -m 644 argp.h "${dest}/include" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/attr b/variants/ccx-x86_64/attr @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:. @@ -52,13 +52,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'attr-2.5.2' + LDFLAGS=--static autotools_config_static @@ -66,11 +66,11 @@ autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/bison b/variants/ccx-x86_64/bison @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 -#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef +#+flex.b3adc3817f79d8b92ee5c8306836fe62f3b05ae9062d333b9dd2d8a27185fb50 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. @@ -54,13 +54,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'bison-3.8.2' + export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" autotools_config_static --disable-nls @@ -69,14 +69,15 @@ autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install rm -vrf "$pthbs_destdir"/$prefix/lib/charset.alias rmdir -p "$pthbs_destdir"/$prefix/lib || true + check_static command/bison + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/bootstrap.environment b/variants/ccx-x86_64/bootstrap.environment @@ -1,4 +1,4 @@ #!/usr/bin/env pthbs-build -#+busybox.60b492e1fc87ac8497f899148aa74ccc308cca4ae57c84a94b36f122cf4ed752 -#+gnu-make.63505628ae7ef34bfd526ff096c3a87a5bbc187d1d5278663520e990c1620d05 -#+musl-cross-make.ba5394c0e347ba680a13da1f05c91406b6b2fe218739f86d6418d3622e98624d- \ No newline at end of file +#+busybox.96b5ea8576db14a0ea4fc6d29920b5df14afb4e2ff9284c2f6a5c5e64e88254e +#+gnu-make.9ac4f3e6b810118c62fb86ab044f161165fdb7b8ba478bf2adf5951ac07bff86 +#+musl-cross-make.11f47b24c2e41269f1c999eebb1d46eea9a72e2becc4099b9e12ab192180eae7+ \ No newline at end of file diff --git a/variants/ccx-x86_64/busybox b/variants/ccx-x86_64/busybox @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.63505628ae7ef34bfd526ff096c3a87a5bbc187d1d5278663520e990c1620d05 -#+busybox.60b492e1fc87ac8497f899148aa74ccc308cca4ae57c84a94b36f122cf4ed752 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.9ac4f3e6b810118c62fb86ab044f161165fdb7b8ba478bf2adf5951ac07bff86 +#+busybox.96b5ea8576db14a0ea4fc6d29920b5df14afb4e2ff9284c2f6a5c5e64e88254e #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab:busybox/.config diff --git a/variants/ccx-x86_64/busybox-diffutils b/variants/ccx-x86_64/busybox-diffutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-findutils b/variants/ccx-x86_64/busybox-findutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-kbd b/variants/ccx-x86_64/busybox-kbd @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-login b/variants/ccx-x86_64/busybox-login @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox:bootstrap b/variants/ccx-x86_64/busybox:bootstrap @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.ba5394c0e347ba680a13da1f05c91406b6b2fe218739f86d6418d3622e98624d -#+gnu-make.63505628ae7ef34bfd526ff096c3a87a5bbc187d1d5278663520e990c1620d05 +#+musl-cross-make.11f47b24c2e41269f1c999eebb1d46eea9a72e2becc4099b9e12ab192180eae7 +#+gnu-make.9ac4f3e6b810118c62fb86ab044f161165fdb7b8ba478bf2adf5951ac07bff86 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config -mcm=/home/ccx/versions/musl-cross-make.ba5394c0e347ba680a13da1f05c91406b6b2fe218739f86d6418d3622e98624d -make=/home/ccx/versions/gnu-make.63505628ae7ef34bfd526ff096c3a87a5bbc187d1d5278663520e990c1620d05 +mcm=/home/ccx/versions/musl-cross-make.11f47b24c2e41269f1c999eebb1d46eea9a72e2becc4099b9e12ab192180eae7 +make=/home/ccx/versions/gnu-make.9ac4f3e6b810118c62fb86ab044f161165fdb7b8ba478bf2adf5951ac07bff86 export PATH="$mcm/bin:$make/command:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils @@ -1,25 +1,26 @@ #!/usr/bin/env pthbs-build -#+linux.78b3b18bfec0045153b2b0f16a599e05dc07b067a6cecfe922ab68fe461f2157 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+linux.16c0bd71eb077b54cb0a6df8ea540c41c59f4ab1fc1460801e20560c078f006d +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 #@sha256:ea5d8b394f6e9c3a6cf03d6f4cd3a04db5d9209e7d25bc89aa4de5ac4cb0c141:busybox/.config #@git:887295686dbc69e5b2d530f0e6a8dbf94094ac9f:busybox # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'busybox' + export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" 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.78b3b18bfec0045153b2b0f16a599e05dc07b067a6cecfe922ab68fe461f2157" +CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.16c0bd71eb077b54cb0a6df8ea540c41c59f4ab1fc1460801e20560c078f006d" EOF + make V=1 CROSS_COMPILE=x86_64-linux-musl- LDFLAGS=-static HOSTLDFLAGS=-static \ HOSTCC="$CC -static" CC="$CC -static" HOSTCFLAGS=-D_GNU_SOURCE -j${JOBS:-1} @@ -48,6 +49,7 @@ done + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" mv .install-links.new .install-links diff --git a/variants/ccx-x86_64/ca-certificates-wip-donotuse b/variants/ccx-x86_64/ca-certificates-wip-donotuse @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+certdata2pem.02822a7fce42892f7735dd8605305fb31a12657b010cde6a5a35876f54c10811 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+certdata2pem.a1db383ca5817469392a3bdb217597ba020e1f8259fb4329d24a319f86f5b9cc #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'ca-certificates-20241121' + touch blacklist.txt # TODO! certdata2pem @@ -23,6 +23,7 @@ done + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils @@ -1,19 +1,19 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f -#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 +#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 #@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'ccx-utils' + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -59,6 +59,7 @@ do done + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem @@ -1,17 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'certdata2pem' name='certdata2pem' + CFLAGS="-D_GNU_SOURCE" + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -24,6 +25,7 @@ install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -40,6 +42,7 @@ check_static() { check_static "command/$name" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 -#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 +#+pthbs-banginstall.f1d88327c7cccb70afb2ea7abeb1eb5339d4a9d90a276e86ae542430fac2abb3 # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'confz' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -30,6 +30,7 @@ fi + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+busybox-login.372c9ec7edef829f034b2d2d819950214c9c3b218d25b37c02fa7fd61dfc92a6 -#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c -#+ccx-utils.d7071841c5bc68c1b4b19e97755afad512ea8d0e607b182d7943c45c3e3c4229 -#+applyuidgid-caps.bfa3d7590305d3fe051d101c056822ece5038783ef3ada05761aa3a1bfcdd58f -#+easyseccomp.b252fe82a86fab29aa35ebd32129753e686f666bb7311ebf20cd56452470878a -#+mlog.4aacddf4a772148aea1dca6b4434b2afdd88caf58b482501dec770cce7684dfb -#+abduco.bb5757f8a5ef9f0dc4e0ab4dcb7ea107b2e54ccf2ed13971d6bde77011292552 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+busybox-login.7805505d57ef3df0f8147298eb7cd667d27866530fdae007f1b90ed20e511d8d +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 +#+applyuidgid-caps.ca24dbb4d0bb755e3ae35f1a2e875b04c6a116ef8407efaada201edf8e468ea6 +#+easyseccomp.90e8251478a5d9b350961ba612cc0fc11fcbb13145eed904fc2555736d500f6b +#+mlog.c84070d774d221a0b227a54128d534959609f1e717cdd0dca461161a43c4e1a4 +#+abduco.5c28e3bff602311b3c2b06aafae207d129c38c15157705a02a32cf1d5eee95dc #@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 @@ -1,23 +1,23 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 -#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe -#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+alpine-keys.3cfc13320ba0778b72fd75a740d6a0f065ba0ee8a83e08d2cbf1ad72410d726a -#+apk-tools.d49d10fb5e01a7f5e1f7cbeec800e2b96ca00797e370d3aead643fe7b9233f30 -#+xbps.cfd899b2267e63867c9cd239c49374dc36a3cc0ded4b90ad6f525e567f079818 -#+container-bin-image.31115c828c429ca73339d18a97371575056310292e959641a4a88668c53660ec +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 +#+pthbs-banginstall.f1d88327c7cccb70afb2ea7abeb1eb5339d4a9d90a276e86ae542430fac2abb3 +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+alpine-keys.5d43a7a9f0d954fd25fa71962b4fa29d51182dc1d69f408dacc4f1be93dfa8cf +#+apk-tools.95daf04be169cb56312cda5e288923e266612cf9392d907de8b5a8e741616cd1 +#+xbps.f181f3cc00a2553708e1fbd0ca3794177ee42fc6519165fdf461e420f250fdbb +#+container-bin-image.af6503fe2b7f421a8cef3486a24f42ef2f8a1a0eb91f1543a33dfbe0001c7c33 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'containers' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -47,10 +47,10 @@ 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.d49d10fb5e01a7f5e1f7cbeec800e2b96ca00797e370d3aead643fe7b9233f30/command/apk.static' "${dest}/deps/command/" -ln -sf '/home/ccx/versions/xbps.cfd899b2267e63867c9cd239c49374dc36a3cc0ded4b90ad6f525e567f079818/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.95daf04be169cb56312cda5e288923e266612cf9392d907de8b5a8e741616cd1/command/apk.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/xbps.f181f3cc00a2553708e1fbd0ca3794177ee42fc6519165fdf461e420f250fdbb/command/xbps-install.static' "${dest}/deps/command/" -for f in '/home/ccx/versions/alpine-keys.3cfc13320ba0778b72fd75a740d6a0f065ba0ee8a83e08d2cbf1ad72410d726a'/keys/alpine/*/*; do +for f in '/home/ccx/versions/alpine-keys.5d43a7a9f0d954fd25fa71962b4fa29d51182dc1d69f408dacc4f1be93dfa8cf'/keys/alpine/*/*; do test -f "$f" d=$(basename "${f%/*}") mkdir -p "${dest}/deps/keys/alpine/$d" @@ -58,16 +58,17 @@ for f in '/home/ccx/versions/alpine-keys.3cfc13320ba0778b72fd75a740d6a0f065ba0ee done mkdir -p "${dest}/deps/keys/void" -for f in '/home/ccx/versions/xbps.cfd899b2267e63867c9cd239c49374dc36a3cc0ded4b90ad6f525e567f079818'/keys/void/*; do +for f in '/home/ccx/versions/xbps.f181f3cc00a2553708e1fbd0ca3794177ee42fc6519165fdf461e420f250fdbb'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.31115c828c429ca73339d18a97371575056310292e959641a4a88668c53660ec/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.31115c828c429ca73339d18a97371575056310292e959641a4a88668c53660ec/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.31115c828c429ca73339d18a97371575056310292e959641a4a88668c53660ec/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.af6503fe2b7f421a8cef3486a24f42ef2f8a1a0eb91f1543a33dfbe0001c7c33/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.af6503fe2b7f421a8cef3486a24f42ef2f8a1a0eb91f1543a33dfbe0001c7c33/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.af6503fe2b7f421a8cef3486a24f42ef2f8a1a0eb91f1543a33dfbe0001c7c33/container-bin-image' "${dest}/deps/" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c -#+s6-portable-utils.a20039a7da7a366a5000f8370f6273fff9abd8d4758c6117e4cab89cbc686397 -#+s6-linux-utils.dccb2f978285051d60ce0bb1a7a1eaddffee03b09eb04db26fa3a32c8836d613 -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 -#+confz.7096c6907e9cc6998358f5c6a41346b7cc59cc13168b0741b68ade0001a8fd77 -#+containers.d1bf556661f3e0e560cc82d13b89700d6f112c010e436d0693861cbbc3b61977 -#+xbps.cfd899b2267e63867c9cd239c49374dc36a3cc0ded4b90ad6f525e567f079818 -#+zstd.90a7a74d0ca174c3fff868f77b2d35d292cafef51ba5f416940921188ff32212 -#+apk-tools.d49d10fb5e01a7f5e1f7cbeec800e2b96ca00797e370d3aead643fe7b9233f30 -#+alpine-keys.3cfc13320ba0778b72fd75a740d6a0f065ba0ee8a83e08d2cbf1ad72410d726a -#+getent.93e754ab9d00c23421e3adb407cf8901d6013d4331f5267f6dd10173c0be1030 -#+fileset.1c1a255aa16f92cf86a8ce188828bf4c2375a3c660fa54e47c637a7ef4510592 -#+ccx-utils.d7071841c5bc68c1b4b19e97755afad512ea8d0e607b182d7943c45c3e3c4229 -#+easyseccomp.b252fe82a86fab29aa35ebd32129753e686f666bb7311ebf20cd56452470878a- \ No newline at end of file +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+s6-portable-utils.171f71742faa2f5265177ddf14a06b967498cfee79e6899a4aa6f32023e7b2fd +#+s6-linux-utils.2f79d8e46333e4fe48d42109298801446bbfd2e5ad99beef594e0f8ed5efebb0 +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 +#+confz.ec6eee281ee2a69bd5a06f7d626b3bfb3ee80c598bd62d65d07b93d3f6f73738 +#+containers.d08e3144aec6c92b6a1cba623178eeebfc91fd0e170bac6a8730d2c656a4aef2 +#+xbps.f181f3cc00a2553708e1fbd0ca3794177ee42fc6519165fdf461e420f250fdbb +#+zstd.c5b88cdcbc806df177db0876ad21ad1d5ea04501bd9ee99e3cf506ea244b806d +#+apk-tools.95daf04be169cb56312cda5e288923e266612cf9392d907de8b5a8e741616cd1 +#+alpine-keys.5d43a7a9f0d954fd25fa71962b4fa29d51182dc1d69f408dacc4f1be93dfa8cf +#+getent.60a0ad9aec2b36cfaad5cef527b8798602cb9d97aee585080e04455faa2ee74f +#+fileset.5b77d7d8151199c906a6b6b48632e57b9bac2bd145568c0ffe92df4955144d67 +#+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 +#+easyseccomp.90e8251478a5d9b350961ba612cc0fc11fcbb13145eed904fc2555736d500f6b+ \ No newline at end of file diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 -#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef +#+libressl.e31469de8d9f83ef20211810e18aee71c9dc87e5959467b598ddbc7337775e3e #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. @@ -53,7 +53,6 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'curl-8.6.0' @@ -61,6 +60,7 @@ cd 'curl-8.6.0' + # Do not generate manpages (requires Perl) ( t=$(busybox which true) @@ -86,15 +86,16 @@ autotools_config_static \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install rm -r -v "$pthbs_destdir"'/home/ccx/versions'"/$pthbs_package/man" + check_static command/curl + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -1,45 +1,45 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+diffutils.7de7d6cf0cec86d9cc6a0b8fb912f6729c86b6d0b83347c738d6c46bbfed0962 -#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 -#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e -#+bison.e7b17457cc09694ac840e07ceb8bc81a250e1235c1735ff77738672aef455999 -#+rsync.73f73fd81fa4d43d714b22e8f9045b7437c5863e6d2a095d85c07ca39483ab59 -#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c -#+s6-rc.5bf8666d6b8c62af9da348bfc46e6680fad8330b9d7376efd1a092f74a1658ce -#+s6-portable-utils.a20039a7da7a366a5000f8370f6273fff9abd8d4758c6117e4cab89cbc686397 -#+s6-linux-utils.dccb2f978285051d60ce0bb1a7a1eaddffee03b09eb04db26fa3a32c8836d613 -#+s6-linux-init.a6524dc0da3a64eca6605fbab5387fc23aee11641e8c78df8ff11dff7cbe2a23 -#+mdevd.9eb4e080ae1f77a023a765bfe64c84969de5a2799ec28196c58a417dd0cf7a67 -#+s6-dns.cc60cc673e7826433641ed3e2aad4efc643e1e617382dfc98a75a33afd10e138 -#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 -#+s6-networking.ad286bd57500a51f79ad09bf3c0984c5b8b97a2a27d3089b2b0fb0f11c117033 -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 -#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe -#+aat.b4bf9a146b5cdfb5882fcee353c62b121a3237a2da7e967d53edfac6ad18f099 -#+confz.7096c6907e9cc6998358f5c6a41346b7cc59cc13168b0741b68ade0001a8fd77 -#+containers.d1bf556661f3e0e560cc82d13b89700d6f112c010e436d0693861cbbc3b61977 -#+fileset.1c1a255aa16f92cf86a8ce188828bf4c2375a3c660fa54e47c637a7ef4510592 -#+logincaps.97234d9f65fd1ef50bb8a47c6f27d436f4f8c2a5cf11601a7f5cc32bd4bd7fac -#+snaprep.fd1e6daf121d491db22320dcfe3b6e064a88dabb30e9ee9928bd7c0594cde7fe -#+curl.0061e2b4e63f55797ee20fa643207dc815bd54b0faa8a55276d92f334d6ed837 -#+git.582d85f2c473c8974ee778632c4389b28a265f70565c2245fb733badb3ab8ab1 -#+xbps.cfd899b2267e63867c9cd239c49374dc36a3cc0ded4b90ad6f525e567f079818 -#+apk-tools.d49d10fb5e01a7f5e1f7cbeec800e2b96ca00797e370d3aead643fe7b9233f30 -#+getent.93e754ab9d00c23421e3adb407cf8901d6013d4331f5267f6dd10173c0be1030 -#+getconf.1573dd9b2e84f540bfcfa7d53568064c1b54fb0c49755201fe76a3df979bf403 -#+iconv.9755d220925a69dbb6b79798b75afe2aa3dc77ecb991e81ffb8fd12747c8080f -#+libcap.edba12ebbc6125fa22e3ae179b50d06c360eba333b3bdf20d8c82cb3f563f132 -#+applyuidgid-caps.bfa3d7590305d3fe051d101c056822ece5038783ef3ada05761aa3a1bfcdd58f -#+ccx-utils.d7071841c5bc68c1b4b19e97755afad512ea8d0e607b182d7943c45c3e3c4229 -#+user-env.1bb4a783dfbc7e1f0f0ca0911ae2aca4091c4b869dd8ff48c2b5cd95cb0f1c94 -#+strace.8f47a6c70de766eb8c9cad6c9a2ff23e75e4ad3bf281062e457f396cedd9ea9a -#+mlog.4aacddf4a772148aea1dca6b4434b2afdd88caf58b482501dec770cce7684dfb -#+system-config.cb4c35302d6e68937b1580241062287cfdcc869aa3cc9d2be4118c4a1e6e64ee -#+system-config-rc.973bc8d4e9960860af852b490ad609d58cedbd2c5159bd346e7704a5cb979222 -#+system-config-scripts.ad3e9037eca35543ec995ba7f47300d77edd178b9872d1b9e82ed4fce6058222 -#+system-config-init.c2c882f8a3558248e0c068052f9568d6597de073940c9d164f6bf5bf8b40d705 -#+system-config-zsh.de46dfbb1edb7dcef66778c42b4cb5ab9de3eadabe4b7f28a240229bd4bdff9d- \ No newline at end of file +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+diffutils.f454962021fe007440223878647a4e0e2e1d0a9de317aa4fdd274300a5ffc892 +#+patch.a1d9db6514fc3a5600450ed53f5bff47a68723947d83df7a176f51c661bbcc57 +#+flex.b3adc3817f79d8b92ee5c8306836fe62f3b05ae9062d333b9dd2d8a27185fb50 +#+bison.d4a56278723364f9568d3e537d034e9c7832c03e55bb0240b7cb6c4d7af4006a +#+rsync.5b8ab64e646da2b4bd71f962fff0e2a4f7aa121e5488b02e136703b27278a898 +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+s6-rc.e3be4a113ee9715f7238427bb1ad692d5aa75f52ca7f687a32a3a76a648c708b +#+s6-portable-utils.171f71742faa2f5265177ddf14a06b967498cfee79e6899a4aa6f32023e7b2fd +#+s6-linux-utils.2f79d8e46333e4fe48d42109298801446bbfd2e5ad99beef594e0f8ed5efebb0 +#+s6-linux-init.bbb6c6a78dc4aea8e726ad3143233439184ac9564e9e8b3210b0eabf9e7f8238 +#+mdevd.26ce383b5715db033c9cd3707798a7c1ce1f9056caf987bab46bd4586fceca7a +#+s6-dns.1db2b68f9b71a747f03b48b5f25ec094ece473653bb122d9bcf75ddf932a4ca5 +#+libressl.e31469de8d9f83ef20211810e18aee71c9dc87e5959467b598ddbc7337775e3e +#+s6-networking.3cfa07abca2d99e46c55463967e742e4233e6e5044084f77edd0c7a676355dfa +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 +#+pthbs-banginstall.f1d88327c7cccb70afb2ea7abeb1eb5339d4a9d90a276e86ae542430fac2abb3 +#+aat.b8b1a512c709e5a2f9a05a35e1b334803895b883a11d81fa8cf2d49a186a15d9 +#+confz.ec6eee281ee2a69bd5a06f7d626b3bfb3ee80c598bd62d65d07b93d3f6f73738 +#+containers.d08e3144aec6c92b6a1cba623178eeebfc91fd0e170bac6a8730d2c656a4aef2 +#+fileset.5b77d7d8151199c906a6b6b48632e57b9bac2bd145568c0ffe92df4955144d67 +#+logincaps.172cb620448215cecbc9048751a742645b1e29b50e4ff58460acb9c2ac90fb45 +#+snaprep.fa5e713c63d8924837579f4bf85124ca133d6d7581727ab9b7aff91080f69a10 +#+curl.7bd1c7ec468d91de9503078cfb4daa1c60c552ea16a77fe5455a0cebb56c442b +#+git.80ca2ea4bf044b122ba3e086121828949759c75a23a30759368e5872381e063e +#+xbps.f181f3cc00a2553708e1fbd0ca3794177ee42fc6519165fdf461e420f250fdbb +#+apk-tools.95daf04be169cb56312cda5e288923e266612cf9392d907de8b5a8e741616cd1 +#+getent.60a0ad9aec2b36cfaad5cef527b8798602cb9d97aee585080e04455faa2ee74f +#+getconf.db8807c07fd38d5fa40b5a6db9268b3436f7e8b12f45842ccb4825d20196afd8 +#+iconv.46ec2e37c5aa47dd5851ef45ca3343e3c6df895f79a4ba8fddbe2a9c2e52091b +#+libcap.6a4a031e0b4fb71a848f4102585d3f87c2c3ada49bdfbd3ad59d204a1d6eb7bc +#+applyuidgid-caps.ca24dbb4d0bb755e3ae35f1a2e875b04c6a116ef8407efaada201edf8e468ea6 +#+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 +#+user-env.bd2519154a1cdbfcc37a18e787429ea960989a8746686537ddf3afe06bed44d7 +#+strace.3254abcd653801778b39da20e9ba1237e5371911fac63df4aa8304575db3e282 +#+mlog.c84070d774d221a0b227a54128d534959609f1e717cdd0dca461161a43c4e1a4 +#+system-config.6276e37974fd3a64ef046aaa33c8fed0a97971fcdaa625eed21819cf12aa500b +#+system-config-rc.3d60a8e046dc745ef1b5bad0c23343a0874440aba88c840e879accf2c046b6bc +#+system-config-scripts.dda720a2bccd1d4d66b9a84ee7b96789020c74c665a558e95dde695c99632002 +#+system-config-init.e09d5f2e8cbb823da77f74242cd693c61d7371c37289c0ccd6a26252dadfeb4e +#+system-config-zsh.635f14c71f46512c88d90b2d68709eb6c7046d2599b8525cd10499635b6c2e18+ \ No newline at end of file diff --git a/variants/ccx-x86_64/diffutils b/variants/ccx-x86_64/diffutils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. @@ -52,26 +52,27 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'diffutils-3.10' + autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/diff check_static command/cmp + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 -#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 -#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e -#+bison.e7b17457cc09694ac840e07ceb8bc81a250e1235c1735ff77738672aef455999 -#+libseccomp.49f898683170a896641aaabd7d903a40fcdcddc0239e884647d9c303f56f1430 -#+error-standalone.4e56527fff943597ddac42982fdee3f3a2099f8ef487eee8c2ecfdf982f89dca -#+argp-standalone.50e78dee0e19476708441f42d1ebf8fa185f65c8b0cea1a2c9027fe408beb8d1 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef +#+patch.a1d9db6514fc3a5600450ed53f5bff47a68723947d83df7a176f51c661bbcc57 +#+flex.b3adc3817f79d8b92ee5c8306836fe62f3b05ae9062d333b9dd2d8a27185fb50 +#+bison.d4a56278723364f9568d3e537d034e9c7832c03e55bb0240b7cb6c4d7af4006a +#+libseccomp.00516d568e9c49a44d15a5e950c5b5a666a640412c265513492962dd934cf56c +#+error-standalone.bb6d2a9b493e90127a91560270f5a14627bb1531126918fc5a3e5865ab31e240 +#+argp-standalone.218e60b962d7b025d7dff91ff8f03bf6d0c2312274400345f7c4086640c79530 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp @@ -41,19 +41,21 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'easyseccomp' patch -p1 <../easyseccomp_fix_includes.patch touch Makefile.in configure + build_env_static autotools_config --enable-seccomp + make -j1 V=1 DESTDIR="$pthbs_destdir" LIBS="-lseccomp -lerror -largp" install + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -70,6 +72,7 @@ check_static() { check_static command/easyseccomp + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:. # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'error-standalone-2.0' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -27,6 +27,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/home/ccx/versions/$pthbs_package \ + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline @@ -1,25 +1,24 @@ #!/usr/bin/env pthbs-build +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 - -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'execline' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -28,7 +27,6 @@ cd 'execline' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install if ! test -e "${dest}/command/eltest"; then @@ -41,6 +39,7 @@ fi + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 -#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 +#+pthbs-banginstall.f1d88327c7cccb70afb2ea7abeb1eb5339d4a9d90a276e86ae542430fac2abb3 # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'fileset' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -30,6 +30,7 @@ fi + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/findutils b/variants/ccx-x86_64/findutils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:. @@ -52,28 +52,29 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'findutils-4.10.0' + autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/find check_static command/xargs # TODO: fix shebang in check_static command/locate # TODO: fix shebang in command/updatedb + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/flex b/variants/ccx-x86_64/flex @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. @@ -52,12 +52,12 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'flex-2.6.4' + export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" export LDFLAGS="--static" @@ -67,13 +67,14 @@ autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/flex check_static command/flex++ + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'getconf' name='getconf' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -24,6 +24,7 @@ install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -40,6 +41,7 @@ check_static() { check_static "command/$name" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'getent' name='getent' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -24,6 +24,7 @@ install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -40,6 +41,7 @@ check_static() { check_static "command/$name" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git @@ -1,22 +1,22 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 -#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 -#+curl.0061e2b4e63f55797ee20fa643207dc815bd54b0faa8a55276d92f334d6ed837 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef +#+libressl.e31469de8d9f83ef20211810e18aee71c9dc87e5959467b598ddbc7337775e3e +#+curl.7bd1c7ec468d91de9503078cfb4daa1c60c552ea16a77fe5455a0cebb56c442b #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'git-2.43.2' + make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" \ CPATH="$pthbs_build_environment/include" \ @@ -35,6 +35,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ V=1 all install + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -50,6 +51,7 @@ check_static() { } check_static command/git + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/gnu-make b/variants/ccx-x86_64/gnu-make @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.63505628ae7ef34bfd526ff096c3a87a5bbc187d1d5278663520e990c1620d05 -#+busybox.60b492e1fc87ac8497f899148aa74ccc308cca4ae57c84a94b36f122cf4ed752 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.9ac4f3e6b810118c62fb86ab044f161165fdb7b8ba478bf2adf5951ac07bff86 +#+busybox.96b5ea8576db14a0ea4fc6d29920b5df14afb4e2ff9284c2f6a5c5e64e88254e #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. @@ -49,25 +49,26 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'make-4.4.1' + autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/make + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/gnu-make:bootstrap b/variants/ccx-x86_64/gnu-make:bootstrap @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.ba5394c0e347ba680a13da1f05c91406b6b2fe218739f86d6418d3622e98624d +#+musl-cross-make.11f47b24c2e41269f1c999eebb1d46eea9a72e2becc4099b9e12ab192180eae7 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. @@ -30,13 +30,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'make-4.4.1' -mcm=/home/ccx/versions/musl-cross-make.ba5394c0e347ba680a13da1f05c91406b6b2fe218739f86d6418d3622e98624d + +mcm=/home/ccx/versions/musl-cross-make.11f47b24c2e41269f1c999eebb1d46eea9a72e2becc4099b9e12ab192180eae7 export PATH="$mcm/bin:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" @@ -49,11 +49,11 @@ autotools_config --enable-static --disable-shared --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:. @@ -52,24 +52,25 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'gperf-3.1' + autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/gperf + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'iconv' name='iconv' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -24,6 +24,7 @@ install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -40,6 +41,7 @@ check_static() { check_static "command/$name" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/kbd b/variants/ccx-x86_64/kbd @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. @@ -53,12 +53,12 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'kbd-2.6.4' + export LDFLAGS="--static" autotools_config_static --disable-nls --disable-vlock --disable-werror --disable-tests \ @@ -68,14 +68,15 @@ autotools_config_static --disable-nls --disable-vlock --disable-werror --disable make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install cd ../destdir mv -v data ".$prefix/" + check_static command/loadkeys + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { 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.78b3b18bfec0045153b2b0f16a599e05dc07b067a6cecfe922ab68fe461f2157 -#+busybox.9e905493073bad6a68886625e0d644b28d353050182e847b931f57269e0c5bac- \ No newline at end of file +#+linux.16c0bd71eb077b54cb0a6df8ea540c41c59f4ab1fc1460801e20560c078f006d +#+busybox.583526af63598e2dfcd0741283128322cfeff3beab55964c602484c754cb176e+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libarchive b/variants/ccx-x86_64/libarchive @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:. @@ -52,12 +52,12 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libarchive-3.7.2' + export LDFLAGS=--static autotools_config_static --without-xml2 @@ -65,13 +65,14 @@ autotools_config_static --without-xml2 make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/bsdtar check_static command/bsdcpio + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 -#+libmd.5a13f5284b12557b047c6c97cdef2d19c6e81fdcbd49818c1f21bc2a4c632a4f +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef +#+libmd.e1342753dfad2f7a1e2fed3b9964fdbe9d6ce76f04f8a73984e2fc8721955239 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:. @@ -53,23 +53,23 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libbsd-0.11.8' + autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap @@ -1,20 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+pkgconf-pkg-config.c6e3db01553a2cc6c92422f8d60a33dcb49f60862cded670dea79029b938af22 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+pkgconf-pkg-config.a88fae723a8c20fc2cc0f7c6ecba28ac1f4975b4b48a7074928cb9589b117898 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libcap-2.69' sed -i '1 s|^#!/bin/bash|#!/bin/sh|' progs/*.sh + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -23,6 +23,7 @@ build_env_static() { LDFLAGS=--static build_env_static + make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ DESTDIR="$pthbs_destdir" \ SHARED=no DYNAMIC=no LIBCSTATIC=yes \ @@ -41,6 +42,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ CAPSH_SHELL="'-DSHELL=\"$(which sh)\"'" \ LDFLAGS="$LDFLAGS" \ all install + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -59,6 +61,7 @@ check_static command/getcap check_static command/setcap check_static command/getpcaps + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 -#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e -#+bison.e7b17457cc09694ac840e07ceb8bc81a250e1235c1735ff77738672aef455999 -#+musl-fts.ece197d16a1f0926e6391891380b7779e7ce09fe1bbb5ce952255238345df823 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef +#+flex.b3adc3817f79d8b92ee5c8306836fe62f3b05ae9062d333b9dd2d8a27185fb50 +#+bison.d4a56278723364f9568d3e537d034e9c7832c03e55bb0240b7cb6c4d7af4006a +#+musl-fts.c9f6a5e29303e5482f19f402c8bdfb2e9e3effd84bd48a6a7e1dddfdec5db5ca #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. @@ -55,25 +55,26 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libcgroup-3.0.0' + autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/cgconfigparser + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf @@ -1,20 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+zstd.90a7a74d0ca174c3fff868f77b2d35d292cafef51ba5f416940921188ff32212 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+zstd.c5b88cdcbc806df177db0876ad21ad1d5ea04501bd9ee99e3cf506ea244b806d #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libelf' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -43,6 +43,7 @@ printf '%s\n' > "${dest}/library/pkgconfig/libelf.pc" \ 'Cflags: -I${includedir}' + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/libmd b/variants/ccx-x86_64/libmd @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:. @@ -52,23 +52,23 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libmd-1.1.0' + autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 -#+ca-certificates-wip-donotuse.80a3542382d5618d9a0cd329c1aef59756ae1f37fdf9a1639a49ca950e83e587 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef +#+ca-certificates-wip-donotuse.2aceae5f95544f48b1721667d1d70ab7d86f8362d9500ca0dfbe500c73387187 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. @@ -54,13 +54,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libressl-3.8.2' + export LDFLAGS="--static" autotools_config_static --with-openssldir="$prefix/config/ssl" @@ -71,7 +71,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) 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.80a3542382d5618d9a0cd329c1aef59756ae1f37fdf9a1639a49ca950e83e587/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.2aceae5f95544f48b1721667d1d70ab7d86f8362d9500ca0dfbe500c73387187/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 @@ -86,13 +86,14 @@ printf >env/SSL_CERT_DIR '%s\n' "$prefix/config/ssl/certs" # for git printf >env/GIT_SSL_CAPATH '%s\n' "$prefix/config/ssl/certs" - make DESTDIR="$pthbs_destdir" install + check_static command/openssl check_static command/ocspcheck + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/libretls b/variants/ccx-x86_64/libretls @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-z:sha256:3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5:. @@ -52,13 +52,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libretls-3.8.1' + export LDFLAGS="--static" autotools_config_static @@ -66,11 +66,11 @@ autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 -#+pkgconf-pkg-config.c6e3db01553a2cc6c92422f8d60a33dcb49f60862cded670dea79029b938af22 -#+gperf.5c541f3f6b7f7db53f868856be4786a945b92e22a7caa4f0296676263b8efb8a +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef +#+pkgconf-pkg-config.a88fae723a8c20fc2cc0f7c6ecba28ac1f4975b4b48a7074928cb9589b117898 +#+gperf.408f2829e979a25ec2e3f8bdce293b0697e0afa2ff172e622c0d8b1220182ef1 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:. @@ -54,13 +54,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libseccomp-2.6.0' + export LDFLAGS="--static" autotools_config_static @@ -68,13 +68,14 @@ autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/scmp_sys_resolver + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:. @@ -52,13 +52,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libunwind-1.8.1' + autotools_config_static --enable-cxx-exceptions \ --enable-coredump \ --enable-ptrace \ @@ -69,11 +69,11 @@ autotools_config_static --enable-cxx-exceptions \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+findutils.3e193a778304c75a8019bf418b08653daa53dccbdcdbb6ff2a2e0c281675a46b -#+diffutils.7de7d6cf0cec86d9cc6a0b8fb912f6729c86b6d0b83347c738d6c46bbfed0962 -#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 -#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e -#+bison.e7b17457cc09694ac840e07ceb8bc81a250e1235c1735ff77738672aef455999 -#+rsync.73f73fd81fa4d43d714b22e8f9045b7437c5863e6d2a095d85c07ca39483ab59 -#+zstd.90a7a74d0ca174c3fff868f77b2d35d292cafef51ba5f416940921188ff32212 -#+libelf.d616f401321a0b75f4e22d6979a87dba7c0e6eb138dc5af55742dbf956a4d2ee -#+pkgconf-pkg-config.c6e3db01553a2cc6c92422f8d60a33dcb49f60862cded670dea79029b938af22 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+findutils.488d8d46a1506af897aa11a4ba7d9579f6346c096d8226ac2f351253e7dcdbd3 +#+diffutils.f454962021fe007440223878647a4e0e2e1d0a9de317aa4fdd274300a5ffc892 +#+patch.a1d9db6514fc3a5600450ed53f5bff47a68723947d83df7a176f51c661bbcc57 +#+flex.b3adc3817f79d8b92ee5c8306836fe62f3b05ae9062d333b9dd2d8a27185fb50 +#+bison.d4a56278723364f9568d3e537d034e9c7832c03e55bb0240b7cb6c4d7af4006a +#+rsync.5b8ab64e646da2b4bd71f962fff0e2a4f7aa121e5488b02e136703b27278a898 +#+zstd.c5b88cdcbc806df177db0876ad21ad1d5ea04501bd9ee99e3cf506ea244b806d +#+libelf.3e2b571a8245c7e5c6477496f320c1dcaba6eeaced5f61ffd4ff608d3f856449 +#+pkgconf-pkg-config.a88fae723a8c20fc2cc0f7c6ecba28ac1f4975b4b48a7074928cb9589b117898 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config @@ -19,7 +19,6 @@ # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'linux-6.1' @@ -27,6 +26,7 @@ cd 'linux-6.1' unxz -c < '../patch-6.1.34.xz' | patch -p1 -N patch -p1 -N <../noobjtool.patch + export CPATH="$pthbs_build_environment/include" cp -v ../linux.config .config @@ -34,6 +34,7 @@ cp -v ../linux.config .config diff -u ../linux.config .config || true + make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ V=1 \ HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \ @@ -55,6 +56,7 @@ rm -f "$module_dir/build" "$module_dir/source" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+findutils.3e193a778304c75a8019bf418b08653daa53dccbdcdbb6ff2a2e0c281675a46b -#+diffutils.7de7d6cf0cec86d9cc6a0b8fb912f6729c86b6d0b83347c738d6c46bbfed0962 -#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 -#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e -#+bison.e7b17457cc09694ac840e07ceb8bc81a250e1235c1735ff77738672aef455999 -#+rsync.73f73fd81fa4d43d714b22e8f9045b7437c5863e6d2a095d85c07ca39483ab59 -#+zstd.90a7a74d0ca174c3fff868f77b2d35d292cafef51ba5f416940921188ff32212 -#+libelf.d616f401321a0b75f4e22d6979a87dba7c0e6eb138dc5af55742dbf956a4d2ee -#+pkgconf-pkg-config.c6e3db01553a2cc6c92422f8d60a33dcb49f60862cded670dea79029b938af22 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+findutils.488d8d46a1506af897aa11a4ba7d9579f6346c096d8226ac2f351253e7dcdbd3 +#+diffutils.f454962021fe007440223878647a4e0e2e1d0a9de317aa4fdd274300a5ffc892 +#+patch.a1d9db6514fc3a5600450ed53f5bff47a68723947d83df7a176f51c661bbcc57 +#+flex.b3adc3817f79d8b92ee5c8306836fe62f3b05ae9062d333b9dd2d8a27185fb50 +#+bison.d4a56278723364f9568d3e537d034e9c7832c03e55bb0240b7cb6c4d7af4006a +#+rsync.5b8ab64e646da2b4bd71f962fff0e2a4f7aa121e5488b02e136703b27278a898 +#+zstd.c5b88cdcbc806df177db0876ad21ad1d5ea04501bd9ee99e3cf506ea244b806d +#+libelf.3e2b571a8245c7e5c6477496f320c1dcaba6eeaced5f61ffd4ff608d3f856449 +#+pkgconf-pkg-config.a88fae723a8c20fc2cc0f7c6ecba28ac1f4975b4b48a7074928cb9589b117898 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch @@ -18,13 +18,13 @@ # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'linux-6.15' patch -p1 -N <../noobjtool.patch + export CPATH="$pthbs_build_environment/include" cp -v ../linux.config .config @@ -32,6 +32,7 @@ cp -v ../linux.config .config diff -u ../linux.config .config || true + make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ V=1 \ HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \ @@ -53,6 +54,7 @@ rm -f "$module_dir/build" "$module_dir/source" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -1,20 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 -#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe -#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+ccx-utils.d7071841c5bc68c1b4b19e97755afad512ea8d0e607b182d7943c45c3e3c4229 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 +#+pthbs-banginstall.f1d88327c7cccb70afb2ea7abeb1eb5339d4a9d90a276e86ae542430fac2abb3 +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'logincaps' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -44,6 +44,7 @@ sh build_static.sh -DLOGINEXEC_PATH="\"$prefix/command/loginexec\"" cp -a login "${dest}/command/" + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -58,6 +59,7 @@ check_static() { fi } check_static command/login + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/m4 b/variants/ccx-x86_64/m4 @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. @@ -51,25 +51,26 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'm4-1.4.19' + autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/m4 + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 -#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 +#+pthbs-banginstall.f1d88327c7cccb70afb2ea7abeb1eb5339d4a9d90a276e86ae542430fac2abb3 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'mdev-scripts' + mkdir -p "$dest" for script in persistent-storage dvbdev ptpdev usbdev; do mv -v $script mdev-hook-$script @@ -18,6 +18,7 @@ for script in persistent-storage dvbdev ptpdev usbdev; do pthbs-banginstall mdev-hook-$script "$dest" done + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd @@ -1,26 +1,25 @@ #!/usr/bin/env pthbs-build - -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 - -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'mdevd' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -29,11 +28,11 @@ cd 'mdevd' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c -#+mdev-scripts.78c09cd77deb44ec08747e748b7bd3679e049308c3fb980cd65a0563aa2001b9 -#+mdevd.9eb4e080ae1f77a023a765bfe64c84969de5a2799ec28196c58a417dd0cf7a67- \ No newline at end of file +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+mdev-scripts.3984cd7794152a53eccba7a9f0583e87c2067e237f53c52f62b027083991ab85 +#+mdevd.26ce383b5715db033c9cd3707798a7c1ce1f9056caf987bab46bd4586fceca7a+ \ No newline at end of file diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'mlog' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -25,6 +25,7 @@ install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -40,6 +41,7 @@ check_static() { } check_static "command/$name" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/musl-cross-make b/variants/ccx-x86_64/musl-cross-make @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.ba5394c0e347ba680a13da1f05c91406b6b2fe218739f86d6418d3622e98624d -#+gnu-make.63505628ae7ef34bfd526ff096c3a87a5bbc187d1d5278663520e990c1620d05 -#+busybox.60b492e1fc87ac8497f899148aa74ccc308cca4ae57c84a94b36f122cf4ed752 +#+musl-cross-make.11f47b24c2e41269f1c999eebb1d46eea9a72e2becc4099b9e12ab192180eae7 +#+gnu-make.9ac4f3e6b810118c62fb86ab044f161165fdb7b8ba478bf2adf5951ac07bff86 +#+busybox.96b5ea8576db14a0ea4fc6d29920b5df14afb4e2ff9284c2f6a5c5e64e88254e #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -16,10 +16,10 @@ # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' + # For validating the compiler printf '%s\n' 'int main(void) { return 0; }' >true.c @@ -38,6 +38,7 @@ printf '%s %s\n' >musl-cross-make/hashes/linux-6.5.4.tar.xz.sha1 \ touch musl-cross-make/sources/* + # Patch linker path for dynamic executables make -C musl-cross-make gcc-11.2.0 sed -i -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h @@ -80,12 +81,14 @@ printf '%s\n' > "$dd/library/pkgconfig/zlib.pc" \ 'Cflags: -I${includedir}' + # validate zlib "$dd"'/bin/x86_64-linux-musl-gcc' -I"$dd/include" -L"$dd/lib" -static -o zpipe zpipe.c -lz ./zpipe <true.c >true.c.gz ./zpipe -d <true.c.gz >true.c.2 cmp -s true.c true.c.2 + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/musl-cross-make:bootstrap-0 b/variants/ccx-x86_64/musl-cross-make:bootstrap-0 @@ -13,10 +13,10 @@ # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' + # For validating the compiler printf '%s\n' 'int main(void) { return 0; }' >true.c @@ -28,6 +28,7 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* + # Patch linker path for dynamic executables make -C musl-cross-make gcc-9.4.0 sed -i -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-9.4.0/gcc/config/*/linux*.h @@ -47,6 +48,7 @@ done grep -F "$pthbs_package" true.linker + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/musl-cross-make:bootstrap-1 b/variants/ccx-x86_64/musl-cross-make:bootstrap-1 @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.25e1c532af9ee197ac27ce2dec1246be716b05a6a263ee72cca6ee91a07af31a +#+musl-cross-make.0823f13b9bffb7f83d122e22a33bdd35b6c212e81c03ddb73e9779f00d4f3db5 #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -14,11 +14,11 @@ # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' -bootstrap=/home/ccx/versions/musl-cross-make.25e1c532af9ee197ac27ce2dec1246be716b05a6a263ee72cca6ee91a07af31a + +bootstrap=/home/ccx/versions/musl-cross-make.0823f13b9bffb7f83d122e22a33bdd35b6c212e81c03ddb73e9779f00d4f3db5 "$bootstrap/bin/x86_64-linux-musl-gcc" --version # For validating the compiler @@ -36,6 +36,7 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* + # Patch linker path for dynamic executables make -C musl-cross-make gcc-11.2.0 sed -i -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h @@ -56,6 +57,7 @@ done grep -F "$pthbs_package" true.linker + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. @@ -52,23 +52,23 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'musl-fts-1.2.7' + autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/netbsd-curses b/variants/ccx-x86_64/netbsd-curses @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'netbsd-curses' + export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" @@ -33,6 +33,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) make install-static + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/openssl b/variants/ccx-x86_64/openssl @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'openssl-3.3.3' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -22,13 +22,14 @@ cd openssl-3.3.3 make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/openssl check_static command/ocspcheck + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/patch b/variants/ccx-x86_64/patch @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. @@ -52,25 +52,26 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'patch-2.7.6' + autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/patch + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/patchelf:bootstrap b/variants/ccx-x86_64/patchelf:bootstrap @@ -48,22 +48,23 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'patchelf' + ./bootstrap.sh autotools_config_static . --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/patchelf + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:. @@ -52,26 +52,27 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'pkgconf-2.1.1' + export LDFLAGS=--static autotools_config_static --with-pkg-config-dir= make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/pkgconf + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/pkgconf-pkg-config b/variants/ccx-x86_64/pkgconf-pkg-config @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+pkgconf.48e188b1d85804b842c81f44538fc4881b0061214dc69d650f3a058b4e8b10fb +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+pkgconf.a858e237cda23bb966d39cefab2241e01ba5057c737ba65ae62689f4bd1a8019 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 @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. @@ -52,23 +52,23 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'popt-1.19' + autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/pthbs-banginstall b/variants/ccx-x86_64/pthbs-banginstall @@ -1,21 +1,22 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'pthbs-banginstall' + mkdir -p "${dest}/command" chmod +x pthbs-banginstall zsh -x pthbs-banginstall pthbs-banginstall "${dest}" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 -#+popt.de7bcad4919ea09329928871d9fd917f25f0a43d46a10cd3b0c754af4599e61b -#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 -#+zstd.90a7a74d0ca174c3fff868f77b2d35d292cafef51ba5f416940921188ff32212 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef +#+popt.135902d8d79fa35d55af79aa23fbd05c1f5fe14b0267db566a0e68f9b4eddcad +#+libressl.e31469de8d9f83ef20211810e18aee71c9dc87e5959467b598ddbc7337775e3e +#+zstd.c5b88cdcbc806df177db0876ad21ad1d5ea04501bd9ee99e3cf506ea244b806d #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. @@ -55,13 +55,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'rsync-3.2.7' + autotools_config_static --without-included-popt \ --enable-openssl \ --enable-zstd \ @@ -72,13 +72,14 @@ autotools_config_static --without-included-popt \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/rsync + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6 @@ -1,38 +1,38 @@ #!/usr/bin/env pthbs-build - -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 - -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ --disable-shared --enable-static --enable-allstatic --enable-static-libc --absolute-paths -make -j${JOBS:-1} -l$((1+${JOBS:-1})) CFLAGS=-DWANT_CLONE_NEWPID +make -j${JOBS:-1} -l$((1+${JOBS:-1})) CFLAGS=-DWANT_CLONE_NEWPID make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/s6-dns b/variants/ccx-x86_64/s6-dns @@ -1,26 +1,25 @@ #!/usr/bin/env pthbs-build - -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 - -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 +#@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6-dns' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -29,11 +28,11 @@ cd 's6-dns' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/ccx-x86_64/s6-linux-init b/variants/ccx-x86_64/s6-linux-init @@ -1,28 +1,27 @@ #!/usr/bin/env pthbs-build - -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 - -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6-linux-init' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -31,11 +30,11 @@ cd 's6-linux-init' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/ccx-x86_64/s6-linux-utils b/variants/ccx-x86_64/s6-linux-utils @@ -1,26 +1,25 @@ #!/usr/bin/env pthbs-build - -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 - -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 +#@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6-linux-utils' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -29,11 +28,11 @@ cd 's6-linux-utils' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking @@ -1,30 +1,29 @@ #!/usr/bin/env pthbs-build - -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 - -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c -#+s6-dns.cc60cc673e7826433641ed3e2aad4efc643e1e617382dfc98a75a33afd10e138 -#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+s6-dns.1db2b68f9b71a747f03b48b5f25ec094ece473653bb122d9bcf75ddf932a4ca5 +#+libressl.e31469de8d9f83ef20211810e18aee71c9dc87e5959467b598ddbc7337775e3e #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6-networking' + ./configure --enable-ssl=libtls \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -33,11 +32,11 @@ cd 's6-networking' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/s6-portable-utils b/variants/ccx-x86_64/s6-portable-utils @@ -1,26 +1,25 @@ #!/usr/bin/env pthbs-build - -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 - -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 +#@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6-portable-utils' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -29,11 +28,11 @@ cd 's6-portable-utils' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/ccx-x86_64/s6-rc b/variants/ccx-x86_64/s6-rc @@ -1,28 +1,27 @@ #!/usr/bin/env pthbs-build - -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 - -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6-rc' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -31,11 +30,11 @@ cd 's6-rc' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/ccx-x86_64/skalibs b/variants/ccx-x86_64/skalibs @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'skalibs' + export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" export CXX="$pthbs_build_environment/command/x86_64-linux-musl-g++" export LD="$pthbs_build_environment/command/x86_64-linux-musl-ld" @@ -29,11 +29,11 @@ export CFLAGS="-O2 -ggdb" make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 -#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 +#+pthbs-banginstall.f1d88327c7cccb70afb2ea7abeb1eb5339d4a9d90a276e86ae542430fac2abb3 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'snaprep' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -31,6 +31,7 @@ fi + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 -#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 -#+libunwind.7c111bdb09331db1a765ca6b81e96418fc29ee6fcacf608f1ad7ca6b41e12bef +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef +#+patch.a1d9db6514fc3a5600450ed53f5bff47a68723947d83df7a176f51c661bbcc57 +#+libunwind.97e68762ed5f0d0212f89728236948dea2a34e8846d0d53c29a5b167962c4a0b #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. @@ -55,7 +55,6 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'strace-6.13' @@ -64,17 +63,19 @@ cd 'strace-6.13' patch -p1 <../strace-6.5-static.patch + autotools_config_static --with-unwind --without-libdw --enable-mpers=check make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/strace + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -1,29 +1,29 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+diffutils.7de7d6cf0cec86d9cc6a0b8fb912f6729c86b6d0b83347c738d6c46bbfed0962 -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+aat.b4bf9a146b5cdfb5882fcee353c62b121a3237a2da7e967d53edfac6ad18f099 -#+fileset.1c1a255aa16f92cf86a8ce188828bf4c2375a3c660fa54e47c637a7ef4510592 -#+rsync.73f73fd81fa4d43d714b22e8f9045b7437c5863e6d2a095d85c07ca39483ab59 -#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+kbd.835b85cf6d602390f2bd12405c85a1f211ffa0347f62a6619ffa6553a0742e67 -#+mdevd.9eb4e080ae1f77a023a765bfe64c84969de5a2799ec28196c58a417dd0cf7a67 -#+s6-linux-utils.dccb2f978285051d60ce0bb1a7a1eaddffee03b09eb04db26fa3a32c8836d613 -#+s6-rc.5bf8666d6b8c62af9da348bfc46e6680fad8330b9d7376efd1a092f74a1658ce -#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 -#+system-config-scripts.ad3e9037eca35543ec995ba7f47300d77edd178b9872d1b9e82ed4fce6058222 -#+logincaps.97234d9f65fd1ef50bb8a47c6f27d436f4f8c2a5cf11601a7f5cc32bd4bd7fac +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+diffutils.f454962021fe007440223878647a4e0e2e1d0a9de317aa4fdd274300a5ffc892 +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+aat.b8b1a512c709e5a2f9a05a35e1b334803895b883a11d81fa8cf2d49a186a15d9 +#+fileset.5b77d7d8151199c906a6b6b48632e57b9bac2bd145568c0ffe92df4955144d67 +#+rsync.5b8ab64e646da2b4bd71f962fff0e2a4f7aa121e5488b02e136703b27278a898 +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+kbd.29f112e8cdb348d303a1f92356223b96884f232e2eda70ef7989f3731629f33b +#+mdevd.26ce383b5715db033c9cd3707798a7c1ce1f9056caf987bab46bd4586fceca7a +#+s6-linux-utils.2f79d8e46333e4fe48d42109298801446bbfd2e5ad99beef594e0f8ed5efebb0 +#+s6-rc.e3be4a113ee9715f7238427bb1ad692d5aa75f52ca7f687a32a3a76a648c708b +#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 +#+system-config-scripts.dda720a2bccd1d4d66b9a84ee7b96789020c74c665a558e95dde695c99632002 +#+logincaps.172cb620448215cecbc9048751a742645b1e29b50e4ff58460acb9c2ac90fb45 #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config' + err_notfound() { printf >&2 'Executable not found for command "%s"\n' "$1" exit 1 @@ -50,8 +50,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.16b05d60b31076d77e9b3179c7b24ab0513bc62f70558ccaf883f7195a02a1ae' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.be1e2f797fce97340d454e21024854ce6b054158fd8f5bb586e77d5ee02d8553' \ + 'pthbs_path_containers=/home/ccx/versions/env.17a0887ae6e67b4b46258a968a43920ccacfb540c961b3fb3b3bb65e2e1c40da' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.fe8f5fe16f6d6509bce58c46fbc445d75154d8b224c833dd4ae8a32ca5325d60' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do @@ -73,6 +73,7 @@ rsync -ai ./out/ "$dest/config/" mv -v keys "$dest/" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -1,20 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c -#+s6-rc.5bf8666d6b8c62af9da348bfc46e6680fad8330b9d7376efd1a092f74a1658ce -#+s6-portable-utils.a20039a7da7a366a5000f8370f6273fff9abd8d4758c6117e4cab89cbc686397 -#+s6-linux-init.a6524dc0da3a64eca6605fbab5387fc23aee11641e8c78df8ff11dff7cbe2a23 -#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+system-config-rc.973bc8d4e9960860af852b490ad609d58cedbd2c5159bd346e7704a5cb979222 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+s6-rc.e3be4a113ee9715f7238427bb1ad692d5aa75f52ca7f687a32a3a76a648c708b +#+s6-portable-utils.171f71742faa2f5265177ddf14a06b967498cfee79e6899a4aa6f32023e7b2fd +#+s6-linux-init.bbb6c6a78dc4aea8e726ad3143233439184ac9564e9e8b3210b0eabf9e7f8238 +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+system-config-rc.3d60a8e046dc745ef1b5bad0c23343a0874440aba88c840e879accf2c046b6bc # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-init' + q() { # quote list of strings to be suitable for execline "s6-quote" "$@" } @@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/home/ccx/versions/system-config-rc.973bc8d4e9960860af852b490ad609d58cedbd2c5159bd346e7704a5cb979222/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.3d60a8e046dc745ef1b5bad0c23343a0874440aba88c840e879accf2c046b6bc/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//home/ccx/versions" @@ -118,6 +118,7 @@ $(qx tail) -F -n +1 /run/uncaught-logs/current EOF s6-chmod 755 "${dest}/run-image/service/console-log-tail/run" exit $? + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -136,6 +137,7 @@ check_static bin/halt check_static bin/poweroff check_static bin/reboot + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc @@ -1,24 +1,25 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+s6-rc.5bf8666d6b8c62af9da348bfc46e6680fad8330b9d7376efd1a092f74a1658ce -#+fileset.1c1a255aa16f92cf86a8ce188828bf4c2375a3c660fa54e47c637a7ef4510592 -#+system-config.cb4c35302d6e68937b1580241062287cfdcc869aa3cc9d2be4118c4a1e6e64ee +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+s6-rc.e3be4a113ee9715f7238427bb1ad692d5aa75f52ca7f687a32a3a76a648c708b +#+fileset.5b77d7d8151199c906a6b6b48632e57b9bac2bd145568c0ffe92df4955144d67 +#+system-config.6276e37974fd3a64ef046aaa33c8fed0a97971fcdaa625eed21819cf12aa500b # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/home/ccx/versions/system-config.cb4c35302d6e68937b1580241062287cfdcc869aa3cc9d2be4118c4a1e6e64ee/config/s6-rc-source + +src=/home/ccx/versions/system-config.6276e37974fd3a64ef046aaa33c8fed0a97971fcdaa625eed21819cf12aa500b/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/ccx-x86_64/system-config-scripts b/variants/ccx-x86_64/system-config-scripts @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 -#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 +#+pthbs-banginstall.f1d88327c7cccb70afb2ea7abeb1eb5339d4a9d90a276e86ae542430fac2abb3 # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-scripts' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -30,6 +30,7 @@ fi + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/system-config-zsh b/variants/ccx-x86_64/system-config-zsh @@ -1,21 +1,22 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-zsh' + mkdir -p "$dest/zsh" mv -v zsh-functions "$dest/zsh/site-functions" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env @@ -1,22 +1,23 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+pthbs-banginstall.f1d88327c7cccb70afb2ea7abeb1eb5339d4a9d90a276e86ae542430fac2abb3 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' + mkdir -p "${dest}/command" chmod +x user-env pthbs-banginstall user-env "${dest}" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -1,40 +1,40 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+diffutils.7de7d6cf0cec86d9cc6a0b8fb912f6729c86b6d0b83347c738d6c46bbfed0962 -#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 -#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e -#+bison.e7b17457cc09694ac840e07ceb8bc81a250e1235c1735ff77738672aef455999 -#+rsync.73f73fd81fa4d43d714b22e8f9045b7437c5863e6d2a095d85c07ca39483ab59 -#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c -#+s6-rc.5bf8666d6b8c62af9da348bfc46e6680fad8330b9d7376efd1a092f74a1658ce -#+s6-portable-utils.a20039a7da7a366a5000f8370f6273fff9abd8d4758c6117e4cab89cbc686397 -#+s6-linux-utils.dccb2f978285051d60ce0bb1a7a1eaddffee03b09eb04db26fa3a32c8836d613 -#+s6-linux-init.a6524dc0da3a64eca6605fbab5387fc23aee11641e8c78df8ff11dff7cbe2a23 -#+mdevd.9eb4e080ae1f77a023a765bfe64c84969de5a2799ec28196c58a417dd0cf7a67 -#+s6-dns.cc60cc673e7826433641ed3e2aad4efc643e1e617382dfc98a75a33afd10e138 -#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 -#+s6-networking.ad286bd57500a51f79ad09bf3c0984c5b8b97a2a27d3089b2b0fb0f11c117033 -#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 -#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe -#+aat.b4bf9a146b5cdfb5882fcee353c62b121a3237a2da7e967d53edfac6ad18f099 -#+confz.7096c6907e9cc6998358f5c6a41346b7cc59cc13168b0741b68ade0001a8fd77 -#+containers.d1bf556661f3e0e560cc82d13b89700d6f112c010e436d0693861cbbc3b61977 -#+fileset.1c1a255aa16f92cf86a8ce188828bf4c2375a3c660fa54e47c637a7ef4510592 -#+logincaps.97234d9f65fd1ef50bb8a47c6f27d436f4f8c2a5cf11601a7f5cc32bd4bd7fac -#+snaprep.fd1e6daf121d491db22320dcfe3b6e064a88dabb30e9ee9928bd7c0594cde7fe -#+curl.0061e2b4e63f55797ee20fa643207dc815bd54b0faa8a55276d92f334d6ed837 -#+git.582d85f2c473c8974ee778632c4389b28a265f70565c2245fb733badb3ab8ab1 -#+xbps.cfd899b2267e63867c9cd239c49374dc36a3cc0ded4b90ad6f525e567f079818 -#+apk-tools.d49d10fb5e01a7f5e1f7cbeec800e2b96ca00797e370d3aead643fe7b9233f30 -#+getent.93e754ab9d00c23421e3adb407cf8901d6013d4331f5267f6dd10173c0be1030 -#+getconf.1573dd9b2e84f540bfcfa7d53568064c1b54fb0c49755201fe76a3df979bf403 -#+iconv.9755d220925a69dbb6b79798b75afe2aa3dc77ecb991e81ffb8fd12747c8080f -#+libcap.edba12ebbc6125fa22e3ae179b50d06c360eba333b3bdf20d8c82cb3f563f132 -#+applyuidgid-caps.bfa3d7590305d3fe051d101c056822ece5038783ef3ada05761aa3a1bfcdd58f -#+ccx-utils.d7071841c5bc68c1b4b19e97755afad512ea8d0e607b182d7943c45c3e3c4229 -#+user-env.1bb4a783dfbc7e1f0f0ca0911ae2aca4091c4b869dd8ff48c2b5cd95cb0f1c94 -#+strace.8f47a6c70de766eb8c9cad6c9a2ff23e75e4ad3bf281062e457f396cedd9ea9a -#+mlog.4aacddf4a772148aea1dca6b4434b2afdd88caf58b482501dec770cce7684dfb- \ No newline at end of file +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+diffutils.f454962021fe007440223878647a4e0e2e1d0a9de317aa4fdd274300a5ffc892 +#+patch.a1d9db6514fc3a5600450ed53f5bff47a68723947d83df7a176f51c661bbcc57 +#+flex.b3adc3817f79d8b92ee5c8306836fe62f3b05ae9062d333b9dd2d8a27185fb50 +#+bison.d4a56278723364f9568d3e537d034e9c7832c03e55bb0240b7cb6c4d7af4006a +#+rsync.5b8ab64e646da2b4bd71f962fff0e2a4f7aa121e5488b02e136703b27278a898 +#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+s6-rc.e3be4a113ee9715f7238427bb1ad692d5aa75f52ca7f687a32a3a76a648c708b +#+s6-portable-utils.171f71742faa2f5265177ddf14a06b967498cfee79e6899a4aa6f32023e7b2fd +#+s6-linux-utils.2f79d8e46333e4fe48d42109298801446bbfd2e5ad99beef594e0f8ed5efebb0 +#+s6-linux-init.bbb6c6a78dc4aea8e726ad3143233439184ac9564e9e8b3210b0eabf9e7f8238 +#+mdevd.26ce383b5715db033c9cd3707798a7c1ce1f9056caf987bab46bd4586fceca7a +#+s6-dns.1db2b68f9b71a747f03b48b5f25ec094ece473653bb122d9bcf75ddf932a4ca5 +#+libressl.e31469de8d9f83ef20211810e18aee71c9dc87e5959467b598ddbc7337775e3e +#+s6-networking.3cfa07abca2d99e46c55463967e742e4233e6e5044084f77edd0c7a676355dfa +#+zsh.7a369c7df7e28c31fa6a31e300992e71813f77fa51865970940cdbfddb96cc20 +#+pthbs-banginstall.f1d88327c7cccb70afb2ea7abeb1eb5339d4a9d90a276e86ae542430fac2abb3 +#+aat.b8b1a512c709e5a2f9a05a35e1b334803895b883a11d81fa8cf2d49a186a15d9 +#+confz.ec6eee281ee2a69bd5a06f7d626b3bfb3ee80c598bd62d65d07b93d3f6f73738 +#+containers.d08e3144aec6c92b6a1cba623178eeebfc91fd0e170bac6a8730d2c656a4aef2 +#+fileset.5b77d7d8151199c906a6b6b48632e57b9bac2bd145568c0ffe92df4955144d67 +#+logincaps.172cb620448215cecbc9048751a742645b1e29b50e4ff58460acb9c2ac90fb45 +#+snaprep.fa5e713c63d8924837579f4bf85124ca133d6d7581727ab9b7aff91080f69a10 +#+curl.7bd1c7ec468d91de9503078cfb4daa1c60c552ea16a77fe5455a0cebb56c442b +#+git.80ca2ea4bf044b122ba3e086121828949759c75a23a30759368e5872381e063e +#+xbps.f181f3cc00a2553708e1fbd0ca3794177ee42fc6519165fdf461e420f250fdbb +#+apk-tools.95daf04be169cb56312cda5e288923e266612cf9392d907de8b5a8e741616cd1 +#+getent.60a0ad9aec2b36cfaad5cef527b8798602cb9d97aee585080e04455faa2ee74f +#+getconf.db8807c07fd38d5fa40b5a6db9268b3436f7e8b12f45842ccb4825d20196afd8 +#+iconv.46ec2e37c5aa47dd5851ef45ca3343e3c6df895f79a4ba8fddbe2a9c2e52091b +#+libcap.6a4a031e0b4fb71a848f4102585d3f87c2c3ada49bdfbd3ad59d204a1d6eb7bc +#+applyuidgid-caps.ca24dbb4d0bb755e3ae35f1a2e875b04c6a116ef8407efaada201edf8e468ea6 +#+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 +#+user-env.bd2519154a1cdbfcc37a18e787429ea960989a8746686537ddf3afe06bed44d7 +#+strace.3254abcd653801778b39da20e9ba1237e5371911fac63df4aa8304575db3e282 +#+mlog.c84070d774d221a0b227a54128d534959609f1e717cdd0dca461161a43c4e1a4+ \ 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.29e443bec295f6d124ad3aa0ec8a113ac304470593f988acfca22e0974e441b4- \ No newline at end of file +#+linux-qemu-guest.96bf8f49a2a697af9c30ada754a4247660a5ac51402e446f8b0e8ad325d45fa4+ \ No newline at end of file diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+libarchive.38000329c85525e1fb8085f1153bc50b9141730dacb8eef538fa63cf775464a5 -#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 -#+pkgconf-pkg-config.c6e3db01553a2cc6c92422f8d60a33dcb49f60862cded670dea79029b938af22 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+libarchive.42a41c325c979ac46ed17fe5b098926225da877f5d76c1982fdddd60d03cac60 +#+libressl.e31469de8d9f83ef20211810e18aee71c9dc87e5959467b598ddbc7337775e3e +#+pkgconf-pkg-config.a88fae723a8c20fc2cc0f7c6ecba28ac1f4975b4b48a7074928cb9589b117898 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'xbps-0.59.2' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -34,6 +34,7 @@ find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \; --localstatedir=/var \ --enable-static + make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C include make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C lib libxbps.a install -d "$dest/library" @@ -47,6 +48,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C data make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C data install DESTDIR="$pthbs_destdir" + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -64,6 +66,7 @@ check_static command/xbps-install.static mkdir -p "$dest/keys" mv -v "$pthbs_destdir/var/db/xbps/keys" "$dest/keys/void" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 -#+netbsd-curses.4422dee0f4fad4914f08acb2f92b5dabd342647ae55e5ff8b91a85907ffe18dd -#+libbsd.aaea717e06577badc7f693869f11f04566a3aed12596a15a4bac60b7db195f53 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+m4.25f9b0c3bad90ad8fea21097543f902a88579d0238a665019831b1267140d8ef +#+netbsd-curses.b1f398f7b24198ef7bc528effb2969bf9d2f12d6ab506966e6ec311eacbf7b9a +#+libbsd.27ec89ca0fe2c5738edb360f852344da44c729dab7be68be540a5765e23f7313 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. @@ -55,13 +55,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'zsh-5.9' + autotools_config_static --enable-static --disable-shared \ --enable-libc-musl --disable-locale \ --enable-cap \ @@ -88,8 +88,10 @@ mv -v ../zsh_config/etc "${dest}/" mv -v ../zsh_config/zsh-functions/* "${dest}/zsh/site-functions/" + check_static command/zsh + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd @@ -1,19 +1,19 @@ #!/usr/bin/env pthbs-build -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c -#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 -#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 -#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f +#+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d +#+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f +#+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 +#+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'zstd-1.5.5' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -30,6 +30,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) default install \ libdir="/home/ccx/versions/$pthbs_package/library" rm -v "$pthbs_destdir//home/ccx/versions/$pthbs_package/library"/*.so* + check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -45,6 +46,7 @@ check_static() { } check_static command/zstd + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 -#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 +#+pthbs-banginstall.441ea39dc88dbccabecc255285f80865ecf7c3f6bdbda554f394a7e75b1f1273 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'aat' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -33,6 +33,7 @@ mv -v data.awk "$pkgdir/" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'abduco' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -36,13 +36,13 @@ sed 's/^/> /' config.mk make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install # the Makefile hardcodes 'bin' despite configure undersanding BINDIR mv "${dest}/bin" "${dest}/command" + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -59,6 +59,7 @@ check_static() { check_static command/abduco + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/acl b/variants/root-x86_64/acl @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 -#+attr.ad254c46ca6e415aee3acb033ca189f13568c3a285ea31b71f9da1613a922569 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b +#+attr.dba7ecd1636070d45661a128f9ea67835c1eebad71b74c0e74fcab53425bdd7e #@untar:-z:sha256:5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c:. @@ -53,25 +53,26 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'acl-2.3.2' + autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/chacl + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/alpine-keys b/variants/root-x86_64/alpine-keys @@ -1,19 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'alpine-keys' + mkdir -p "${dest}/keys" mv alpine-keys/keys "${dest}/keys/alpine" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools @@ -1,25 +1,25 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 -#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 -#+zstd.afe7ff25aaafc3c81a21431d6fa60d8ea68c05aaae50d43d1106cb2af2606eae -#+pkgconf-pkg-config.7db40222b94aaaf29c4fd99c560d36879f964e41d462a658a30a58542d7e30a6 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+patch.2d581c1f77e6f9c8d18faa0551801881b33ca7c5347ab8c84873890d49010a74 +#+libressl.fa788edd570aad61d2af648463649a8ef55161deeedd4b056392bb118d9ccd24 +#+zstd.e840b84ff3a5c9239f8e8ea602cb13180acf2ad0941a0b3e5e4a01994db033cb +#+pkgconf-pkg-config.b8d7cc5ab2a026b56458192b425ff101668575ff36619bfdfe9272fb17a40612 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'apk-tools' patch -p1 <../apk-tools.patch + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -39,6 +39,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) STATIC=y LUA=no V=1 \ PKGCONFIGDIR="$prefix/library/pkgconfig" \ install-static + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -53,6 +54,7 @@ check_static() { fi } check_static command/apk.static + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps @@ -1,20 +1,21 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c -#+libcap.3a2674b04629180b1f8f8ee3b7d7133a3c45648fe2509a5c09f3fab249d7d814 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b +#+libcap.d31b5daa9c6e323d109fe63e7dcd4a249a22519b6de7f0e22f0b8c1746512605 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'applyuidgid-caps' name='applyuidgid-caps' + CFLAGS="-D_GNU_SOURCE" LDFLAGS="-lskarnet -lcap" + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -27,6 +28,7 @@ install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -43,6 +45,7 @@ check_static() { check_static "command/$name" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/argp-standalone b/variants/root-x86_64/argp-standalone @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:. #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0 @@ -34,15 +34,16 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'argp-standalone-1.5.0' + autotools_config + make -j${JOBS:-1} -l$((1+${JOBS:-1})) libargp.a @@ -54,6 +55,7 @@ install -m 644 argp.h "${dest}/include" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/attr b/variants/root-x86_64/attr @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:. @@ -52,13 +52,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'attr-2.5.2' + LDFLAGS=--static autotools_config_static @@ -66,11 +66,11 @@ autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/bison b/variants/root-x86_64/bison @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 -#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b +#+flex.86ee3bffd4d38e384a456f848f6828ad4d125df27c660f11ed795c565345bb23 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. @@ -54,13 +54,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'bison-3.8.2' + export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" autotools_config_static --disable-nls @@ -69,14 +69,15 @@ autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install rm -vrf "$pthbs_destdir"/$prefix/lib/charset.alias rmdir -p "$pthbs_destdir"/$prefix/lib || true + check_static command/bison + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/bootstrap.environment b/variants/root-x86_64/bootstrap.environment @@ -1,4 +1,4 @@ #!/usr/bin/env pthbs-build -#+busybox.575b177867cc3377d85bc687bb0d8a57ccb1341caf177904b42a9aaa0cdbd432 -#+gnu-make.65769f42a84e60386421be3588c53cbea2c2e02924eb7c459f8f9fe2c93ff60f -#+musl-cross-make.bc5c3622044466fcdca41ec6dc3e94a31b291bea73aa32c4b8c4ffb7358a238d- \ No newline at end of file +#+busybox.8d31de4bbd63c77b80d66e932d3b8465e91fa53f5f2451ca8d182e649945f672 +#+gnu-make.e8491664984e42d3397bbaafe44057c5b8aefdbe708a91acef331c4bcc3b90a8 +#+musl-cross-make.ca6ebbfaa2cd42b4edd81db03a6ef0364841589e0de1dabdf31c2dd97aad75be+ \ No newline at end of file diff --git a/variants/root-x86_64/busybox b/variants/root-x86_64/busybox @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.65769f42a84e60386421be3588c53cbea2c2e02924eb7c459f8f9fe2c93ff60f -#+busybox.575b177867cc3377d85bc687bb0d8a57ccb1341caf177904b42a9aaa0cdbd432 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.e8491664984e42d3397bbaafe44057c5b8aefdbe708a91acef331c4bcc3b90a8 +#+busybox.8d31de4bbd63c77b80d66e932d3b8465e91fa53f5f2451ca8d182e649945f672 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab:busybox/.config diff --git a/variants/root-x86_64/busybox-diffutils b/variants/root-x86_64/busybox-diffutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-findutils b/variants/root-x86_64/busybox-findutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-kbd b/variants/root-x86_64/busybox-kbd @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-login b/variants/root-x86_64/busybox-login @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox:bootstrap b/variants/root-x86_64/busybox:bootstrap @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.bc5c3622044466fcdca41ec6dc3e94a31b291bea73aa32c4b8c4ffb7358a238d -#+gnu-make.65769f42a84e60386421be3588c53cbea2c2e02924eb7c459f8f9fe2c93ff60f +#+musl-cross-make.ca6ebbfaa2cd42b4edd81db03a6ef0364841589e0de1dabdf31c2dd97aad75be +#+gnu-make.e8491664984e42d3397bbaafe44057c5b8aefdbe708a91acef331c4bcc3b90a8 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config -mcm=/versions/musl-cross-make.bc5c3622044466fcdca41ec6dc3e94a31b291bea73aa32c4b8c4ffb7358a238d -make=/versions/gnu-make.65769f42a84e60386421be3588c53cbea2c2e02924eb7c459f8f9fe2c93ff60f +mcm=/versions/musl-cross-make.ca6ebbfaa2cd42b4edd81db03a6ef0364841589e0de1dabdf31c2dd97aad75be +make=/versions/gnu-make.e8491664984e42d3397bbaafe44057c5b8aefdbe708a91acef331c4bcc3b90a8 export PATH="$mcm/bin:$make/command:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/variants/root-x86_64/busybox:modutils b/variants/root-x86_64/busybox:modutils @@ -1,25 +1,26 @@ #!/usr/bin/env pthbs-build -#+linux.05e004ffc94ca217993ebb26f67bc5b80dfb5e1edcb7246fe97121382c5c2798 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+linux.8f90bbb36c6217da1456763d77e3a4688715d2e58a556d88cf7d0c632989edff +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 #@sha256:ea5d8b394f6e9c3a6cf03d6f4cd3a04db5d9209e7d25bc89aa4de5ac4cb0c141:busybox/.config #@git:887295686dbc69e5b2d530f0e6a8dbf94094ac9f:busybox # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'busybox' + export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/versions/linux.05e004ffc94ca217993ebb26f67bc5b80dfb5e1edcb7246fe97121382c5c2798" +CONFIG_DEFAULT_MODULES_DIR="/versions/linux.8f90bbb36c6217da1456763d77e3a4688715d2e58a556d88cf7d0c632989edff" EOF + make V=1 CROSS_COMPILE=x86_64-linux-musl- LDFLAGS=-static HOSTLDFLAGS=-static \ HOSTCC="$CC -static" CC="$CC -static" HOSTCFLAGS=-D_GNU_SOURCE -j${JOBS:-1} @@ -48,6 +49,7 @@ done + cd "$pthbs_destdir/versions/$pthbs_package" mv .install-links.new .install-links diff --git a/variants/root-x86_64/ca-certificates-wip-donotuse b/variants/root-x86_64/ca-certificates-wip-donotuse @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+certdata2pem.717fb19fd2a5a27af0bba2d070e3976e8356e7741ffc8729d07ef0be2fd6ec90 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+certdata2pem.16385793a47d368b5c3a153d608ac4a21e701917057efc9f37c6ddc711b2d6e2 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'ca-certificates-20241121' + touch blacklist.txt # TODO! certdata2pem @@ -23,6 +23,7 @@ done + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils @@ -1,19 +1,19 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c -#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b +#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 #@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'ccx-utils' + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -59,6 +59,7 @@ do done + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem @@ -1,17 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'certdata2pem' name='certdata2pem' + CFLAGS="-D_GNU_SOURCE" + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -24,6 +25,7 @@ install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -40,6 +42,7 @@ check_static() { check_static "command/$name" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 -#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 +#+pthbs-banginstall.441ea39dc88dbccabecc255285f80865ecf7c3f6bdbda554f394a7e75b1f1273 # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'confz' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -30,6 +30,7 @@ fi + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+busybox-login.c0cddb8b80bdb1c66c6a8dc41d985524d914e5b19fe883371763d0235e5de2e7 -#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 -#+ccx-utils.8a6cf2bc9e8fe5cb7eb99fcf5fb2aca24e21f1d980de28fb4054f7e196cff032 -#+applyuidgid-caps.7a74554cf64f149cb80fdc7caa69829b497c90c1caff248a1b3a07eb1c4d3ca1 -#+easyseccomp.5a28e31b07364f1f44076717a22f7606c762ef75d343f5ce57295b9e23bedeca -#+mlog.0bdee80b00d4018b1e3668ef9e05e2aaa3ffd00696fb1180c570aedcd4a6a863 -#+abduco.e6bfa836ce5039c063cb64afa8ce3940a8dcc194d6cae5bca8fbbf3de9a09dd2 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+busybox-login.137587e982688716b741fc648c84c8709882bef338d27d5e53ddefedb373ba9b +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 +#+applyuidgid-caps.8a88837d818f0b64ae533cf010dd6b4981ec06580e0c1606eca532f765f4baac +#+easyseccomp.56f7727c899821aacadc5ba2d532ac5ef92f95539f9e7752eb428cd52e4f7598 +#+mlog.f6e876fbff20d311c177432ca821cc33b98f205d343105aa37ef81d40fdf1bc0 +#+abduco.ad0c714e2b8d927f929417509063ce29b2c72416a5adebb790484135d374da1e #@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 @@ -1,23 +1,23 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 -#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 -#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+alpine-keys.48bf1534be10eaa033727aabc01b7e1d6ad571d37632f5e666a95c5b645e667f -#+apk-tools.b6ae2978c21328aef2cd7bee77918521adf924c5e6dafa2d6c1efac0aad437c6 -#+xbps.439919b3373859eccaed14cb1bdbc94948ccc1582a64025de6eb9828fd4714e5 -#+container-bin-image.a5caf82f57a03ca19230a8385dc2907b8751c102596617f33c894ee8b67cb16f +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 +#+pthbs-banginstall.441ea39dc88dbccabecc255285f80865ecf7c3f6bdbda554f394a7e75b1f1273 +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+alpine-keys.8fcbad8520af4e46aeb6560fe86202e9cd8ade32b7f4909df4283bdf8a98f03f +#+apk-tools.b1f90d4190ac77823be9afe8f03f14d5c56bfd361a1b1b10df40001ce59cbb01 +#+xbps.f775dc195ab972df1859f8c006355d1fc828b60021b62c557a0b7b41a803923f +#+container-bin-image.a9bae0923a2273051712fa02b861201c253397b94d7ccf469afa537fbecdf849 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'containers' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -47,10 +47,10 @@ 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.b6ae2978c21328aef2cd7bee77918521adf924c5e6dafa2d6c1efac0aad437c6/command/apk.static' "${dest}/deps/command/" -ln -sf '/versions/xbps.439919b3373859eccaed14cb1bdbc94948ccc1582a64025de6eb9828fd4714e5/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/versions/apk-tools.b1f90d4190ac77823be9afe8f03f14d5c56bfd361a1b1b10df40001ce59cbb01/command/apk.static' "${dest}/deps/command/" +ln -sf '/versions/xbps.f775dc195ab972df1859f8c006355d1fc828b60021b62c557a0b7b41a803923f/command/xbps-install.static' "${dest}/deps/command/" -for f in '/versions/alpine-keys.48bf1534be10eaa033727aabc01b7e1d6ad571d37632f5e666a95c5b645e667f'/keys/alpine/*/*; do +for f in '/versions/alpine-keys.8fcbad8520af4e46aeb6560fe86202e9cd8ade32b7f4909df4283bdf8a98f03f'/keys/alpine/*/*; do test -f "$f" d=$(basename "${f%/*}") mkdir -p "${dest}/deps/keys/alpine/$d" @@ -58,16 +58,17 @@ for f in '/versions/alpine-keys.48bf1534be10eaa033727aabc01b7e1d6ad571d37632f5e6 done mkdir -p "${dest}/deps/keys/void" -for f in '/versions/xbps.439919b3373859eccaed14cb1bdbc94948ccc1582a64025de6eb9828fd4714e5'/keys/void/*; do +for f in '/versions/xbps.f775dc195ab972df1859f8c006355d1fc828b60021b62c557a0b7b41a803923f'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.a5caf82f57a03ca19230a8385dc2907b8751c102596617f33c894ee8b67cb16f/container-bin-image' -test -f '/versions/container-bin-image.a5caf82f57a03ca19230a8385dc2907b8751c102596617f33c894ee8b67cb16f/container-bin-image/if' -ln -sf '/versions/container-bin-image.a5caf82f57a03ca19230a8385dc2907b8751c102596617f33c894ee8b67cb16f/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.a9bae0923a2273051712fa02b861201c253397b94d7ccf469afa537fbecdf849/container-bin-image' +test -f '/versions/container-bin-image.a9bae0923a2273051712fa02b861201c253397b94d7ccf469afa537fbecdf849/container-bin-image/if' +ln -sf '/versions/container-bin-image.a9bae0923a2273051712fa02b861201c253397b94d7ccf469afa537fbecdf849/container-bin-image' "${dest}/deps/" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 -#+s6-portable-utils.47861b330e2c41a239fb18461fbff57c7a6913de09f7d6be8ed478bb2590ca8f -#+s6-linux-utils.3267fe9747bb91e80ecbc74ae45688460b09ec212dae8a39e2e8aa7ebfda7570 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 -#+confz.37863d2ec8636071b9d3cd90853d7c66d93a82ffe26af3091502a87f3d5e7b53 -#+containers.10cf2feb4247bdc7f05bdfb82c7a7f9fb553445140b9613258735e0ab610f2d1 -#+xbps.439919b3373859eccaed14cb1bdbc94948ccc1582a64025de6eb9828fd4714e5 -#+zstd.afe7ff25aaafc3c81a21431d6fa60d8ea68c05aaae50d43d1106cb2af2606eae -#+apk-tools.b6ae2978c21328aef2cd7bee77918521adf924c5e6dafa2d6c1efac0aad437c6 -#+alpine-keys.48bf1534be10eaa033727aabc01b7e1d6ad571d37632f5e666a95c5b645e667f -#+getent.0af39b5b26c83dd63917511aae3fc97fc08751558abe6852f92707dc17a4bf40 -#+fileset.6e662c8a49937222a1575d3de8b2363309b37ed74bd51559184afb3ce0266015 -#+ccx-utils.8a6cf2bc9e8fe5cb7eb99fcf5fb2aca24e21f1d980de28fb4054f7e196cff032 -#+easyseccomp.5a28e31b07364f1f44076717a22f7606c762ef75d343f5ce57295b9e23bedeca- \ No newline at end of file +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+s6-portable-utils.02a66968f0ac9c69d31491a4172e24ef37cab78fc968d5a75e46a1dcf0a588a9 +#+s6-linux-utils.37b19062018cb44159d0c2b2e08b3e098134c767810ef243455abaffe4c48bf2 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 +#+confz.6ac138f9d2a1d5421c1dd60176b3acc5fe033cc971b61260d29101ce6f95946e +#+containers.2941676a924b1bef97b198ebc2fc1ee929e7aa0dc2ae95df4ee6bd5af4907f40 +#+xbps.f775dc195ab972df1859f8c006355d1fc828b60021b62c557a0b7b41a803923f +#+zstd.e840b84ff3a5c9239f8e8ea602cb13180acf2ad0941a0b3e5e4a01994db033cb +#+apk-tools.b1f90d4190ac77823be9afe8f03f14d5c56bfd361a1b1b10df40001ce59cbb01 +#+alpine-keys.8fcbad8520af4e46aeb6560fe86202e9cd8ade32b7f4909df4283bdf8a98f03f +#+getent.dd5870b1ea3d10659d7ebee0e300ddb11538c928c7cad10e57d26b860945425f +#+fileset.35c7f2dd7c0dd297974dd6c03ce5dd2bfa70cbdaa71c6af4da05165f12d25a4f +#+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 +#+easyseccomp.56f7727c899821aacadc5ba2d532ac5ef92f95539f9e7752eb428cd52e4f7598+ \ No newline at end of file diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 -#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b +#+libressl.fa788edd570aad61d2af648463649a8ef55161deeedd4b056392bb118d9ccd24 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. @@ -53,7 +53,6 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'curl-8.6.0' @@ -61,6 +60,7 @@ cd 'curl-8.6.0' + # Do not generate manpages (requires Perl) ( t=$(busybox which true) @@ -86,15 +86,16 @@ autotools_config_static \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install rm -r -v "$pthbs_destdir"'/versions'"/$pthbs_package/man" + check_static command/curl + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -1,45 +1,45 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+diffutils.2e5877895a6809ecb023cad32af3d596421a8f18b240885a808bdca09490de77 -#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 -#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 -#+bison.0874ec124e31d46bcb830839f339b9dad753f28f4a5870f76e88ed4d646766e6 -#+rsync.22db6b667e8faef094268871e4efd1c7fefd074b0db2ea9fbc88780853106ce7 -#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 -#+s6-rc.124d3e7a3b03971baf2e14cc88cd91357b1955f69f19fbd411476e16bfe5656d -#+s6-portable-utils.47861b330e2c41a239fb18461fbff57c7a6913de09f7d6be8ed478bb2590ca8f -#+s6-linux-utils.3267fe9747bb91e80ecbc74ae45688460b09ec212dae8a39e2e8aa7ebfda7570 -#+s6-linux-init.d63ab06d21a8cc4a5678c56a1a769094d11603171578ad8bc7cd06772189775d -#+mdevd.5637f01795442cb9da5ef88ce9ef666270e00ebccbcf8b366d9a28d5e77857cd -#+s6-dns.dd0033e6e131f9ec1c449937c9b1c9c232d61b60ec82be9f47e1b1e336690889 -#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 -#+s6-networking.af9eb9d407428d2c19d9d41872a18be611287b861ff8ac347eeb6af01ca7b095 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 -#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 -#+aat.20dac08b162245a67e629492b741fbf0d822608098090cdf1941dc9b4ae35597 -#+confz.37863d2ec8636071b9d3cd90853d7c66d93a82ffe26af3091502a87f3d5e7b53 -#+containers.10cf2feb4247bdc7f05bdfb82c7a7f9fb553445140b9613258735e0ab610f2d1 -#+fileset.6e662c8a49937222a1575d3de8b2363309b37ed74bd51559184afb3ce0266015 -#+logincaps.39e82ec4a208d3ff8d4e75f8e10d7154b66d299db4f13978faaded7957ecfb53 -#+snaprep.4741f235c2100e3518de2e9653755c87e4cc7f6668596829e6bb1e932ddc392d -#+curl.9e29d7b583bb221800bd4071a0710a06c45681d0bed5d54817b6adf3a7dd97f6 -#+git.9e4546cf110327e853beb1562ffe0dd0710e5a962fa285ddff0d8460a8b22c2a -#+xbps.439919b3373859eccaed14cb1bdbc94948ccc1582a64025de6eb9828fd4714e5 -#+apk-tools.b6ae2978c21328aef2cd7bee77918521adf924c5e6dafa2d6c1efac0aad437c6 -#+getent.0af39b5b26c83dd63917511aae3fc97fc08751558abe6852f92707dc17a4bf40 -#+getconf.31b660df2a017fa168106122353ca5a3db7fa1f81fe3dfc44bf65b717275db6e -#+iconv.edbfaa85b49793e93a9017a1783c2bde9a66f1af89603b4af16b9e820aca754f -#+libcap.3a2674b04629180b1f8f8ee3b7d7133a3c45648fe2509a5c09f3fab249d7d814 -#+applyuidgid-caps.7a74554cf64f149cb80fdc7caa69829b497c90c1caff248a1b3a07eb1c4d3ca1 -#+ccx-utils.8a6cf2bc9e8fe5cb7eb99fcf5fb2aca24e21f1d980de28fb4054f7e196cff032 -#+user-env.a42ddd75abbe51cbd88539cf8207ae32501e6fa5430bdf797b8970a14855f4af -#+strace.9de369dc2cf328c7737dd7936efe50c4f1d50835421813d2008a575b2ce88b4e -#+mlog.0bdee80b00d4018b1e3668ef9e05e2aaa3ffd00696fb1180c570aedcd4a6a863 -#+system-config.15492ab7d4db3b4327a62756c5d4aa965b8821bf1255d88393ef5a62587457f8 -#+system-config-rc.d784be950a1be2066ef6a35be339ca12cf961b32d69f5b06159e7eb5a8393250 -#+system-config-scripts.70a7cc705f2f44c94fc111ea29bd598aed790940c6a0c6ec50044753ef4877a8 -#+system-config-init.3a7fb21ce67c0ab7b1a6f11aba1495077addcabaaafda9233735665befdd95da -#+system-config-zsh.fbc38234ec3b05c54c1ec8d85f21fdd052463f3cbc54c123005e97cf8e031360- \ No newline at end of file +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+diffutils.abaa1f6191fca817c122d85501fed0165fb186bc706ff3f671af0b146b743c59 +#+patch.2d581c1f77e6f9c8d18faa0551801881b33ca7c5347ab8c84873890d49010a74 +#+flex.86ee3bffd4d38e384a456f848f6828ad4d125df27c660f11ed795c565345bb23 +#+bison.e742fd5b0f6faf59406354b23da5bed4218d33f2e9e63ea50d2bb08962ccb7e8 +#+rsync.27092513c5dfe1309aa10ffe58a3e5e20bd6aed075d13d3967d6e301c5ad25d6 +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+s6-rc.3790f2b77a5785fe78e78d0ae8f036fd8e6bdd70af979ba1cd752668ae29be82 +#+s6-portable-utils.02a66968f0ac9c69d31491a4172e24ef37cab78fc968d5a75e46a1dcf0a588a9 +#+s6-linux-utils.37b19062018cb44159d0c2b2e08b3e098134c767810ef243455abaffe4c48bf2 +#+s6-linux-init.676e77c29e34f95108eb83ef131a78de5afa7ae0f27fecbf504d43e0d8d0d30d +#+mdevd.c2e962ba272a196b1798c2eab73f2bd1b69b168f897e72e9be3e30bef0e8d985 +#+s6-dns.2a3e90f799cebf15491101cc0b1ba2a0bdc9f68320e02943cfcd4a873fb036fb +#+libressl.fa788edd570aad61d2af648463649a8ef55161deeedd4b056392bb118d9ccd24 +#+s6-networking.17cb5c4e9dc176ae51c8b2d2db3c61c38f8948cdbf72a9a36a0d4787bf0507e4 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 +#+pthbs-banginstall.441ea39dc88dbccabecc255285f80865ecf7c3f6bdbda554f394a7e75b1f1273 +#+aat.5a9f119639fdbd4be3cd5e7165ceec8105cf19314a0f070287eebabf4c104a14 +#+confz.6ac138f9d2a1d5421c1dd60176b3acc5fe033cc971b61260d29101ce6f95946e +#+containers.2941676a924b1bef97b198ebc2fc1ee929e7aa0dc2ae95df4ee6bd5af4907f40 +#+fileset.35c7f2dd7c0dd297974dd6c03ce5dd2bfa70cbdaa71c6af4da05165f12d25a4f +#+logincaps.df2f297b37e210c1c87bb0fe29075c881212710415536282d285e29e4ab41ae4 +#+snaprep.2ecfb0b5d8ce101db913038d3beecf7b0fb13caf574f665c79cab9130b47f0c2 +#+curl.c5cfe7c41254aa70b76a8c509e776088d68d5fed9afc5ff4a9b993d337a56ef6 +#+git.7a0d645acbbd0061d939756cff633e754e3949b6da7563649af4794e3625f10a +#+xbps.f775dc195ab972df1859f8c006355d1fc828b60021b62c557a0b7b41a803923f +#+apk-tools.b1f90d4190ac77823be9afe8f03f14d5c56bfd361a1b1b10df40001ce59cbb01 +#+getent.dd5870b1ea3d10659d7ebee0e300ddb11538c928c7cad10e57d26b860945425f +#+getconf.06490ab44f696a1f37d3abf6d3687ddf922394f8955ecb2eb8aada4629f6e712 +#+iconv.99e2ccc1055b1dd9b9709579a21f075507a104ef99a17eb8d714a245089a5f02 +#+libcap.d31b5daa9c6e323d109fe63e7dcd4a249a22519b6de7f0e22f0b8c1746512605 +#+applyuidgid-caps.8a88837d818f0b64ae533cf010dd6b4981ec06580e0c1606eca532f765f4baac +#+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 +#+user-env.a899fdaf319bf2a261cce0a94c70f3f40ab16528792e579068460b52d6ecaf42 +#+strace.9d9fb47db831d58467e3c080c78f3ff767f20e13c50298fd7045476d2f819214 +#+mlog.f6e876fbff20d311c177432ca821cc33b98f205d343105aa37ef81d40fdf1bc0 +#+system-config.b24e4b33942afedde68e15a4c8253cb4fcabd623ebbd9a5694d8f94026f95458 +#+system-config-rc.1f4604f71a43eafb84a2a019220494fb52531b88d35f19f12e51d3208e6dad7f +#+system-config-scripts.8389da7212133319388382cc8ee9acb4d05179a6bf91a6d39418da80e2503802 +#+system-config-init.dda4250368db4c24ef1818861fb1facb9d7ba0cea404e19151983a270e3f6cf1 +#+system-config-zsh.64b9cd4557eba0b2b315159283fa61b0175f5d98527e7eeddc95472d1a0dd990+ \ No newline at end of file diff --git a/variants/root-x86_64/diffutils b/variants/root-x86_64/diffutils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. @@ -52,26 +52,27 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'diffutils-3.10' + autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/diff check_static command/cmp + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 -#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 -#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 -#+bison.0874ec124e31d46bcb830839f339b9dad753f28f4a5870f76e88ed4d646766e6 -#+libseccomp.61eb6183c7e6e4fc9671ed2fcf28b5a526cd92a28f419ff60fd82076f846ac57 -#+error-standalone.65426411bc5069615a2c8be644b446b3f0d40c5330b4f77921c183c59328bcc3 -#+argp-standalone.a760e52f052d81e23ea5e1faed791e7273d92fcb85169aa7b4d9cc42d020193c +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b +#+patch.2d581c1f77e6f9c8d18faa0551801881b33ca7c5347ab8c84873890d49010a74 +#+flex.86ee3bffd4d38e384a456f848f6828ad4d125df27c660f11ed795c565345bb23 +#+bison.e742fd5b0f6faf59406354b23da5bed4218d33f2e9e63ea50d2bb08962ccb7e8 +#+libseccomp.c456a9fdc257862f8bb56d9623de75bd4714fe1b663131694e6b89188130d101 +#+error-standalone.9f3bd5274f9ebbf8a281fbf17a540663a1900d2b899336e3c4cd1870f7637eef +#+argp-standalone.5d49c1d4841205de366253901780fde734008ad7189b730c7e15bcac9f108cad #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp @@ -41,19 +41,21 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'easyseccomp' patch -p1 <../easyseccomp_fix_includes.patch touch Makefile.in configure + build_env_static autotools_config --enable-seccomp + make -j1 V=1 DESTDIR="$pthbs_destdir" LIBS="-lseccomp -lerror -largp" install + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -70,6 +72,7 @@ check_static() { check_static command/easyseccomp + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:. # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'error-standalone-2.0' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -27,6 +27,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/versions/$pthbs_package \ + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline @@ -1,25 +1,24 @@ #!/usr/bin/env pthbs-build +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 - -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'execline' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ + --with-sysdeps='/versions/skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -28,7 +27,6 @@ cd 'execline' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install if ! test -e "${dest}/command/eltest"; then @@ -41,6 +39,7 @@ fi + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 -#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 +#+pthbs-banginstall.441ea39dc88dbccabecc255285f80865ecf7c3f6bdbda554f394a7e75b1f1273 # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'fileset' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -30,6 +30,7 @@ fi + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/findutils b/variants/root-x86_64/findutils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:. @@ -52,28 +52,29 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'findutils-4.10.0' + autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/find check_static command/xargs # TODO: fix shebang in check_static command/locate # TODO: fix shebang in command/updatedb + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/flex b/variants/root-x86_64/flex @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. @@ -52,12 +52,12 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'flex-2.6.4' + export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" export LDFLAGS="--static" @@ -67,13 +67,14 @@ autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/flex check_static command/flex++ + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'getconf' name='getconf' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -24,6 +24,7 @@ install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -40,6 +41,7 @@ check_static() { check_static "command/$name" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'getent' name='getent' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -24,6 +24,7 @@ install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -40,6 +41,7 @@ check_static() { check_static "command/$name" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git @@ -1,22 +1,22 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 -#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 -#+curl.9e29d7b583bb221800bd4071a0710a06c45681d0bed5d54817b6adf3a7dd97f6 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b +#+libressl.fa788edd570aad61d2af648463649a8ef55161deeedd4b056392bb118d9ccd24 +#+curl.c5cfe7c41254aa70b76a8c509e776088d68d5fed9afc5ff4a9b993d337a56ef6 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'git-2.43.2' + make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" \ CPATH="$pthbs_build_environment/include" \ @@ -35,6 +35,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ V=1 all install + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -50,6 +51,7 @@ check_static() { } check_static command/git + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/gnu-make b/variants/root-x86_64/gnu-make @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.65769f42a84e60386421be3588c53cbea2c2e02924eb7c459f8f9fe2c93ff60f -#+busybox.575b177867cc3377d85bc687bb0d8a57ccb1341caf177904b42a9aaa0cdbd432 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.e8491664984e42d3397bbaafe44057c5b8aefdbe708a91acef331c4bcc3b90a8 +#+busybox.8d31de4bbd63c77b80d66e932d3b8465e91fa53f5f2451ca8d182e649945f672 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. @@ -49,25 +49,26 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'make-4.4.1' + autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/make + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/gnu-make:bootstrap b/variants/root-x86_64/gnu-make:bootstrap @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.bc5c3622044466fcdca41ec6dc3e94a31b291bea73aa32c4b8c4ffb7358a238d +#+musl-cross-make.ca6ebbfaa2cd42b4edd81db03a6ef0364841589e0de1dabdf31c2dd97aad75be #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. @@ -30,13 +30,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'make-4.4.1' -mcm=/versions/musl-cross-make.bc5c3622044466fcdca41ec6dc3e94a31b291bea73aa32c4b8c4ffb7358a238d + +mcm=/versions/musl-cross-make.ca6ebbfaa2cd42b4edd81db03a6ef0364841589e0de1dabdf31c2dd97aad75be export PATH="$mcm/bin:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" @@ -49,11 +49,11 @@ autotools_config --enable-static --disable-shared --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:. @@ -52,24 +52,25 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'gperf-3.1' + autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/gperf + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'iconv' name='iconv' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -24,6 +24,7 @@ install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -40,6 +41,7 @@ check_static() { check_static "command/$name" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/kbd b/variants/root-x86_64/kbd @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. @@ -53,12 +53,12 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'kbd-2.6.4' + export LDFLAGS="--static" autotools_config_static --disable-nls --disable-vlock --disable-werror --disable-tests \ @@ -68,14 +68,15 @@ autotools_config_static --disable-nls --disable-vlock --disable-werror --disable make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install cd ../destdir mv -v data ".$prefix/" + check_static command/loadkeys + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { 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.05e004ffc94ca217993ebb26f67bc5b80dfb5e1edcb7246fe97121382c5c2798 -#+busybox.cdf151a5207a36a5dcaa29783c0e4e60f46160a895dd5cc0eff9f5744b7641df- \ No newline at end of file +#+linux.8f90bbb36c6217da1456763d77e3a4688715d2e58a556d88cf7d0c632989edff +#+busybox.721286d0ade695e1bf3468d998f0425808b234afbc7b68e8dfff65131cc44b17+ \ No newline at end of file diff --git a/variants/root-x86_64/libarchive b/variants/root-x86_64/libarchive @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:. @@ -52,12 +52,12 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libarchive-3.7.2' + export LDFLAGS=--static autotools_config_static --without-xml2 @@ -65,13 +65,14 @@ autotools_config_static --without-xml2 make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/bsdtar check_static command/bsdcpio + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 -#+libmd.b5502ca1cd7971309f0b8f015ca923ca749cd141aa619cd08866bc3fea038b65 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b +#+libmd.ff93850685a454afa55eff827a0c555b37f118651787a1df9e69cc336b6e0c24 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:. @@ -53,23 +53,23 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libbsd-0.11.8' + autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap @@ -1,20 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+pkgconf-pkg-config.7db40222b94aaaf29c4fd99c560d36879f964e41d462a658a30a58542d7e30a6 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+pkgconf-pkg-config.b8d7cc5ab2a026b56458192b425ff101668575ff36619bfdfe9272fb17a40612 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libcap-2.69' sed -i '1 s|^#!/bin/bash|#!/bin/sh|' progs/*.sh + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -23,6 +23,7 @@ build_env_static() { LDFLAGS=--static build_env_static + make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ DESTDIR="$pthbs_destdir" \ SHARED=no DYNAMIC=no LIBCSTATIC=yes \ @@ -41,6 +42,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ CAPSH_SHELL="'-DSHELL=\"$(which sh)\"'" \ LDFLAGS="$LDFLAGS" \ all install + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -59,6 +61,7 @@ check_static command/getcap check_static command/setcap check_static command/getpcaps + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 -#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 -#+bison.0874ec124e31d46bcb830839f339b9dad753f28f4a5870f76e88ed4d646766e6 -#+musl-fts.44d81e64b86b07b98577e659f7132b463318a5b823e9fb4021bbc9c6be00537b +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b +#+flex.86ee3bffd4d38e384a456f848f6828ad4d125df27c660f11ed795c565345bb23 +#+bison.e742fd5b0f6faf59406354b23da5bed4218d33f2e9e63ea50d2bb08962ccb7e8 +#+musl-fts.1a0af1399239cf1d3682bfd905fda83dfce0bb4482add0d3c50796e337fa5c45 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. @@ -55,25 +55,26 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libcgroup-3.0.0' + autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/cgconfigparser + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf @@ -1,20 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+zstd.afe7ff25aaafc3c81a21431d6fa60d8ea68c05aaae50d43d1106cb2af2606eae +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+zstd.e840b84ff3a5c9239f8e8ea602cb13180acf2ad0941a0b3e5e4a01994db033cb #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libelf' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -43,6 +43,7 @@ printf '%s\n' > "${dest}/library/pkgconfig/libelf.pc" \ 'Cflags: -I${includedir}' + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/libmd b/variants/root-x86_64/libmd @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:. @@ -52,23 +52,23 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libmd-1.1.0' + autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 -#+ca-certificates-wip-donotuse.1189a43ba876b13b39b7c458d478642cf7b22643d3bc614970a6d424b8002eb0 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b +#+ca-certificates-wip-donotuse.6ddb47ee8d1b8b6637333736ce05ba39614952990736839e7f6b3f3a37acb41e #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. @@ -54,13 +54,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libressl-3.8.2' + export LDFLAGS="--static" autotools_config_static --with-openssldir="$prefix/config/ssl" @@ -71,7 +71,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) 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.1189a43ba876b13b39b7c458d478642cf7b22643d3bc614970a6d424b8002eb0/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/versions/ca-certificates-wip-donotuse.6ddb47ee8d1b8b6637333736ce05ba39614952990736839e7f6b3f3a37acb41e/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 @@ -86,13 +86,14 @@ printf >env/SSL_CERT_DIR '%s\n' "$prefix/config/ssl/certs" # for git printf >env/GIT_SSL_CAPATH '%s\n' "$prefix/config/ssl/certs" - make DESTDIR="$pthbs_destdir" install + check_static command/openssl check_static command/ocspcheck + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/libretls b/variants/root-x86_64/libretls @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-z:sha256:3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5:. @@ -52,13 +52,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libretls-3.8.1' + export LDFLAGS="--static" autotools_config_static @@ -66,11 +66,11 @@ autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 -#+pkgconf-pkg-config.7db40222b94aaaf29c4fd99c560d36879f964e41d462a658a30a58542d7e30a6 -#+gperf.3d2985af9b04d9f74187af47b0719704a6211ee03ff357da514278165d84f6f4 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b +#+pkgconf-pkg-config.b8d7cc5ab2a026b56458192b425ff101668575ff36619bfdfe9272fb17a40612 +#+gperf.8045e713c9d8de6c79f7476e24eca285f54950929b2a6314ccffba269512c2ab #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:. @@ -54,13 +54,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libseccomp-2.6.0' + export LDFLAGS="--static" autotools_config_static @@ -68,13 +68,14 @@ autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/scmp_sys_resolver + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:. @@ -52,13 +52,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libunwind-1.8.1' + autotools_config_static --enable-cxx-exceptions \ --enable-coredump \ --enable-ptrace \ @@ -69,11 +69,11 @@ autotools_config_static --enable-cxx-exceptions \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+findutils.6a815ac1b6d3973c196cb0ade4afcbac0671ca5d5468ba8848028f8f3c45ced0 -#+diffutils.2e5877895a6809ecb023cad32af3d596421a8f18b240885a808bdca09490de77 -#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 -#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 -#+bison.0874ec124e31d46bcb830839f339b9dad753f28f4a5870f76e88ed4d646766e6 -#+rsync.22db6b667e8faef094268871e4efd1c7fefd074b0db2ea9fbc88780853106ce7 -#+zstd.afe7ff25aaafc3c81a21431d6fa60d8ea68c05aaae50d43d1106cb2af2606eae -#+libelf.1d8be3f25eb73521b829c2515f8f4dc31c54adfcd03e6cbacf4df217fb81cc04 -#+pkgconf-pkg-config.7db40222b94aaaf29c4fd99c560d36879f964e41d462a658a30a58542d7e30a6 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+findutils.3699964598470d9d3fb0f4674fd28ea71c4798ee67e9e2a0eb4c11723d65f4cb +#+diffutils.abaa1f6191fca817c122d85501fed0165fb186bc706ff3f671af0b146b743c59 +#+patch.2d581c1f77e6f9c8d18faa0551801881b33ca7c5347ab8c84873890d49010a74 +#+flex.86ee3bffd4d38e384a456f848f6828ad4d125df27c660f11ed795c565345bb23 +#+bison.e742fd5b0f6faf59406354b23da5bed4218d33f2e9e63ea50d2bb08962ccb7e8 +#+rsync.27092513c5dfe1309aa10ffe58a3e5e20bd6aed075d13d3967d6e301c5ad25d6 +#+zstd.e840b84ff3a5c9239f8e8ea602cb13180acf2ad0941a0b3e5e4a01994db033cb +#+libelf.eeb17701dc73c6b940a3a0216e843b4a18c4755bbfde4b38970e7809ed05f073 +#+pkgconf-pkg-config.b8d7cc5ab2a026b56458192b425ff101668575ff36619bfdfe9272fb17a40612 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config @@ -19,7 +19,6 @@ # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'linux-6.1' @@ -27,6 +26,7 @@ cd 'linux-6.1' unxz -c < '../patch-6.1.34.xz' | patch -p1 -N patch -p1 -N <../noobjtool.patch + export CPATH="$pthbs_build_environment/include" cp -v ../linux.config .config @@ -34,6 +34,7 @@ cp -v ../linux.config .config diff -u ../linux.config .config || true + make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ V=1 \ HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \ @@ -55,6 +56,7 @@ rm -f "$module_dir/build" "$module_dir/source" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+findutils.6a815ac1b6d3973c196cb0ade4afcbac0671ca5d5468ba8848028f8f3c45ced0 -#+diffutils.2e5877895a6809ecb023cad32af3d596421a8f18b240885a808bdca09490de77 -#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 -#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 -#+bison.0874ec124e31d46bcb830839f339b9dad753f28f4a5870f76e88ed4d646766e6 -#+rsync.22db6b667e8faef094268871e4efd1c7fefd074b0db2ea9fbc88780853106ce7 -#+zstd.afe7ff25aaafc3c81a21431d6fa60d8ea68c05aaae50d43d1106cb2af2606eae -#+libelf.1d8be3f25eb73521b829c2515f8f4dc31c54adfcd03e6cbacf4df217fb81cc04 -#+pkgconf-pkg-config.7db40222b94aaaf29c4fd99c560d36879f964e41d462a658a30a58542d7e30a6 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+findutils.3699964598470d9d3fb0f4674fd28ea71c4798ee67e9e2a0eb4c11723d65f4cb +#+diffutils.abaa1f6191fca817c122d85501fed0165fb186bc706ff3f671af0b146b743c59 +#+patch.2d581c1f77e6f9c8d18faa0551801881b33ca7c5347ab8c84873890d49010a74 +#+flex.86ee3bffd4d38e384a456f848f6828ad4d125df27c660f11ed795c565345bb23 +#+bison.e742fd5b0f6faf59406354b23da5bed4218d33f2e9e63ea50d2bb08962ccb7e8 +#+rsync.27092513c5dfe1309aa10ffe58a3e5e20bd6aed075d13d3967d6e301c5ad25d6 +#+zstd.e840b84ff3a5c9239f8e8ea602cb13180acf2ad0941a0b3e5e4a01994db033cb +#+libelf.eeb17701dc73c6b940a3a0216e843b4a18c4755bbfde4b38970e7809ed05f073 +#+pkgconf-pkg-config.b8d7cc5ab2a026b56458192b425ff101668575ff36619bfdfe9272fb17a40612 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch @@ -18,13 +18,13 @@ # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'linux-6.15' patch -p1 -N <../noobjtool.patch + export CPATH="$pthbs_build_environment/include" cp -v ../linux.config .config @@ -32,6 +32,7 @@ cp -v ../linux.config .config diff -u ../linux.config .config || true + make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ V=1 \ HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \ @@ -53,6 +54,7 @@ rm -f "$module_dir/build" "$module_dir/source" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -1,20 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 -#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 -#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+ccx-utils.8a6cf2bc9e8fe5cb7eb99fcf5fb2aca24e21f1d980de28fb4054f7e196cff032 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 +#+pthbs-banginstall.441ea39dc88dbccabecc255285f80865ecf7c3f6bdbda554f394a7e75b1f1273 +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'logincaps' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -44,6 +44,7 @@ sh build_static.sh -DLOGINEXEC_PATH="\"$prefix/command/loginexec\"" cp -a login "${dest}/command/" + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -58,6 +59,7 @@ check_static() { fi } check_static command/login + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/m4 b/variants/root-x86_64/m4 @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. @@ -51,25 +51,26 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'm4-1.4.19' + autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/m4 + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 -#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 +#+pthbs-banginstall.441ea39dc88dbccabecc255285f80865ecf7c3f6bdbda554f394a7e75b1f1273 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'mdev-scripts' + mkdir -p "$dest" for script in persistent-storage dvbdev ptpdev usbdev; do mv -v $script mdev-hook-$script @@ -18,6 +18,7 @@ for script in persistent-storage dvbdev ptpdev usbdev; do pthbs-banginstall mdev-hook-$script "$dest" done + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd @@ -1,26 +1,25 @@ #!/usr/bin/env pthbs-build - -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 - -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'mdevd' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ + --with-sysdeps='/versions/skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -29,11 +28,11 @@ cd 'mdevd' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 -#+mdev-scripts.3f42457c32a69a26e9132c7c1857d386f9c3213dc79884f5426644fafe8b4d0a -#+mdevd.5637f01795442cb9da5ef88ce9ef666270e00ebccbcf8b366d9a28d5e77857cd- \ No newline at end of file +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+mdev-scripts.01d3ec22825a1a331616934f9cc1cec264aa224cb46ac29f67a3531479f7a7df +#+mdevd.c2e962ba272a196b1798c2eab73f2bd1b69b168f897e72e9be3e30bef0e8d985+ \ No newline at end of file diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'mlog' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -25,6 +25,7 @@ install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -40,6 +41,7 @@ check_static() { } check_static "command/$name" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/musl-cross-make b/variants/root-x86_64/musl-cross-make @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.bc5c3622044466fcdca41ec6dc3e94a31b291bea73aa32c4b8c4ffb7358a238d -#+gnu-make.65769f42a84e60386421be3588c53cbea2c2e02924eb7c459f8f9fe2c93ff60f -#+busybox.575b177867cc3377d85bc687bb0d8a57ccb1341caf177904b42a9aaa0cdbd432 +#+musl-cross-make.ca6ebbfaa2cd42b4edd81db03a6ef0364841589e0de1dabdf31c2dd97aad75be +#+gnu-make.e8491664984e42d3397bbaafe44057c5b8aefdbe708a91acef331c4bcc3b90a8 +#+busybox.8d31de4bbd63c77b80d66e932d3b8465e91fa53f5f2451ca8d182e649945f672 #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -16,10 +16,10 @@ # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' + # For validating the compiler printf '%s\n' 'int main(void) { return 0; }' >true.c @@ -38,6 +38,7 @@ printf '%s %s\n' >musl-cross-make/hashes/linux-6.5.4.tar.xz.sha1 \ touch musl-cross-make/sources/* + # Patch linker path for dynamic executables make -C musl-cross-make gcc-11.2.0 sed -i -e 's|/lib/ld-musl-|/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h @@ -80,12 +81,14 @@ printf '%s\n' > "$dd/library/pkgconfig/zlib.pc" \ 'Cflags: -I${includedir}' + # validate zlib "$dd"'/bin/x86_64-linux-musl-gcc' -I"$dd/include" -L"$dd/lib" -static -o zpipe zpipe.c -lz ./zpipe <true.c >true.c.gz ./zpipe -d <true.c.gz >true.c.2 cmp -s true.c true.c.2 + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/musl-cross-make:bootstrap-0 b/variants/root-x86_64/musl-cross-make:bootstrap-0 @@ -13,10 +13,10 @@ # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' + # For validating the compiler printf '%s\n' 'int main(void) { return 0; }' >true.c @@ -28,6 +28,7 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* + # Patch linker path for dynamic executables make -C musl-cross-make gcc-9.4.0 sed -i -e 's|/lib/ld-musl-|/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-9.4.0/gcc/config/*/linux*.h @@ -47,6 +48,7 @@ done grep -F "$pthbs_package" true.linker + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/musl-cross-make:bootstrap-1 b/variants/root-x86_64/musl-cross-make:bootstrap-1 @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.5841ff0b059b96fd54f14b2e228eab2035b50bb18b92ea9d8036f28ca5f14392 +#+musl-cross-make.6f14b5cf1ac58392ea6c27c58a55cfe6500e14b05e7a5db3b04da18f211009b8 #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -14,11 +14,11 @@ # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' -bootstrap=/versions/musl-cross-make.5841ff0b059b96fd54f14b2e228eab2035b50bb18b92ea9d8036f28ca5f14392 + +bootstrap=/versions/musl-cross-make.6f14b5cf1ac58392ea6c27c58a55cfe6500e14b05e7a5db3b04da18f211009b8 "$bootstrap/bin/x86_64-linux-musl-gcc" --version # For validating the compiler @@ -36,6 +36,7 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* + # Patch linker path for dynamic executables make -C musl-cross-make gcc-11.2.0 sed -i -e 's|/lib/ld-musl-|/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h @@ -56,6 +57,7 @@ done grep -F "$pthbs_package" true.linker + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. @@ -52,23 +52,23 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'musl-fts-1.2.7' + autotools_config_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/netbsd-curses b/variants/root-x86_64/netbsd-curses @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'netbsd-curses' + export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" @@ -33,6 +33,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) make install-static + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/openssl b/variants/root-x86_64/openssl @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'openssl-3.3.3' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -22,13 +22,14 @@ cd openssl-3.3.3 make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/openssl check_static command/ocspcheck + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/patch b/variants/root-x86_64/patch @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. @@ -52,25 +52,26 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'patch-2.7.6' + autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/patch + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/patchelf:bootstrap b/variants/root-x86_64/patchelf:bootstrap @@ -48,22 +48,23 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'patchelf' + ./bootstrap.sh autotools_config_static . --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/patchelf + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:. @@ -52,26 +52,27 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'pkgconf-2.1.1' + export LDFLAGS=--static autotools_config_static --with-pkg-config-dir= make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/pkgconf + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/pkgconf-pkg-config b/variants/root-x86_64/pkgconf-pkg-config @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+pkgconf.c34f5725b4dc0f199f67c260706e4f7237486001a6bccf4a6a79efa2b1118193 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+pkgconf.03b6e6720b483c336309c74a75c41f355b507fe8aacf887361033aacbb5fa5f4 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 @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. @@ -52,23 +52,23 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'popt-1.19' + autotools_config_static --disable-nls make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/pthbs-banginstall b/variants/root-x86_64/pthbs-banginstall @@ -1,21 +1,22 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'pthbs-banginstall' + mkdir -p "${dest}/command" chmod +x pthbs-banginstall zsh -x pthbs-banginstall pthbs-banginstall "${dest}" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 -#+popt.897db5cf333d2ed9418409a159e890ef0d88e33db408c96628bb1ed1ad593b76 -#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 -#+zstd.afe7ff25aaafc3c81a21431d6fa60d8ea68c05aaae50d43d1106cb2af2606eae +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b +#+popt.8d9aaa7522704c41e61518e1b7c0953f56eb954add607dfd57a61201df10c179 +#+libressl.fa788edd570aad61d2af648463649a8ef55161deeedd4b056392bb118d9ccd24 +#+zstd.e840b84ff3a5c9239f8e8ea602cb13180acf2ad0941a0b3e5e4a01994db033cb #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. @@ -55,13 +55,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'rsync-3.2.7' + autotools_config_static --without-included-popt \ --enable-openssl \ --enable-zstd \ @@ -72,13 +72,14 @@ autotools_config_static --without-included-popt \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/rsync + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6 @@ -1,38 +1,38 @@ #!/usr/bin/env pthbs-build - -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 - -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ + --with-sysdeps='/versions/skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ --disable-shared --enable-static --enable-allstatic --enable-static-libc --absolute-paths -make -j${JOBS:-1} -l$((1+${JOBS:-1})) CFLAGS=-DWANT_CLONE_NEWPID +make -j${JOBS:-1} -l$((1+${JOBS:-1})) CFLAGS=-DWANT_CLONE_NEWPID make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/s6-dns b/variants/root-x86_64/s6-dns @@ -1,26 +1,25 @@ #!/usr/bin/env pthbs-build - -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 - -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b +#@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6-dns' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ + --with-sysdeps='/versions/skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -29,11 +28,11 @@ cd 's6-dns' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/root-x86_64/s6-linux-init b/variants/root-x86_64/s6-linux-init @@ -1,28 +1,27 @@ #!/usr/bin/env pthbs-build - -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 - -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6-linux-init' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ + --with-sysdeps='/versions/skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -31,11 +30,11 @@ cd 's6-linux-init' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/root-x86_64/s6-linux-utils b/variants/root-x86_64/s6-linux-utils @@ -1,26 +1,25 @@ #!/usr/bin/env pthbs-build - -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 - -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b +#@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6-linux-utils' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ + --with-sysdeps='/versions/skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -29,11 +28,11 @@ cd 's6-linux-utils' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking @@ -1,30 +1,29 @@ #!/usr/bin/env pthbs-build - -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 - -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 -#+s6-dns.dd0033e6e131f9ec1c449937c9b1c9c232d61b60ec82be9f47e1b1e336690889 -#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+s6-dns.2a3e90f799cebf15491101cc0b1ba2a0bdc9f68320e02943cfcd4a873fb036fb +#+libressl.fa788edd570aad61d2af648463649a8ef55161deeedd4b056392bb118d9ccd24 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6-networking' + ./configure --enable-ssl=libtls \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ + --with-sysdeps='/versions/skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -33,11 +32,11 @@ cd 's6-networking' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/s6-portable-utils b/variants/root-x86_64/s6-portable-utils @@ -1,26 +1,25 @@ #!/usr/bin/env pthbs-build - -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 - -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b +#@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6-portable-utils' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ + --with-sysdeps='/versions/skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -29,11 +28,11 @@ cd 's6-portable-utils' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/root-x86_64/s6-rc b/variants/root-x86_64/s6-rc @@ -1,28 +1,27 @@ #!/usr/bin/env pthbs-build - -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 - -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 's6-rc' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ + --with-sysdeps='/versions/skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -31,11 +30,11 @@ cd 's6-rc' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/root-x86_64/skalibs b/variants/root-x86_64/skalibs @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'skalibs' + export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" export CXX="$pthbs_build_environment/command/x86_64-linux-musl-g++" export LD="$pthbs_build_environment/command/x86_64-linux-musl-ld" @@ -29,11 +29,11 @@ export CFLAGS="-O2 -ggdb" make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 -#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 +#+pthbs-banginstall.441ea39dc88dbccabecc255285f80865ecf7c3f6bdbda554f394a7e75b1f1273 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'snaprep' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -31,6 +31,7 @@ fi + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 -#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 -#+libunwind.2086d4b5362b021de30a906b5b4ba5595425bacb94d1ee2d8b348f65bb2cf49c +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b +#+patch.2d581c1f77e6f9c8d18faa0551801881b33ca7c5347ab8c84873890d49010a74 +#+libunwind.427e90ee36d1746f502d0850524596ab6fb55caf880fdd13c99b5b4a9eddb0e6 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. @@ -55,7 +55,6 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'strace-6.13' @@ -64,17 +63,19 @@ cd 'strace-6.13' patch -p1 <../strace-6.5-static.patch + autotools_config_static --with-unwind --without-libdw --enable-mpers=check make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install + check_static command/strace + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -1,29 +1,29 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+diffutils.2e5877895a6809ecb023cad32af3d596421a8f18b240885a808bdca09490de77 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+aat.20dac08b162245a67e629492b741fbf0d822608098090cdf1941dc9b4ae35597 -#+fileset.6e662c8a49937222a1575d3de8b2363309b37ed74bd51559184afb3ce0266015 -#+rsync.22db6b667e8faef094268871e4efd1c7fefd074b0db2ea9fbc88780853106ce7 -#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+kbd.39c0f8afcfb985bea3e602ba3cb7ac002d41c33c5b1e3466eda1543527aaaa72 -#+mdevd.5637f01795442cb9da5ef88ce9ef666270e00ebccbcf8b366d9a28d5e77857cd -#+s6-linux-utils.3267fe9747bb91e80ecbc74ae45688460b09ec212dae8a39e2e8aa7ebfda7570 -#+s6-rc.124d3e7a3b03971baf2e14cc88cd91357b1955f69f19fbd411476e16bfe5656d -#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 -#+system-config-scripts.70a7cc705f2f44c94fc111ea29bd598aed790940c6a0c6ec50044753ef4877a8 -#+logincaps.39e82ec4a208d3ff8d4e75f8e10d7154b66d299db4f13978faaded7957ecfb53 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+diffutils.abaa1f6191fca817c122d85501fed0165fb186bc706ff3f671af0b146b743c59 +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+aat.5a9f119639fdbd4be3cd5e7165ceec8105cf19314a0f070287eebabf4c104a14 +#+fileset.35c7f2dd7c0dd297974dd6c03ce5dd2bfa70cbdaa71c6af4da05165f12d25a4f +#+rsync.27092513c5dfe1309aa10ffe58a3e5e20bd6aed075d13d3967d6e301c5ad25d6 +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+kbd.4cafece0d0fdcc52c0908f4f51510b152ea705de8da0daa51c3494cc89f29608 +#+mdevd.c2e962ba272a196b1798c2eab73f2bd1b69b168f897e72e9be3e30bef0e8d985 +#+s6-linux-utils.37b19062018cb44159d0c2b2e08b3e098134c767810ef243455abaffe4c48bf2 +#+s6-rc.3790f2b77a5785fe78e78d0ae8f036fd8e6bdd70af979ba1cd752668ae29be82 +#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 +#+system-config-scripts.8389da7212133319388382cc8ee9acb4d05179a6bf91a6d39418da80e2503802 +#+logincaps.df2f297b37e210c1c87bb0fe29075c881212710415536282d285e29e4ab41ae4 #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config' + err_notfound() { printf >&2 'Executable not found for command "%s"\n' "$1" exit 1 @@ -50,8 +50,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.c195da6a7dae1e7da65d394643c0e73a30bbe60cf9aca6a970d6e8713ef079fc' \ - 'pthbs_path_mdevd=/versions/env.a45bd218cfd51dcfb7a32294c7a75318da16ea32e181145bbeb688af51416404' \ + 'pthbs_path_containers=/versions/env.524b8088005e6d8381c0a0d62e36984c099d80e0bf9dab3df31a303a1c78932b' \ + 'pthbs_path_mdevd=/versions/env.f3e7af2c5779294dd08c495474be6f0497439948b9e2bdd8628dfa08efd0e9e1' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do @@ -73,6 +73,7 @@ rsync -ai ./out/ "$dest/config/" mv -v keys "$dest/" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -1,20 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 -#+s6-rc.124d3e7a3b03971baf2e14cc88cd91357b1955f69f19fbd411476e16bfe5656d -#+s6-portable-utils.47861b330e2c41a239fb18461fbff57c7a6913de09f7d6be8ed478bb2590ca8f -#+s6-linux-init.d63ab06d21a8cc4a5678c56a1a769094d11603171578ad8bc7cd06772189775d -#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+system-config-rc.d784be950a1be2066ef6a35be339ca12cf961b32d69f5b06159e7eb5a8393250 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+s6-rc.3790f2b77a5785fe78e78d0ae8f036fd8e6bdd70af979ba1cd752668ae29be82 +#+s6-portable-utils.02a66968f0ac9c69d31491a4172e24ef37cab78fc968d5a75e46a1dcf0a588a9 +#+s6-linux-init.676e77c29e34f95108eb83ef131a78de5afa7ae0f27fecbf504d43e0d8d0d30d +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+system-config-rc.1f4604f71a43eafb84a2a019220494fb52531b88d35f19f12e51d3208e6dad7f # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-init' + q() { # quote list of strings to be suitable for execline "s6-quote" "$@" } @@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/versions/system-config-rc.d784be950a1be2066ef6a35be339ca12cf961b32d69f5b06159e7eb5a8393250/config/s6-rc-db +s6rcdb=/versions/system-config-rc.1f4604f71a43eafb84a2a019220494fb52531b88d35f19f12e51d3208e6dad7f/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//versions" @@ -118,6 +118,7 @@ $(qx tail) -F -n +1 /run/uncaught-logs/current EOF s6-chmod 755 "${dest}/run-image/service/console-log-tail/run" exit $? + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -136,6 +137,7 @@ check_static bin/halt check_static bin/poweroff check_static bin/reboot + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc @@ -1,24 +1,25 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+s6-rc.124d3e7a3b03971baf2e14cc88cd91357b1955f69f19fbd411476e16bfe5656d -#+fileset.6e662c8a49937222a1575d3de8b2363309b37ed74bd51559184afb3ce0266015 -#+system-config.15492ab7d4db3b4327a62756c5d4aa965b8821bf1255d88393ef5a62587457f8 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+s6-rc.3790f2b77a5785fe78e78d0ae8f036fd8e6bdd70af979ba1cd752668ae29be82 +#+fileset.35c7f2dd7c0dd297974dd6c03ce5dd2bfa70cbdaa71c6af4da05165f12d25a4f +#+system-config.b24e4b33942afedde68e15a4c8253cb4fcabd623ebbd9a5694d8f94026f95458 # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/versions/system-config.15492ab7d4db3b4327a62756c5d4aa965b8821bf1255d88393ef5a62587457f8/config/s6-rc-source + +src=/versions/system-config.b24e4b33942afedde68e15a4c8253cb4fcabd623ebbd9a5694d8f94026f95458/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/root-x86_64/system-config-scripts b/variants/root-x86_64/system-config-scripts @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 -#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 +#+pthbs-banginstall.441ea39dc88dbccabecc255285f80865ecf7c3f6bdbda554f394a7e75b1f1273 # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-scripts' + for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -30,6 +30,7 @@ fi + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/system-config-zsh b/variants/root-x86_64/system-config-zsh @@ -1,21 +1,22 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-zsh' + mkdir -p "$dest/zsh" mv -v zsh-functions "$dest/zsh/site-functions" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {} diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env @@ -1,22 +1,23 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+pthbs-banginstall.441ea39dc88dbccabecc255285f80865ecf7c3f6bdbda554f394a7e75b1f1273 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' + mkdir -p "${dest}/command" chmod +x user-env pthbs-banginstall user-env "${dest}" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -1,40 +1,40 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+diffutils.2e5877895a6809ecb023cad32af3d596421a8f18b240885a808bdca09490de77 -#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 -#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 -#+bison.0874ec124e31d46bcb830839f339b9dad753f28f4a5870f76e88ed4d646766e6 -#+rsync.22db6b667e8faef094268871e4efd1c7fefd074b0db2ea9fbc88780853106ce7 -#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 -#+s6-rc.124d3e7a3b03971baf2e14cc88cd91357b1955f69f19fbd411476e16bfe5656d -#+s6-portable-utils.47861b330e2c41a239fb18461fbff57c7a6913de09f7d6be8ed478bb2590ca8f -#+s6-linux-utils.3267fe9747bb91e80ecbc74ae45688460b09ec212dae8a39e2e8aa7ebfda7570 -#+s6-linux-init.d63ab06d21a8cc4a5678c56a1a769094d11603171578ad8bc7cd06772189775d -#+mdevd.5637f01795442cb9da5ef88ce9ef666270e00ebccbcf8b366d9a28d5e77857cd -#+s6-dns.dd0033e6e131f9ec1c449937c9b1c9c232d61b60ec82be9f47e1b1e336690889 -#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 -#+s6-networking.af9eb9d407428d2c19d9d41872a18be611287b861ff8ac347eeb6af01ca7b095 -#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 -#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 -#+aat.20dac08b162245a67e629492b741fbf0d822608098090cdf1941dc9b4ae35597 -#+confz.37863d2ec8636071b9d3cd90853d7c66d93a82ffe26af3091502a87f3d5e7b53 -#+containers.10cf2feb4247bdc7f05bdfb82c7a7f9fb553445140b9613258735e0ab610f2d1 -#+fileset.6e662c8a49937222a1575d3de8b2363309b37ed74bd51559184afb3ce0266015 -#+logincaps.39e82ec4a208d3ff8d4e75f8e10d7154b66d299db4f13978faaded7957ecfb53 -#+snaprep.4741f235c2100e3518de2e9653755c87e4cc7f6668596829e6bb1e932ddc392d -#+curl.9e29d7b583bb221800bd4071a0710a06c45681d0bed5d54817b6adf3a7dd97f6 -#+git.9e4546cf110327e853beb1562ffe0dd0710e5a962fa285ddff0d8460a8b22c2a -#+xbps.439919b3373859eccaed14cb1bdbc94948ccc1582a64025de6eb9828fd4714e5 -#+apk-tools.b6ae2978c21328aef2cd7bee77918521adf924c5e6dafa2d6c1efac0aad437c6 -#+getent.0af39b5b26c83dd63917511aae3fc97fc08751558abe6852f92707dc17a4bf40 -#+getconf.31b660df2a017fa168106122353ca5a3db7fa1f81fe3dfc44bf65b717275db6e -#+iconv.edbfaa85b49793e93a9017a1783c2bde9a66f1af89603b4af16b9e820aca754f -#+libcap.3a2674b04629180b1f8f8ee3b7d7133a3c45648fe2509a5c09f3fab249d7d814 -#+applyuidgid-caps.7a74554cf64f149cb80fdc7caa69829b497c90c1caff248a1b3a07eb1c4d3ca1 -#+ccx-utils.8a6cf2bc9e8fe5cb7eb99fcf5fb2aca24e21f1d980de28fb4054f7e196cff032 -#+user-env.a42ddd75abbe51cbd88539cf8207ae32501e6fa5430bdf797b8970a14855f4af -#+strace.9de369dc2cf328c7737dd7936efe50c4f1d50835421813d2008a575b2ce88b4e -#+mlog.0bdee80b00d4018b1e3668ef9e05e2aaa3ffd00696fb1180c570aedcd4a6a863- \ No newline at end of file +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+diffutils.abaa1f6191fca817c122d85501fed0165fb186bc706ff3f671af0b146b743c59 +#+patch.2d581c1f77e6f9c8d18faa0551801881b33ca7c5347ab8c84873890d49010a74 +#+flex.86ee3bffd4d38e384a456f848f6828ad4d125df27c660f11ed795c565345bb23 +#+bison.e742fd5b0f6faf59406354b23da5bed4218d33f2e9e63ea50d2bb08962ccb7e8 +#+rsync.27092513c5dfe1309aa10ffe58a3e5e20bd6aed075d13d3967d6e301c5ad25d6 +#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+s6-rc.3790f2b77a5785fe78e78d0ae8f036fd8e6bdd70af979ba1cd752668ae29be82 +#+s6-portable-utils.02a66968f0ac9c69d31491a4172e24ef37cab78fc968d5a75e46a1dcf0a588a9 +#+s6-linux-utils.37b19062018cb44159d0c2b2e08b3e098134c767810ef243455abaffe4c48bf2 +#+s6-linux-init.676e77c29e34f95108eb83ef131a78de5afa7ae0f27fecbf504d43e0d8d0d30d +#+mdevd.c2e962ba272a196b1798c2eab73f2bd1b69b168f897e72e9be3e30bef0e8d985 +#+s6-dns.2a3e90f799cebf15491101cc0b1ba2a0bdc9f68320e02943cfcd4a873fb036fb +#+libressl.fa788edd570aad61d2af648463649a8ef55161deeedd4b056392bb118d9ccd24 +#+s6-networking.17cb5c4e9dc176ae51c8b2d2db3c61c38f8948cdbf72a9a36a0d4787bf0507e4 +#+zsh.72576807f371f04f30e93bda193862a47d5ea68de449a4e932174797c8f76354 +#+pthbs-banginstall.441ea39dc88dbccabecc255285f80865ecf7c3f6bdbda554f394a7e75b1f1273 +#+aat.5a9f119639fdbd4be3cd5e7165ceec8105cf19314a0f070287eebabf4c104a14 +#+confz.6ac138f9d2a1d5421c1dd60176b3acc5fe033cc971b61260d29101ce6f95946e +#+containers.2941676a924b1bef97b198ebc2fc1ee929e7aa0dc2ae95df4ee6bd5af4907f40 +#+fileset.35c7f2dd7c0dd297974dd6c03ce5dd2bfa70cbdaa71c6af4da05165f12d25a4f +#+logincaps.df2f297b37e210c1c87bb0fe29075c881212710415536282d285e29e4ab41ae4 +#+snaprep.2ecfb0b5d8ce101db913038d3beecf7b0fb13caf574f665c79cab9130b47f0c2 +#+curl.c5cfe7c41254aa70b76a8c509e776088d68d5fed9afc5ff4a9b993d337a56ef6 +#+git.7a0d645acbbd0061d939756cff633e754e3949b6da7563649af4794e3625f10a +#+xbps.f775dc195ab972df1859f8c006355d1fc828b60021b62c557a0b7b41a803923f +#+apk-tools.b1f90d4190ac77823be9afe8f03f14d5c56bfd361a1b1b10df40001ce59cbb01 +#+getent.dd5870b1ea3d10659d7ebee0e300ddb11538c928c7cad10e57d26b860945425f +#+getconf.06490ab44f696a1f37d3abf6d3687ddf922394f8955ecb2eb8aada4629f6e712 +#+iconv.99e2ccc1055b1dd9b9709579a21f075507a104ef99a17eb8d714a245089a5f02 +#+libcap.d31b5daa9c6e323d109fe63e7dcd4a249a22519b6de7f0e22f0b8c1746512605 +#+applyuidgid-caps.8a88837d818f0b64ae533cf010dd6b4981ec06580e0c1606eca532f765f4baac +#+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 +#+user-env.a899fdaf319bf2a261cce0a94c70f3f40ab16528792e579068460b52d6ecaf42 +#+strace.9d9fb47db831d58467e3c080c78f3ff767f20e13c50298fd7045476d2f819214 +#+mlog.f6e876fbff20d311c177432ca821cc33b98f205d343105aa37ef81d40fdf1bc0+ \ 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.1f8590fb42cc4f609b1140836e71e07aa935c6d0d364e828d4da7f2f7914c083- \ No newline at end of file +#+linux-qemu-guest.abe80b4c9ed900b37b9b62b723190d0182307f91fda6dc30d3d3614b2bbd8b70+ \ No newline at end of file diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+libarchive.a424734746ae093adadfb4066210629a77530d88fc5bbdce484ed7862488b7b3 -#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 -#+pkgconf-pkg-config.7db40222b94aaaf29c4fd99c560d36879f964e41d462a658a30a58542d7e30a6 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+libarchive.e11d590f1ee0ed90c4d8c39102299ced150ac8cb0620ae66deb032bf6f2ddc06 +#+libressl.fa788edd570aad61d2af648463649a8ef55161deeedd4b056392bb118d9ccd24 +#+pkgconf-pkg-config.b8d7cc5ab2a026b56458192b425ff101668575ff36619bfdfe9272fb17a40612 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'xbps-0.59.2' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -34,6 +34,7 @@ find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \; --localstatedir=/var \ --enable-static + make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C include make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C lib libxbps.a install -d "$dest/library" @@ -47,6 +48,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C data make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C data install DESTDIR="$pthbs_destdir" + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -64,6 +66,7 @@ check_static command/xbps-install.static mkdir -p "$dest/keys" mv -v "$pthbs_destdir/var/db/xbps/keys" "$dest/keys/void" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 -#+netbsd-curses.f0931fe02af08cb8313d462f2c3129975f2319abc5fb7d6136c5c7cec818aab3 -#+libbsd.99cb797aa241ce57d13c56a2995ce51a0473c93e36cf1cb1c044dfd02b07552c +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+m4.2da4a01d7d852b6ae86a8f371708ea1973563da49862977206fe10947cba3d7b +#+netbsd-curses.af05ca7a816c9d3609685f2bd24670c96e99fdac763c953a1d904414366b61f1 +#+libbsd.b30320ee8afd7597513fa93df896b4cc3c396a83d9f4416c2f99745db1b88ae3 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. @@ -55,13 +55,13 @@ autotools_config_static() { build_env_static autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'zsh-5.9' + autotools_config_static --enable-static --disable-shared \ --enable-libc-musl --disable-locale \ --enable-cap \ @@ -88,8 +88,10 @@ mv -v ../zsh_config/etc "${dest}/" mv -v ../zsh_config/zsh-functions/* "${dest}/zsh/site-functions/" + check_static command/zsh + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd @@ -1,19 +1,19 @@ #!/usr/bin/env pthbs-build -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 -#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 -#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 -#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 +#+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c +#+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 +#+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 +#+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'zstd-1.5.5' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -30,6 +30,7 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) default install \ libdir="/versions/$pthbs_package/library" rm -v "$pthbs_destdir//versions/$pthbs_package/library"/*.so* + check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -45,6 +46,7 @@ check_static() { } check_static command/zstd + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {