commit cd226c80d431826bfda77db7becfcb585fd94512 parent af26fd7c9945617626dbf8bdd86ddccd6c0a72df Author: Jan Pobrislo <ccx@te2000.cz> Date: Sun, 26 Oct 2025 20:52:57 +0000 Remove redundant function definitions Diffstat:
89 files changed, 719 insertions(+), 683 deletions(-)
diff --git a/templates/pkg/abduco b/templates/pkg/abduco @@ -1,12 +1,12 @@ {%- set pkg_source="git" -%} {% extends "genlinks" %} +{%- do import_functions.update(["build_env_static", "check_static"]) %} {% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox-diffutils")}} {% endblock %} {% block configure -%} -{% include "functions/build_env_static" %} build_env_static cat >config.mk <<EOF # Any changes made here will be lost if configure is re-run @@ -29,8 +29,6 @@ mv "${dest}/bin" "${dest}/command" {% endblock %} {% block check -%} -{% include "functions/check_static" %} - check_static command/abduco {% endblock %} diff --git a/templates/pkg/apk-tools b/templates/pkg/apk-tools @@ -31,7 +31,6 @@ build_env_static install-static {% endblock build_and_install %} {% block check -%} -{% include "functions/check_static" %} check_static command/apk.static {% endblock check %} {% block genlinks_begin %} diff --git a/templates/pkg/busybox:modutils b/templates/pkg/busybox:modutils @@ -1,5 +1,6 @@ {%- set pkg_source="git" -%} {% extends "generic" %} +{%- do import_functions.add("check_static") %} {% block package_deps -%} #+{{pkg_install_name("linux")}} #+{{pkg_install_name("musl-cross-make")}} @@ -27,8 +28,6 @@ make V=1 CROSS_COMPILE={{triplet}}- LDFLAGS=-static HOSTLDFLAGS=-static \ ./make_single_applets.sh {% endblock %} {% block install -%} -{% include "functions/check_static" %} - mkdir -p "${dest}/command" for exe in depmod insmod lsmod modinfo modprobe rmmod; do diff --git a/templates/pkg/ccx-utils b/templates/pkg/ccx-utils @@ -1,5 +1,6 @@ {%- set pkg_source="git" -%} {% extends "genlinks" %} +{%- do import_functions.update(["build_env_static", "check_static"]) %} {% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} @@ -7,8 +8,6 @@ #+{{pkg_install_name("s6")}} {% endblock %} {% block build -%} -{% include "functions/check_static" %} -{% include "functions/build_env_static" %} build_env_static ./link.configure $LDFLAGS diff --git a/templates/pkg/error-standalone b/templates/pkg/error-standalone @@ -1,13 +1,13 @@ {%- set pkg_version="2.0" -%} {%- set pkg_source="tar.gz" -%} {% extends "genlinks" %} +{%- do import_functions.add("build_env_static") %} {% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox-diffutils")}} {% endblock %} {% block build -%} -{% include "functions/build_env_static" %} {{make}} PREFIX={{versions}}/$pthbs_package \ DESTDIR="$pthbs_destdir" \ INCDIR="$prefix/include" \ diff --git a/templates/pkg/git b/templates/pkg/git @@ -1,6 +1,7 @@ {%- set pkg_version="2.43.2" -%} {%- set pkg_source="tar.xz" -%} {% extends "genlinks" %} +{%- do import_functions.add("check_static") %} {% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} @@ -29,7 +30,6 @@ {% endblock %} {% block check -%} -{% include "functions/check_static" %} check_static command/git {% endblock %} diff --git a/templates/pkg/libcap b/templates/pkg/libcap @@ -1,6 +1,7 @@ {%- set pkg_version="2.69" -%} {%- set pkg_source="tar.xz" -%} {% extends "genlinks" %} +{%- do import_functions.update(["build_env_static", "check_static"]) %} {% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} @@ -13,7 +14,6 @@ sed -i '1 s|^#!/bin/bash|#!/bin/sh|' progs/*.sh {% endblock %} {% block configure -%} -{% include "functions/build_env_static" %} LDFLAGS=--static build_env_static @@ -39,7 +39,6 @@ build_env_static all install {% endblock %} {% block check -%} -{% include "functions/check_static" %} check_static command/capsh check_static command/getcap check_static command/setcap diff --git a/templates/pkg/libelf b/templates/pkg/libelf @@ -1,5 +1,6 @@ {%- set pkg_source="git" -%} {% extends "genlinks" %} +{%- do import_functions.add("build_env_static") %} {% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} @@ -7,7 +8,6 @@ #+{{pkg_install_name("zstd")}} {% endblock %} {% block build_and_install -%} -{% include "functions/build_env_static" %} build_env_static {{make}} PREFIX="$prefix" \ DESTDIR="$pthbs_destdir" \ diff --git a/templates/pkg/logincaps b/templates/pkg/logincaps @@ -1,5 +1,6 @@ {%- set pkg_source="git" -%} {% extends "scriptsetup" %} +{%- do import_functions.add("check_static") %} {% block package_deps -%} #+{{pkg_install_name("execline")}} #+{{pkg_install_name("musl-cross-make")}} @@ -22,8 +23,8 @@ cp -a login "${dest}/command/" {% endblock %} {% block check -%} -{% include "functions/check_static" %} check_static command/login + {% endblock %} {% block genlinks_begin %} x["./command/check-root-password.py"]=1 diff --git a/templates/pkg/mlog b/templates/pkg/mlog @@ -1,11 +1,11 @@ {%- set pkg_source="git" -%} {% extends "genlinks" %} +{%- do import_functions.update(["build_env_static", "check_static"]) %} {% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} {% endblock %} {% block build -%} -{% include "functions/build_env_static" %} build_env_static name=mlog make "$name" @@ -17,7 +17,6 @@ install -m 755 "$name" "$pthbs_destdir/$prefix/command" {% endblock %} {% block check -%} -{% include "functions/check_static" %} check_static "command/$name" {% endblock %} diff --git a/templates/pkg/openssl b/templates/pkg/openssl @@ -1,12 +1,12 @@ {%- set pkg_version="3.3.3" -%} {%- set pkg_source="tar.gz" -%} {% extends "genlinks" %} +{%- do import_functions.update(["build_env_static", "check_static"]) %} {% block package_deps -%} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("musl-cross-make")}} {% endblock %} {% block configure -%} -{% include "functions/build_env_static" %} build_env_static cd openssl-3.3.3 ./config # this will fail, perl is not packaged diff --git a/templates/pkg/system-config-init b/templates/pkg/system-config-init @@ -1,5 +1,6 @@ {%- set src_dir="." -%} {% extends "genlinks" %} +{%- do import_functions.update(["q", "qx"]) %} {% block package_deps -%} #+{{pkg_install_name("s6")}} #+{{pkg_install_name("s6-rc")}} @@ -9,9 +10,6 @@ #+{{pkg_install_name("system-config-rc")}} {% endblock %} {% block build_and_install -%} -{% include "functions/q" %} -{% include "functions/qx" %} - s6rcdb={{pkg_install_dir("system-config-rc")}}/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) diff --git a/templates/pkg/xbps b/templates/pkg/xbps @@ -1,5 +1,6 @@ {%- set pkg_version="0.59.2" -%} {% extends "genlinks" %} +{%- do import_functions.update(["build_env_static", "check_static"]) %} {% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} @@ -11,7 +12,6 @@ {% block configure %} export LDFLAGS=--static export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" -{% include "functions/build_env_static" %} build_env_static find lib bin -name '*.c' -exec sed -iEe '/^[\t ]*#[\t ]*define[\t ]+_GNU_SOURCE/d' '{}' \; @@ -47,7 +47,6 @@ done {% endblock %} {% block check -%} -{% include "functions/check_static" %} check_static command/xbps-install.static mkdir -p "$dest/keys" mv -v "$pthbs_destdir/var/db/xbps/keys" "$dest/keys/void" diff --git a/templates/pkg/zstd b/templates/pkg/zstd @@ -1,5 +1,6 @@ {%- set pkg_version="1.5.5" -%} {% extends "genlinks" %} +{%- do import_functions.update(["build_env_static", "check_static"]) %} {% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} @@ -7,7 +8,6 @@ #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. {% endblock %} {% block build_and_install -%} -{% include "functions/build_env_static" %} build_env_static {{make}} default install \ @@ -21,7 +21,6 @@ rm -v "$pthbs_destdir/{{versions}}/$pthbs_package/library"/*.so* {% endblock %} {% block check -%} -{% include "functions/check_static" %} check_static command/zstd {% endblock %} diff --git a/templates/single_static_c b/templates/single_static_c @@ -1,4 +1,5 @@ {% extends "genlinks" %} +{%- do import_functions.update(["build_env_static", "check_static"]) %} {%- block template_deps -%} {{ super() -}} #+{{pkg_install_name("musl-cross-make")}} @@ -11,7 +12,6 @@ name='{{ shortname }}' {% endblock %} {% block build -%} -{% include "functions/build_env_static" %} build_env_static gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS @@ -22,8 +22,6 @@ install -m 755 "$name" "$pthbs_destdir/$prefix/command" {% endblock %} {% block check -%} -{% include "functions/check_static" %} - check_static "command/$name" {% endblock %} diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco @@ -10,15 +10,30 @@ # - 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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } + +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'abduco' + build_env_static cat >config.mk <<EOF # Any changes made here will be lost if configure is re-run @@ -43,20 +58,6 @@ mv "${dest}/bin" "${dest}/command" -check_static() { - local exe || true - exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} - check_static command/abduco diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools @@ -6,8 +6,8 @@ #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 -#+libressl.57117d0e5a012ec73153d93e4949c3ce75af320a2fac8d4b31823e447af41667 -#+zstd.c1c21fcb9c71a3c75a934ed63b6408d902deffd131ffc5eb0df494480c87a4ff +#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 +#+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 #+pkgconf-pkg-config.ac73cd9f6a453fe3aa762c0cd34fceafc5b6428ef287264fa146dc44172b622a #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools @@ -55,19 +55,6 @@ 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 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} check_static command/apk.static diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps @@ -4,32 +4,17 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92 -#+libcap.161efc1d636c55e6489bf16281b52ef551214916b15326ec55a198e562a66c21 +#+libcap.9c58cd7c9da6ab293aa28db486aefae6aab97164d28712453a5cda564f3857f2 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c # - build script start - -prefix=/home/ccx/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd '.' -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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" - - check_static() { local exe || true @@ -45,6 +30,22 @@ check_static() { fi } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' +name='applyuidgid-caps' + +CFLAGS="-D_GNU_SOURCE" +LDFLAGS="-lskarnet -lcap" + +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static "command/$name" diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+linux.8e65faa78cceaad02e2954e3e00726f968a0ac3c8cc2a8982860bcbf70a1b0bf +#+linux.1166cbe1144777d9f9117113e111e614c49ace58d9717256227ecb5d41dcd559 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f @@ -11,6 +11,20 @@ # - build script start - +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'busybox' @@ -20,7 +34,7 @@ export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.8e65faa78cceaad02e2954e3e00726f968a0ac3c8cc2a8982860bcbf70a1b0bf" +CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.1166cbe1144777d9f9117113e111e614c49ace58d9717256227ecb5d41dcd559" EOF make oldconfig cat .config @@ -29,20 +43,6 @@ cat .config 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} ./make_single_applets.sh -check_static() { - local exe || true - exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} - mkdir -p "${dest}/command" for exe in depmod insmod lsmod modinfo modprobe rmmod; do diff --git a/variants/ccx-x86_64/ca-certificates-wip-donotuse b/variants/ccx-x86_64/ca-certificates-wip-donotuse @@ -2,7 +2,7 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+certdata2pem.149975cfd00990e3701cca4fba36b76100277f9557e6afdcd8619712c1b83ffc +#+certdata2pem.61800d791b6c1f64b1fd5caa115f97cb74d82996e72b33e79590273a3e7f5334 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils @@ -11,10 +11,11 @@ # - build script start - -prefix=/home/ccx/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd 'ccx-utils' - +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} check_static() { local exe || true @@ -29,11 +30,12 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'ccx-utils' + + build_env_static ./link.configure $LDFLAGS diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem @@ -8,25 +8,11 @@ # - build script start - -prefix=/home/ccx/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd '.' -name='certdata2pem' - -CFLAGS="-D_GNU_SOURCE" - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" - - check_static() { local exe || true @@ -42,6 +28,21 @@ check_static() { fi } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' +name='certdata2pem' + +CFLAGS="-D_GNU_SOURCE" + +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static "command/$name" diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -4,11 +4,11 @@ #+busybox-login.5ae3c5fe63ac87ad0a5a463507b448486909634ac48b26d1c771a5e614f54002 #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf -#+ccx-utils.6c974d75c7bdb2cff8381a0cfb5550167aa4f62e0a31d3b831bf0c93cf2cdbdc -#+applyuidgid-caps.5effab9d89ebd56f780e67f9843a0282841ec3af5d74a00a4a9c05947625f22a -#+easyseccomp.993a591e8431a555804030c9d4b11d49839c6c707a4161499fb44269b5999b59 -#+mlog.ebb9faed3eb08d69476db6f5c54c97545cfec8b88ac59502c44ada0648a1922c -#+abduco.73165277a946c4b47c0daff1ae654b102eecbbe4ccbc328c77e81db19826e1cf +#+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf +#+applyuidgid-caps.897eb85f81c58d23a98b6fa3de75e800b4360d43ae0335798507f56658f68b8a +#+easyseccomp.d503e16683dd10a813bc3c5d73190bd4383cbcd47f0d2e509f0d98f5f3c6e104 +#+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339 +#+abduco.e426fc1d139e8bfcfd6ebd986ac28b8d62bff115bdc379ad9c84b4bc97024065 #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -6,9 +6,9 @@ #+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d90ac169c524e84eef81df9af01 -#+apk-tools.f256cfcd56b89b1a99df1fe000eb1b3cabaf38330616546d20b2debeeeab413d -#+xbps.c0d6fd3ea62721611968b68db31ab9799b685252f0c60c82ef295c0dcef655bb -#+container-bin-image.67587b4b59059d0890b9fa365a70eb519ae969d95ff9be55312b32229251bcbe +#+apk-tools.956d9f1d5552d3c8dc4f10169e7885166a91b30ef01e6398d6eb1aff11d908ac +#+xbps.bc708acbda3339de6f694e1974d96aecd0d5cab4e37f4184965a5817fef07a91 +#+container-bin-image.359d02956a2982dc0a1254820bf1d26cd80fa4e7d02d0209de7dd95f9cc3d95b #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -51,8 +51,8 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "${dest}/deps/command" -ln -sf '/home/ccx/versions/apk-tools.f256cfcd56b89b1a99df1fe000eb1b3cabaf38330616546d20b2debeeeab413d/command/apk.static' "${dest}/deps/command/" -ln -sf '/home/ccx/versions/xbps.c0d6fd3ea62721611968b68db31ab9799b685252f0c60c82ef295c0dcef655bb/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.956d9f1d5552d3c8dc4f10169e7885166a91b30ef01e6398d6eb1aff11d908ac/command/apk.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/xbps.bc708acbda3339de6f694e1974d96aecd0d5cab4e37f4184965a5817fef07a91/command/xbps-install.static' "${dest}/deps/command/" for f in '/home/ccx/versions/alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d90ac169c524e84eef81df9af01'/keys/alpine/*/*; do test -f "$f" @@ -62,13 +62,13 @@ for f in '/home/ccx/versions/alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d9 done mkdir -p "${dest}/deps/keys/void" -for f in '/home/ccx/versions/xbps.c0d6fd3ea62721611968b68db31ab9799b685252f0c60c82ef295c0dcef655bb'/keys/void/*; do +for f in '/home/ccx/versions/xbps.bc708acbda3339de6f694e1974d96aecd0d5cab4e37f4184965a5817fef07a91'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.67587b4b59059d0890b9fa365a70eb519ae969d95ff9be55312b32229251bcbe/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.67587b4b59059d0890b9fa365a70eb519ae969d95ff9be55312b32229251bcbe/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.67587b4b59059d0890b9fa365a70eb519ae969d95ff9be55312b32229251bcbe/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.359d02956a2982dc0a1254820bf1d26cd80fa4e7d02d0209de7dd95f9cc3d95b/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.359d02956a2982dc0a1254820bf1d26cd80fa4e7d02d0209de7dd95f9cc3d95b/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.359d02956a2982dc0a1254820bf1d26cd80fa4e7d02d0209de7dd95f9cc3d95b/container-bin-image' "${dest}/deps/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -7,14 +7,14 @@ #+s6-linux-utils.664dc33ed8e500126bfb4e74c565990e8632879b9e165b09f7f48ac054c89a22 #+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 #+confz.b67a7630d1faeda6e06d979b1a0c36163f279849108177f02658a35d7152ae45 -#+containers.2c23fcf1c45f69ef0aec3aed974e6c8a816a563a2a6bea74dab675557a584531 -#+xbps.c0d6fd3ea62721611968b68db31ab9799b685252f0c60c82ef295c0dcef655bb -#+zstd.c1c21fcb9c71a3c75a934ed63b6408d902deffd131ffc5eb0df494480c87a4ff -#+apk-tools.f256cfcd56b89b1a99df1fe000eb1b3cabaf38330616546d20b2debeeeab413d +#+containers.ed839f88ca46f10803bc8c7536c7f6723972189931913c71afaf3093168e8723 +#+xbps.bc708acbda3339de6f694e1974d96aecd0d5cab4e37f4184965a5817fef07a91 +#+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 +#+apk-tools.956d9f1d5552d3c8dc4f10169e7885166a91b30ef01e6398d6eb1aff11d908ac #+alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d90ac169c524e84eef81df9af01 -#+getent.be921e440a3e0b3868ea0a62fb248885db6cbeebe3946c376aba6ef2964316a6 +#+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 #+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 -#+ccx-utils.6c974d75c7bdb2cff8381a0cfb5550167aa4f62e0a31d3b831bf0c93cf2cdbdc -#+easyseccomp.993a591e8431a555804030c9d4b11d49839c6c707a4161499fb44269b5999b59 +#+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf +#+easyseccomp.d503e16683dd10a813bc3c5d73190bd4383cbcd47f0d2e509f0d98f5f3c6e104 #+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 \ No newline at end of file diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl @@ -6,7 +6,7 @@ #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+libressl.57117d0e5a012ec73153d93e4949c3ce75af320a2fac8d4b31823e447af41667 +#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -6,7 +6,7 @@ #+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 #+flex.d82e65569a261bd6140e6daafad40475f4c37a706fdaac7048bdf24d7200b63c #+bison.9264e348887dcc4943fb8b8a49bbf2462e53852ce4d782bc1ad95513eb225240 -#+rsync.46e488c2a7c44e635298c6d1fac1441b1c675be62351872f42f0fdf8cf5b6373 +#+rsync.55276833e2833a1041e73acab778feec8f1e456f1010a6c3b02379bcdde02d39 #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf #+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50 @@ -15,33 +15,33 @@ #+s6-linux-init.30ee852e07291b5f3c94ed4037e403122037366bcc655a87f5527f1813332d62 #+mdevd.f93eb2eff2928fd4618a959255b19e6a01e056a6a9287ce5d1a3bce89eca1a15 #+s6-dns.d0134713eb4f2fa10036f492ca4dc945e2188a8b648a78fcd8bb085a5bd627d4 -#+libressl.57117d0e5a012ec73153d93e4949c3ce75af320a2fac8d4b31823e447af41667 -#+s6-networking.b85f50a8ecf5de900449586baab7ac16e1a5e226821459ae1bd7c0729519ec6a +#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 +#+s6-networking.f4a78285871a0559cd61c17855bc3d610f4b5a77c67fdc93418d599d0af1c207 #+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 #+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf #+aat.bed1cceeeaf99718e61a89a54d526460202c2de1e3a5052ed9f85cec7269ea30 #+confz.b67a7630d1faeda6e06d979b1a0c36163f279849108177f02658a35d7152ae45 -#+containers.2c23fcf1c45f69ef0aec3aed974e6c8a816a563a2a6bea74dab675557a584531 +#+containers.ed839f88ca46f10803bc8c7536c7f6723972189931913c71afaf3093168e8723 #+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 -#+logincaps.d6cb666710beed92eac4a1618b1354bb2cf65f83718a90310589f3356ebae91f +#+logincaps.128ce50c29de922317b0efaafaf79708fd0ab685ef39df6e7267c05d578eaa8f #+snaprep.092a6f35542a956ef6f9990177cbe209d48d4eb64be1f20368a87cac7903921d -#+curl.d5ae66e62936255fdc89aed63d79aa79b95d88c424fe23bf48e96e259b676438 -#+git.a0efb391feb753e2d5471d63c67a6a5cc0e5f9a3381c9e1173696ce930d31737 -#+xbps.c0d6fd3ea62721611968b68db31ab9799b685252f0c60c82ef295c0dcef655bb -#+apk-tools.f256cfcd56b89b1a99df1fe000eb1b3cabaf38330616546d20b2debeeeab413d -#+getent.be921e440a3e0b3868ea0a62fb248885db6cbeebe3946c376aba6ef2964316a6 -#+getconf.94f04c5e783a8524a6efb495a51a77693f1d4ce13bca40844d8fc0ebc76ebeda -#+iconv.b89b3be9806125faeec6fdbe4198c195008ff1b7ce0a36950965432e0b15a06d -#+libcap.161efc1d636c55e6489bf16281b52ef551214916b15326ec55a198e562a66c21 -#+applyuidgid-caps.5effab9d89ebd56f780e67f9843a0282841ec3af5d74a00a4a9c05947625f22a -#+ccx-utils.6c974d75c7bdb2cff8381a0cfb5550167aa4f62e0a31d3b831bf0c93cf2cdbdc +#+curl.10fc879ea14256ab6e511319c63f19da974300ecbf2fadf3e3ccc2c6e77c9994 +#+git.e9d3f4c1010863e3b73ab7d33d013793a4839e989361dda16178e2b118595292 +#+xbps.bc708acbda3339de6f694e1974d96aecd0d5cab4e37f4184965a5817fef07a91 +#+apk-tools.956d9f1d5552d3c8dc4f10169e7885166a91b30ef01e6398d6eb1aff11d908ac +#+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 +#+getconf.3f6e9e56867c13fc1f1bc3a95e692c675500944f94bd0726e34ee010d8213697 +#+iconv.0618baa01d98a1805b5ff362de984adfca782727cfe5335327341c376a8c3602 +#+libcap.9c58cd7c9da6ab293aa28db486aefae6aab97164d28712453a5cda564f3857f2 +#+applyuidgid-caps.897eb85f81c58d23a98b6fa3de75e800b4360d43ae0335798507f56658f68b8a +#+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf #+user-env.cc0683d9ca6986c3642304613640e0c096ca5fa18bfef1acd1d72cbdba119f78 #+strace.24f817d87229531d5a2218f804224619ed7635b8f847c96ccb8f8926478b144a -#+mlog.ebb9faed3eb08d69476db6f5c54c97545cfec8b88ac59502c44ada0648a1922c +#+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339 #+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 -#+system-config.ec84aaedb96dbd9aa9d40f0df86375c8423e95d4fd70718e9fad2493090eddd2 -#+system-config-rc.0715a9cec86758ba33da59fa59629628a7118adfe8c251d55051880a16722ee6 +#+system-config.8894fd484b55dd297655417f5e0d25a383912a07a264a73299ad34882d294dcc +#+system-config-rc.b15bc13fb99ecdd1ff76cbc2423b0b2887ec26dc80456e9762a9837ec0c7fcf5 #+system-config-scripts.d01b8ef0ad1be29f1bb6fc41a34cbad9c4deedb1280934f542c27fda98613932 -#+system-config-init.305a72e896bb027a087adc6fc3c9fff7445329f18d08d67f396bb40f8d2dd943 +#+system-config-init.e60ccc1543dbdb60c6e6dc31f97d0cd1307c3db1ed3d01460240f6536d0aeaf5 #+system-config-zsh.4e8afd597caaa75555d975b16b77c1dc37f975e723ee9602c2dab690a5387a36 \ No newline at end of file diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp @@ -10,7 +10,7 @@ #+flex.d82e65569a261bd6140e6daafad40475f4c37a706fdaac7048bdf24d7200b63c #+bison.9264e348887dcc4943fb8b8a49bbf2462e53852ce4d782bc1ad95513eb225240 #+libseccomp.62dac8e6d0c1f7f1c41a01333ebe158b985b0f88731c32516d497c42ee4fa070 -#+error-standalone.b2a15f1e50c01a1fde462f279eb5574bef28150b2c945826b1f9e44ea21302d8 +#+error-standalone.c5bed16451398238f10e83182031c3f5a22949b6b98c723567214828b9053c37 #+argp-standalone.12091fe79283b890260cdf7d47a9aa9f7a57b63f1a9f4127dd537e2f897c4399 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone @@ -10,16 +10,17 @@ # - 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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'error-standalone-2.0' + + make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/home/ccx/versions/$pthbs_package \ DESTDIR="$pthbs_destdir" \ INCDIR="$prefix/include" \ diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf @@ -8,24 +8,11 @@ # - build script start - -prefix=/home/ccx/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd '.' -name='getconf' - - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" - - check_static() { local exe || true @@ -41,6 +28,20 @@ check_static() { fi } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' +name='getconf' + + +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static "command/$name" diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent @@ -8,24 +8,11 @@ # - build script start - -prefix=/home/ccx/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd '.' -name='getent' - - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" - - check_static() { local exe || true @@ -41,6 +28,20 @@ check_static() { fi } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' +name='getent' + + +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static "command/$name" diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git @@ -6,13 +6,27 @@ #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+libressl.57117d0e5a012ec73153d93e4949c3ce75af320a2fac8d4b31823e447af41667 -#+curl.d5ae66e62936255fdc89aed63d79aa79b95d88c424fe23bf48e96e259b676438 +#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 +#+curl.10fc879ea14256ab6e511319c63f19da974300ecbf2fadf3e3ccc2c6e77c9994 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. # - build script start - +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'git-2.43.2' @@ -36,19 +50,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ V=1 all install -check_static() { - local exe || true - exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} check_static command/git diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv @@ -8,24 +8,11 @@ # - build script start - -prefix=/home/ccx/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd '.' -name='iconv' - - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" - - check_static() { local exe || true @@ -41,6 +28,20 @@ check_static() { fi } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' +name='iconv' + + +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static "command/$name" 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.8e65faa78cceaad02e2954e3e00726f968a0ac3c8cc2a8982860bcbf70a1b0bf -#+busybox.9b65136a7d863e2f0f282190a908ad3d04f8f16085cf49f05e59e1992a59aca4- \ No newline at end of file +#+linux.1166cbe1144777d9f9117113e111e614c49ace58d9717256227ecb5d41dcd559 +#+busybox.75e406b7ac0c8cc3f94f4f09dcf8e250415744e6d69b76d88089299cc5137458+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap @@ -11,17 +11,32 @@ # - build script start - +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} + +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + 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" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} LDFLAGS=--static build_env_static @@ -45,19 +60,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ LDFLAGS="$LDFLAGS" \ all install -check_static() { - local exe || true - exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} check_static command/capsh check_static command/getcap check_static command/setcap diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf @@ -5,22 +5,23 @@ #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 -#+zstd.c1c21fcb9c71a3c75a934ed63b6408d902deffd131ffc5eb0df494480c87a4ff +#+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 #@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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libelf' + + build_env_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX="$prefix" \ DESTDIR="$pthbs_destdir" \ diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl @@ -6,7 +6,7 @@ #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+ca-certificates-wip-donotuse.70f99772805bc0fe128e7c77c8dfb2c9283a3980b35a6c5511296e46e8c777c2 +#+ca-certificates-wip-donotuse.b3c597f83303731126f1678a9de2d91daea9ea06934160ca1a00a29f5a167032 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. @@ -73,7 +73,7 @@ make DESTDIR="$pthbs_destdir" install cd .. gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto -cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.70f99772805bc0fe128e7c77c8dfb2c9283a3980b35a6c5511296e46e8c777c2/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.b3c597f83303731126f1678a9de2d91daea9ea06934160ca1a00a29f5a167032/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" ./c_rehash "$pthbs_destdir/$prefix/config/ssl/certs/" cd "$pthbs_destdir/$prefix/config/ssl/" mv cert.pem libressl-cert.pem diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux @@ -8,9 +8,9 @@ #+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 #+flex.d82e65569a261bd6140e6daafad40475f4c37a706fdaac7048bdf24d7200b63c #+bison.9264e348887dcc4943fb8b8a49bbf2462e53852ce4d782bc1ad95513eb225240 -#+rsync.46e488c2a7c44e635298c6d1fac1441b1c675be62351872f42f0fdf8cf5b6373 -#+zstd.c1c21fcb9c71a3c75a934ed63b6408d902deffd131ffc5eb0df494480c87a4ff -#+libelf.98cab642d85b18264a7c602fb642a9adc3f905a6425bd3073d106cd46256292f +#+rsync.55276833e2833a1041e73acab778feec8f1e456f1010a6c3b02379bcdde02d39 +#+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 +#+libelf.ccbb68a9c6feaf4b434ea0cfd38b3027ff369507165cbf8b01abb8c6e3eabe98 #+pkgconf-pkg-config.ac73cd9f6a453fe3aa762c0cd34fceafc5b6428ef287264fa146dc44172b622a #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest @@ -8,9 +8,9 @@ #+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 #+flex.d82e65569a261bd6140e6daafad40475f4c37a706fdaac7048bdf24d7200b63c #+bison.9264e348887dcc4943fb8b8a49bbf2462e53852ce4d782bc1ad95513eb225240 -#+rsync.46e488c2a7c44e635298c6d1fac1441b1c675be62351872f42f0fdf8cf5b6373 -#+zstd.c1c21fcb9c71a3c75a934ed63b6408d902deffd131ffc5eb0df494480c87a4ff -#+libelf.98cab642d85b18264a7c602fb642a9adc3f905a6425bd3073d106cd46256292f +#+rsync.55276833e2833a1041e73acab778feec8f1e456f1010a6c3b02379bcdde02d39 +#+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 +#+libelf.ccbb68a9c6feaf4b434ea0cfd38b3027ff369507165cbf8b01abb8c6e3eabe98 #+pkgconf-pkg-config.ac73cd9f6a453fe3aa762c0cd34fceafc5b6428ef287264fa146dc44172b622a #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -6,12 +6,26 @@ #+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ccx-utils.6c974d75c7bdb2cff8381a0cfb5550167aa4f62e0a31d3b831bf0c93cf2cdbdc +#+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps # - build script start - +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'logincaps' @@ -50,22 +64,10 @@ cp -a login "${dest}/command/" -check_static() { - local exe || true - exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} 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/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -4,4 +4,4 @@ #+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf #+mdev-scripts.1d4cba8f6d152ac91f93838b4915c025931b4382deb359826bcde055acb7239c #+mdevd.f93eb2eff2928fd4618a959255b19e6a01e056a6a9287ce5d1a3bce89eca1a15 -#+busybox.9b65136a7d863e2f0f282190a908ad3d04f8f16085cf49f05e59e1992a59aca4- \ No newline at end of file +#+busybox.75e406b7ac0c8cc3f94f4f09dcf8e250415744e6d69b76d88089299cc5137458+ \ No newline at end of file diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog @@ -9,24 +9,11 @@ # - 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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static -name=mlog -make "$name" - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" - - check_static() { local exe || true @@ -41,6 +28,21 @@ check_static() { exit 1 fi } + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'mlog' + + +build_env_static +name=mlog +make "$name" + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static "command/$name" diff --git a/variants/ccx-x86_64/openssl b/variants/ccx-x86_64/openssl @@ -9,15 +9,30 @@ # - 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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } + +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'openssl-3.3.3' + build_env_static cd openssl-3.3.3 ./config # this will fail, perl is not packaged diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync @@ -7,8 +7,8 @@ #+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 #+popt.d13ce001cb3b0a98e29b93df01f1b1452634b9fcd6be97af75dbca2ba32c28a1 -#+libressl.57117d0e5a012ec73153d93e4949c3ce75af320a2fac8d4b31823e447af41667 -#+zstd.c1c21fcb9c71a3c75a934ed63b6408d902deffd131ffc5eb0df494480c87a4ff +#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 +#+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking @@ -8,7 +8,7 @@ #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf #+s6-dns.d0134713eb4f2fa10036f492ca4dc945e2188a8b648a78fcd8bb085a5bd627d4 -#+libressl.57117d0e5a012ec73153d93e4949c3ce75af320a2fac8d4b31823e447af41667 +#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -6,7 +6,7 @@ #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+aat.bed1cceeeaf99718e61a89a54d526460202c2de1e3a5052ed9f85cec7269ea30 #+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 -#+rsync.46e488c2a7c44e635298c6d1fac1441b1c675be62351872f42f0fdf8cf5b6373 +#+rsync.55276833e2833a1041e73acab778feec8f1e456f1010a6c3b02379bcdde02d39 #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+kbd.fc6daccf346ad764ded16dc20acffe20e41966ff0bff0747aabc4b68306b8485 #+mdevd.f93eb2eff2928fd4618a959255b19e6a01e056a6a9287ce5d1a3bce89eca1a15 @@ -15,8 +15,8 @@ #+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf #+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 #+system-config-scripts.d01b8ef0ad1be29f1bb6fc41a34cbad9c4deedb1280934f542c27fda98613932 -#+logincaps.d6cb666710beed92eac4a1618b1354bb2cf65f83718a90310589f3356ebae91f -#+busybox.9b65136a7d863e2f0f282190a908ad3d04f8f16085cf49f05e59e1992a59aca4 +#+logincaps.128ce50c29de922317b0efaafaf79708fd0ab685ef39df6e7267c05d578eaa8f +#+busybox.75e406b7ac0c8cc3f94f4f09dcf8e250415744e6d69b76d88089299cc5137458 #@git:ddb20e067ab184cd18ee8b88d74044dfeeaaad4c:system-config @@ -53,8 +53,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/home/ccx/versions/env.e55deefeadec768f774b72c20b84b30b5d9a16bb9d9725c63f30fc856ed2a1da' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.7bf0fc03847538a7e970e7556cc653de05fbb6e66c5507d058a5df547b6baa5b' \ + 'pthbs_path_containers=/home/ccx/versions/env.34c3ee822631722d90cb9fbdc032cd97e2a881a937b4f652921be345d9a9704d' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.7ae24ceddc8443fb7cd7c4a54dd069772007d84cd6a7df121ea6d2a67b643e1a' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -7,19 +7,15 @@ #+s6-portable-utils.945ba0fbba6153923f5a761abc154568d30fc1db69b26f03ead9fe248f87d351 #+s6-linux-init.30ee852e07291b5f3c94ed4037e403122037366bcc655a87f5527f1813332d62 #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+system-config-rc.0715a9cec86758ba33da59fa59629628a7118adfe8c251d55051880a16722ee6 +#+system-config-rc.b15bc13fb99ecdd1ff76cbc2423b0b2887ec26dc80456e9762a9837ec0c7fcf5 # - build script start - -prefix=/home/ccx/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd '.' - - q() { # quote list of strings to be suitable for execline "s6-quote" "$@" } + qx() { # register executable as dependency and quote full path to be suitable for execline exe=$(realpath "$(which "$1")") name=$(basename "$1") @@ -31,7 +27,12 @@ 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.0715a9cec86758ba33da59fa59629628a7118adfe8c251d55051880a16722ee6/config/s6-rc-db +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' + + +s6rcdb=/home/ccx/versions/system-config-rc.b15bc13fb99ecdd1ff76cbc2423b0b2887ec26dc80456e9762a9837ec0c7fcf5/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//home/ccx/versions" diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc @@ -5,7 +5,7 @@ #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50 #+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 -#+system-config.ec84aaedb96dbd9aa9d40f0df86375c8423e95d4fd70718e9fad2493090eddd2 +#+system-config.8894fd484b55dd297655417f5e0d25a383912a07a264a73299ad34882d294dcc # - build script start - @@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.ec84aaedb96dbd9aa9d40f0df86375c8423e95d4fd70718e9fad2493090eddd2/config/s6-rc-source +src=/home/ccx/versions/system-config.8894fd484b55dd297655417f5e0d25a383912a07a264a73299ad34882d294dcc/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -6,7 +6,7 @@ #+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 #+flex.d82e65569a261bd6140e6daafad40475f4c37a706fdaac7048bdf24d7200b63c #+bison.9264e348887dcc4943fb8b8a49bbf2462e53852ce4d782bc1ad95513eb225240 -#+rsync.46e488c2a7c44e635298c6d1fac1441b1c675be62351872f42f0fdf8cf5b6373 +#+rsync.55276833e2833a1041e73acab778feec8f1e456f1010a6c3b02379bcdde02d39 #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf #+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50 @@ -15,28 +15,28 @@ #+s6-linux-init.30ee852e07291b5f3c94ed4037e403122037366bcc655a87f5527f1813332d62 #+mdevd.f93eb2eff2928fd4618a959255b19e6a01e056a6a9287ce5d1a3bce89eca1a15 #+s6-dns.d0134713eb4f2fa10036f492ca4dc945e2188a8b648a78fcd8bb085a5bd627d4 -#+libressl.57117d0e5a012ec73153d93e4949c3ce75af320a2fac8d4b31823e447af41667 -#+s6-networking.b85f50a8ecf5de900449586baab7ac16e1a5e226821459ae1bd7c0729519ec6a +#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 +#+s6-networking.f4a78285871a0559cd61c17855bc3d610f4b5a77c67fdc93418d599d0af1c207 #+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 #+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf #+aat.bed1cceeeaf99718e61a89a54d526460202c2de1e3a5052ed9f85cec7269ea30 #+confz.b67a7630d1faeda6e06d979b1a0c36163f279849108177f02658a35d7152ae45 -#+containers.2c23fcf1c45f69ef0aec3aed974e6c8a816a563a2a6bea74dab675557a584531 +#+containers.ed839f88ca46f10803bc8c7536c7f6723972189931913c71afaf3093168e8723 #+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 -#+logincaps.d6cb666710beed92eac4a1618b1354bb2cf65f83718a90310589f3356ebae91f +#+logincaps.128ce50c29de922317b0efaafaf79708fd0ab685ef39df6e7267c05d578eaa8f #+snaprep.092a6f35542a956ef6f9990177cbe209d48d4eb64be1f20368a87cac7903921d -#+curl.d5ae66e62936255fdc89aed63d79aa79b95d88c424fe23bf48e96e259b676438 -#+git.a0efb391feb753e2d5471d63c67a6a5cc0e5f9a3381c9e1173696ce930d31737 -#+xbps.c0d6fd3ea62721611968b68db31ab9799b685252f0c60c82ef295c0dcef655bb -#+apk-tools.f256cfcd56b89b1a99df1fe000eb1b3cabaf38330616546d20b2debeeeab413d -#+getent.be921e440a3e0b3868ea0a62fb248885db6cbeebe3946c376aba6ef2964316a6 -#+getconf.94f04c5e783a8524a6efb495a51a77693f1d4ce13bca40844d8fc0ebc76ebeda -#+iconv.b89b3be9806125faeec6fdbe4198c195008ff1b7ce0a36950965432e0b15a06d -#+libcap.161efc1d636c55e6489bf16281b52ef551214916b15326ec55a198e562a66c21 -#+applyuidgid-caps.5effab9d89ebd56f780e67f9843a0282841ec3af5d74a00a4a9c05947625f22a -#+ccx-utils.6c974d75c7bdb2cff8381a0cfb5550167aa4f62e0a31d3b831bf0c93cf2cdbdc +#+curl.10fc879ea14256ab6e511319c63f19da974300ecbf2fadf3e3ccc2c6e77c9994 +#+git.e9d3f4c1010863e3b73ab7d33d013793a4839e989361dda16178e2b118595292 +#+xbps.bc708acbda3339de6f694e1974d96aecd0d5cab4e37f4184965a5817fef07a91 +#+apk-tools.956d9f1d5552d3c8dc4f10169e7885166a91b30ef01e6398d6eb1aff11d908ac +#+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 +#+getconf.3f6e9e56867c13fc1f1bc3a95e692c675500944f94bd0726e34ee010d8213697 +#+iconv.0618baa01d98a1805b5ff362de984adfca782727cfe5335327341c376a8c3602 +#+libcap.9c58cd7c9da6ab293aa28db486aefae6aab97164d28712453a5cda564f3857f2 +#+applyuidgid-caps.897eb85f81c58d23a98b6fa3de75e800b4360d43ae0335798507f56658f68b8a +#+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf #+user-env.cc0683d9ca6986c3642304613640e0c096ca5fa18bfef1acd1d72cbdba119f78 #+strace.24f817d87229531d5a2218f804224619ed7635b8f847c96ccb8f8926478b144a -#+mlog.ebb9faed3eb08d69476db6f5c54c97545cfec8b88ac59502c44ada0648a1922c +#+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339 #+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 \ 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.a3cb79bf6359b658fea9d6bac16c0df6b5cb36a819448716c3d5c4baaeae72a4- \ No newline at end of file +#+linux-qemu-guest.e524f1ea8b59dc16df25551ebf7483a6e0182a4fb26a82cc21d6c407efb8de72+ \ No newline at end of file diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps @@ -5,13 +5,33 @@ #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+libarchive.0ca4db115d929056aa3588b2f3b3ad24c8189c10ad71a6c0189aac4a802b9a66 -#+libressl.57117d0e5a012ec73153d93e4949c3ce75af320a2fac8d4b31823e447af41667 +#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 #+pkgconf-pkg-config.ac73cd9f6a453fe3aa762c0cd34fceafc5b6428ef287264fa146dc44172b622a #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. # - build script start - +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} + +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'xbps-0.59.2' @@ -19,11 +39,6 @@ cd 'xbps-0.59.2' export LDFLAGS=--static export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} build_env_static find lib bin -name '*.c' -exec sed -iEe '/^[\t ]*#[\t ]*define[\t ]+_GNU_SOURCE/d' '{}' \; @@ -56,19 +71,6 @@ 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 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} check_static command/xbps-install.static mkdir -p "$dest/keys" mv -v "$pthbs_destdir/var/db/xbps/keys" "$dest/keys/void" diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd @@ -10,27 +10,11 @@ # - 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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static - -make -j${JOBS:-1} -l$((1+${JOBS:-1})) default install \ - V=1 \ - DESTDIR="$pthbs_destdir" \ - prefix="/home/ccx/versions/$pthbs_package" \ - datarootdir="/home/ccx/versions/$pthbs_package" \ - bindir="/home/ccx/versions/$pthbs_package/command" \ - libdir="/home/ccx/versions/$pthbs_package/library" -rm -v "$pthbs_destdir//home/ccx/versions/$pthbs_package/library"/*.so* - check_static() { local exe || true @@ -45,6 +29,24 @@ check_static() { exit 1 fi } + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'zstd-1.5.5' + + +build_env_static + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) default install \ + V=1 \ + DESTDIR="$pthbs_destdir" \ + prefix="/home/ccx/versions/$pthbs_package" \ + datarootdir="/home/ccx/versions/$pthbs_package" \ + bindir="/home/ccx/versions/$pthbs_package/command" \ + libdir="/home/ccx/versions/$pthbs_package/library" +rm -v "$pthbs_destdir//home/ccx/versions/$pthbs_package/library"/*.so* + + check_static command/zstd diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco @@ -10,15 +10,30 @@ # - 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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } + +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'abduco' + build_env_static cat >config.mk <<EOF # Any changes made here will be lost if configure is re-run @@ -43,20 +58,6 @@ mv "${dest}/bin" "${dest}/command" -check_static() { - local exe || true - exe=$pthbs_destdir'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} - check_static command/abduco diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools @@ -6,8 +6,8 @@ #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f -#+libressl.a934e3dca14a337f375d1c3120bbb2e6d1adbfb682650abb6c120cd08f05130b -#+zstd.3f759bb91d3c5d33700fa2c6d3be9c376957f9d719c2bc191d9a11bd0d61e9c2 +#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef +#+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 #+pkgconf-pkg-config.a995904b89618eb027fc8e263bb25c635a63aa30c1e758baf29ef2798bb39185 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools @@ -55,19 +55,6 @@ 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 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} check_static command/apk.static diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps @@ -4,32 +4,17 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb -#+libcap.64cd4091357805baa3e567b9f8a3ac56deef254819eea7698ac5d539478fb792 +#+libcap.738fe1a044a48d3b316e0a5196bd27987e0d0a656471aa475139c1f3ba3d511e #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c # - build script start - -prefix=/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd '.' -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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" - - check_static() { local exe || true @@ -45,6 +30,22 @@ check_static() { fi } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' +name='applyuidgid-caps' + +CFLAGS="-D_GNU_SOURCE" +LDFLAGS="-lskarnet -lcap" + +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static "command/$name" diff --git a/variants/root-x86_64/busybox:modutils b/variants/root-x86_64/busybox:modutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+linux.19223b9ab5ed3ac1ad5395dd57d79a63900bc14c10e7c22f6ab074115c564ef2 +#+linux.f14f35504d4337abe3aaa46fa7cc51ae3d29e253500c1532541a746264965def #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 @@ -11,6 +11,20 @@ # - build script start - +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'busybox' @@ -20,7 +34,7 @@ export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/versions/linux.19223b9ab5ed3ac1ad5395dd57d79a63900bc14c10e7c22f6ab074115c564ef2" +CONFIG_DEFAULT_MODULES_DIR="/versions/linux.f14f35504d4337abe3aaa46fa7cc51ae3d29e253500c1532541a746264965def" EOF make oldconfig cat .config @@ -29,20 +43,6 @@ cat .config 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} ./make_single_applets.sh -check_static() { - local exe || true - exe=$pthbs_destdir'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} - mkdir -p "${dest}/command" for exe in depmod insmod lsmod modinfo modprobe rmmod; do diff --git a/variants/root-x86_64/ca-certificates-wip-donotuse b/variants/root-x86_64/ca-certificates-wip-donotuse @@ -2,7 +2,7 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+certdata2pem.ed830d3e369b1a5092f32ebe5e2d4be8bf659dfc1ef448e5a673db23c3eb4c55 +#+certdata2pem.f0b2fac8fc7f930557cceb3ec4d78266e37704500ed79582281e3b7169c4267a #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils @@ -11,10 +11,11 @@ # - build script start - -prefix=/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd 'ccx-utils' - +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} check_static() { local exe || true @@ -29,11 +30,12 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'ccx-utils' + + build_env_static ./link.configure $LDFLAGS diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem @@ -8,25 +8,11 @@ # - build script start - -prefix=/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd '.' -name='certdata2pem' - -CFLAGS="-D_GNU_SOURCE" - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" - - check_static() { local exe || true @@ -42,6 +28,21 @@ check_static() { fi } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' +name='certdata2pem' + +CFLAGS="-D_GNU_SOURCE" + +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static "command/$name" diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -4,11 +4,11 @@ #+busybox-login.99677a70a44f3ccb53874476327aaa1f5824019b63fe7d5e7b744dc3a641d27e #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 -#+ccx-utils.43c8d464c047f747d9f93c78da633212d337783f14700dd6947d33266581cfb9 -#+applyuidgid-caps.a93060e2d7bcfd0dbcce9703918401530926f7d6ddd9934c614a194ada12a2b7 -#+easyseccomp.272454c5bf792bf6dec60efd25f39b383322856a5341eb03c58bdd2039220b1e -#+mlog.54bb21963344e806b9c342686157c4c1d7ee291cfc75bbbcb91fdcd95631f89d -#+abduco.16da09dfa8880488b68928d70bf54b4c36aa19325b1f68da82a74185c54cc636 +#+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 +#+applyuidgid-caps.7e7a19a986e85e5e678eb5359e801ed0a621283b9a61427a62e8e2fd44d99e2e +#+easyseccomp.39495b5524bd6bef37a8357adc5abf40729e6fdeefad87122e914fc760cd992e +#+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398 +#+abduco.089653d0849acda0e1723469ed2913556b6b86a32056932b8f4069c5ceec76ae #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -6,9 +6,9 @@ #+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1fd563fddfd04f35ae -#+apk-tools.34e756a4cc4c07dd3d4f62baeb467ffb13c0eb633ed9eaab8806bce25fa5fede -#+xbps.0a61fbc27cdf1fa321f32b14ff32a33444b02b478f68efa0756626002688da9c -#+container-bin-image.6d07b6d6ce64244ce728bb7a8447e8d040299f8f8376f9c8bb4b699c00c3a764 +#+apk-tools.15367b4f5dd92474eac1f48f8a6f20f7e59524eb86d4494530353badb3b73378 +#+xbps.842e6ebb5f6730c6aef95d07e8e2773cc1927c7be00a6541e057a0857f06801f +#+container-bin-image.73faf582a32014e54478d5a27b724e1f5ada9537aed5477379d354e55a27d143 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -51,8 +51,8 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "${dest}/deps/command" -ln -sf '/versions/apk-tools.34e756a4cc4c07dd3d4f62baeb467ffb13c0eb633ed9eaab8806bce25fa5fede/command/apk.static' "${dest}/deps/command/" -ln -sf '/versions/xbps.0a61fbc27cdf1fa321f32b14ff32a33444b02b478f68efa0756626002688da9c/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/versions/apk-tools.15367b4f5dd92474eac1f48f8a6f20f7e59524eb86d4494530353badb3b73378/command/apk.static' "${dest}/deps/command/" +ln -sf '/versions/xbps.842e6ebb5f6730c6aef95d07e8e2773cc1927c7be00a6541e057a0857f06801f/command/xbps-install.static' "${dest}/deps/command/" for f in '/versions/alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1fd563fddfd04f35ae'/keys/alpine/*/*; do test -f "$f" @@ -62,13 +62,13 @@ for f in '/versions/alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1f done mkdir -p "${dest}/deps/keys/void" -for f in '/versions/xbps.0a61fbc27cdf1fa321f32b14ff32a33444b02b478f68efa0756626002688da9c'/keys/void/*; do +for f in '/versions/xbps.842e6ebb5f6730c6aef95d07e8e2773cc1927c7be00a6541e057a0857f06801f'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.6d07b6d6ce64244ce728bb7a8447e8d040299f8f8376f9c8bb4b699c00c3a764/container-bin-image' -test -f '/versions/container-bin-image.6d07b6d6ce64244ce728bb7a8447e8d040299f8f8376f9c8bb4b699c00c3a764/container-bin-image/if' -ln -sf '/versions/container-bin-image.6d07b6d6ce64244ce728bb7a8447e8d040299f8f8376f9c8bb4b699c00c3a764/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.73faf582a32014e54478d5a27b724e1f5ada9537aed5477379d354e55a27d143/container-bin-image' +test -f '/versions/container-bin-image.73faf582a32014e54478d5a27b724e1f5ada9537aed5477379d354e55a27d143/container-bin-image/if' +ln -sf '/versions/container-bin-image.73faf582a32014e54478d5a27b724e1f5ada9537aed5477379d354e55a27d143/container-bin-image' "${dest}/deps/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -7,14 +7,14 @@ #+s6-linux-utils.2e5ac9209104c458e8935a4b4e9ce3ed6e9aa3e6c4d85675a1e945d1fe77530f #+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee #+confz.b97475076615ecc6da4d79b348861a469c76564de60be552a257a11815203bda -#+containers.f92ad7464c95d08eca234c16cdd38981f04ef1261a960c295ef2ac5730845631 -#+xbps.0a61fbc27cdf1fa321f32b14ff32a33444b02b478f68efa0756626002688da9c -#+zstd.3f759bb91d3c5d33700fa2c6d3be9c376957f9d719c2bc191d9a11bd0d61e9c2 -#+apk-tools.34e756a4cc4c07dd3d4f62baeb467ffb13c0eb633ed9eaab8806bce25fa5fede +#+containers.74c51512a8e0f9c617967f64fa1cb3fb19b507384e407dc9886df798712b968c +#+xbps.842e6ebb5f6730c6aef95d07e8e2773cc1927c7be00a6541e057a0857f06801f +#+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 +#+apk-tools.15367b4f5dd92474eac1f48f8a6f20f7e59524eb86d4494530353badb3b73378 #+alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1fd563fddfd04f35ae -#+getent.fc996e1bf9c07ebf3955b5f1570e83657e4c9222f51b86b7cc7d179195feaaf8 +#+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 #+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a -#+ccx-utils.43c8d464c047f747d9f93c78da633212d337783f14700dd6947d33266581cfb9 -#+easyseccomp.272454c5bf792bf6dec60efd25f39b383322856a5341eb03c58bdd2039220b1e +#+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 +#+easyseccomp.39495b5524bd6bef37a8357adc5abf40729e6fdeefad87122e914fc760cd992e #+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 \ No newline at end of file diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl @@ -6,7 +6,7 @@ #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+libressl.a934e3dca14a337f375d1c3120bbb2e6d1adbfb682650abb6c120cd08f05130b +#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -6,7 +6,7 @@ #+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f #+flex.a0b530df71023dab46f59c8c0a6255bae4c6e8e8d88087364e36fcc86318f41b #+bison.50a879da42f360f6a461ecb3eaafaed1ee77389f064b469614f27328bbd15e44 -#+rsync.764c2a430bb92a1a7d2241094aacc90e3f7296fb5556164946c0754030392565 +#+rsync.a3914e6a58e85cc838ef8c8cda9ec4ba6e49cdd7376d09a2d0c6b072c656c3e7 #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 #+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183 @@ -15,33 +15,33 @@ #+s6-linux-init.e17bf07f726729c579bb12c1d25dad4bb263f96509f7ea852bb44d50737d0b4d #+mdevd.0502ff0a0d6e4f3b58469d0d3aef8816631718d5375ec0d41913dfa9121590fb #+s6-dns.66def5b5ecaa018779d26f6f341b8477f6e2ef8e6aee5e4f30e2f4ee36d59299 -#+libressl.a934e3dca14a337f375d1c3120bbb2e6d1adbfb682650abb6c120cd08f05130b -#+s6-networking.3b76ff75b186090993704d5488971d18301b3e5c775db152580d68b894581bdc +#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef +#+s6-networking.2e3a2b62476afed6b35e208fda1dfb764dc27b8319ec876411dcdb0c8e3bdc3e #+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee #+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 #+aat.13a9895e0bae8d3653d847a595f4e4cafd0fcc7c96e71b18dd0021d2fa034646 #+confz.b97475076615ecc6da4d79b348861a469c76564de60be552a257a11815203bda -#+containers.f92ad7464c95d08eca234c16cdd38981f04ef1261a960c295ef2ac5730845631 +#+containers.74c51512a8e0f9c617967f64fa1cb3fb19b507384e407dc9886df798712b968c #+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a -#+logincaps.a6851e111580dc841cbe7b6b6258e6c93708990e24ef38508f1b84585b08f2a7 +#+logincaps.9521f2ed324c343657aa56e7483577509f567566b97b84bac012a869096a4fff #+snaprep.995dc0361dc0ae81c7e079a2f785b716ee88490680be562cd751a2808328632c -#+curl.db9ea0a9f1673db0f2dac27c35fc82a0f45409eb6e64a0009e21a0aca55ebdce -#+git.30df03cafab3d94f54ae0c26009873c8bd0351397a04fa38bea9b86f0f1b859d -#+xbps.0a61fbc27cdf1fa321f32b14ff32a33444b02b478f68efa0756626002688da9c -#+apk-tools.34e756a4cc4c07dd3d4f62baeb467ffb13c0eb633ed9eaab8806bce25fa5fede -#+getent.fc996e1bf9c07ebf3955b5f1570e83657e4c9222f51b86b7cc7d179195feaaf8 -#+getconf.4b58b9410ad26e84492035678f7dd7922077fd3f1783004b97b10fb5e18d5265 -#+iconv.d10ea9a5e126233a9c16d73d1145f946ec660130ca05d49624fb506a929b1fba -#+libcap.64cd4091357805baa3e567b9f8a3ac56deef254819eea7698ac5d539478fb792 -#+applyuidgid-caps.a93060e2d7bcfd0dbcce9703918401530926f7d6ddd9934c614a194ada12a2b7 -#+ccx-utils.43c8d464c047f747d9f93c78da633212d337783f14700dd6947d33266581cfb9 +#+curl.718c045c064f1e9fd5a7c71f50384345e35e1fc80e3ae7fdacadce73454dd3e7 +#+git.96c05646b93e3a672c5591f704106d3f6fea912d796cd0df6abd655b243d86eb +#+xbps.842e6ebb5f6730c6aef95d07e8e2773cc1927c7be00a6541e057a0857f06801f +#+apk-tools.15367b4f5dd92474eac1f48f8a6f20f7e59524eb86d4494530353badb3b73378 +#+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 +#+getconf.a13baa310359caefe186a823f0386190b6286fccf30aaf8301e115f3dc973d44 +#+iconv.7afe835f0a03884e71f41bd2a96a88e9e1e73233137cb94da9f73a6721ed3001 +#+libcap.738fe1a044a48d3b316e0a5196bd27987e0d0a656471aa475139c1f3ba3d511e +#+applyuidgid-caps.7e7a19a986e85e5e678eb5359e801ed0a621283b9a61427a62e8e2fd44d99e2e +#+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 #+user-env.78b039be2e0732709774f80dd3455f3785f2b5febb591a956303c2aeed468547 #+strace.f67bc48859477eb362b356c2f4fd4d3a6a38fb3d32969338ec7f87dd48634904 -#+mlog.54bb21963344e806b9c342686157c4c1d7ee291cfc75bbbcb91fdcd95631f89d +#+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398 #+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 -#+system-config.48afff7eb2ed1eb1a01774dbac81fca21f4ae053fb26d837bf1bb14f919b2e74 -#+system-config-rc.49eca33dd2a80731c34905b575c62a1b57952ac734026ef33450cd33dae462f9 +#+system-config.44a3c05b506aaaf54ea75378fdb57ddd72c68b5b4e6144b010190f5964f0322c +#+system-config-rc.b12d4fe70b02e5d8e95ef628c85b4247b886d4aa9bbf17722d8ced0b4d7dc82f #+system-config-scripts.6c3b2eb373b9768ac4d1ad2a919e8f514ef81d028db8dd4a27e7472cc7d97258 -#+system-config-init.466aa84444e51d156a9d633b24e381dbea82f467ecc5495996087d854d4f45b3 +#+system-config-init.d9f480e134b1c3bc455d4904b743fd25b16d000892dcecc43931e826b4adedf7 #+system-config-zsh.b20e8d491536b4a2107fba55e995f077668ab62f6a239ea1a2c7a492688b8d52 \ No newline at end of file diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp @@ -10,7 +10,7 @@ #+flex.a0b530df71023dab46f59c8c0a6255bae4c6e8e8d88087364e36fcc86318f41b #+bison.50a879da42f360f6a461ecb3eaafaed1ee77389f064b469614f27328bbd15e44 #+libseccomp.cb7dcd3c270f25f5beb0b1a1bffe6d94d332960c043d493da55f9c6f0db2f4c7 -#+error-standalone.1295be56709f2f52c646dae3cc0523d75b30371d0759935f39ce5a21b63ba6d1 +#+error-standalone.83fe263a36f70674cf9285b3acc3ded8716d9f7ad735642160d203c3516d0b81 #+argp-standalone.ce895c27959569e1e8043165ffc45a83f91bbab063876272eabd4870766f3721 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone @@ -10,16 +10,17 @@ # - 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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'error-standalone-2.0' + + make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/versions/$pthbs_package \ DESTDIR="$pthbs_destdir" \ INCDIR="$prefix/include" \ diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf @@ -8,24 +8,11 @@ # - build script start - -prefix=/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd '.' -name='getconf' - - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" - - check_static() { local exe || true @@ -41,6 +28,20 @@ check_static() { fi } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' +name='getconf' + + +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static "command/$name" diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent @@ -8,24 +8,11 @@ # - build script start - -prefix=/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd '.' -name='getent' - - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" - - check_static() { local exe || true @@ -41,6 +28,20 @@ check_static() { fi } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' +name='getent' + + +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static "command/$name" diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git @@ -6,13 +6,27 @@ #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+libressl.a934e3dca14a337f375d1c3120bbb2e6d1adbfb682650abb6c120cd08f05130b -#+curl.db9ea0a9f1673db0f2dac27c35fc82a0f45409eb6e64a0009e21a0aca55ebdce +#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef +#+curl.718c045c064f1e9fd5a7c71f50384345e35e1fc80e3ae7fdacadce73454dd3e7 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. # - build script start - +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'git-2.43.2' @@ -36,19 +50,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ V=1 all install -check_static() { - local exe || true - exe=$pthbs_destdir'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} check_static command/git diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv @@ -8,24 +8,11 @@ # - build script start - -prefix=/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd '.' -name='iconv' - - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" - - check_static() { local exe || true @@ -41,6 +28,20 @@ check_static() { fi } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' +name='iconv' + + +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static "command/$name" 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.19223b9ab5ed3ac1ad5395dd57d79a63900bc14c10e7c22f6ab074115c564ef2 -#+busybox.14049a2ed1b8715f25e96ae64b4b537f07618a1d08a273935b8f2963a8fd28de- \ No newline at end of file +#+linux.f14f35504d4337abe3aaa46fa7cc51ae3d29e253500c1532541a746264965def +#+busybox.76e164a3f374450080eb486a2c94ea5bb07bc030d6212014a91c4d2949cbbea3+ \ No newline at end of file diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap @@ -11,17 +11,32 @@ # - build script start - +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} + +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + 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" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} LDFLAGS=--static build_env_static @@ -45,19 +60,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ LDFLAGS="$LDFLAGS" \ all install -check_static() { - local exe || true - exe=$pthbs_destdir'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} check_static command/capsh check_static command/getcap check_static command/setcap diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf @@ -5,22 +5,23 @@ #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc -#+zstd.3f759bb91d3c5d33700fa2c6d3be9c376957f9d719c2bc191d9a11bd0d61e9c2 +#+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 #@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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libelf' + + build_env_static make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX="$prefix" \ DESTDIR="$pthbs_destdir" \ diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl @@ -6,7 +6,7 @@ #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+ca-certificates-wip-donotuse.c7322a19aa2e80d7650710cfb45e454fc8d089d75625ce4d3fd1bc4ad19c2962 +#+ca-certificates-wip-donotuse.a66f450ca946c6c320d483b42893691a87c54c7ff432958a9b3bf473bd4c796c #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. @@ -73,7 +73,7 @@ make DESTDIR="$pthbs_destdir" install cd .. gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto -cp -vs '/versions/ca-certificates-wip-donotuse.c7322a19aa2e80d7650710cfb45e454fc8d089d75625ce4d3fd1bc4ad19c2962/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/versions/ca-certificates-wip-donotuse.a66f450ca946c6c320d483b42893691a87c54c7ff432958a9b3bf473bd4c796c/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" ./c_rehash "$pthbs_destdir/$prefix/config/ssl/certs/" cd "$pthbs_destdir/$prefix/config/ssl/" mv cert.pem libressl-cert.pem diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux @@ -8,9 +8,9 @@ #+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f #+flex.a0b530df71023dab46f59c8c0a6255bae4c6e8e8d88087364e36fcc86318f41b #+bison.50a879da42f360f6a461ecb3eaafaed1ee77389f064b469614f27328bbd15e44 -#+rsync.764c2a430bb92a1a7d2241094aacc90e3f7296fb5556164946c0754030392565 -#+zstd.3f759bb91d3c5d33700fa2c6d3be9c376957f9d719c2bc191d9a11bd0d61e9c2 -#+libelf.8ebbc12e1fd37babb84ef30d2fbfb46e32ae63fa829c98dcaf4f41beb4ee73b9 +#+rsync.a3914e6a58e85cc838ef8c8cda9ec4ba6e49cdd7376d09a2d0c6b072c656c3e7 +#+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 +#+libelf.e0061547c78397275ebd62dfe0e0b0640c7b7c1efdb341dc7763ac5c926b5106 #+pkgconf-pkg-config.a995904b89618eb027fc8e263bb25c635a63aa30c1e758baf29ef2798bb39185 #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest @@ -8,9 +8,9 @@ #+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f #+flex.a0b530df71023dab46f59c8c0a6255bae4c6e8e8d88087364e36fcc86318f41b #+bison.50a879da42f360f6a461ecb3eaafaed1ee77389f064b469614f27328bbd15e44 -#+rsync.764c2a430bb92a1a7d2241094aacc90e3f7296fb5556164946c0754030392565 -#+zstd.3f759bb91d3c5d33700fa2c6d3be9c376957f9d719c2bc191d9a11bd0d61e9c2 -#+libelf.8ebbc12e1fd37babb84ef30d2fbfb46e32ae63fa829c98dcaf4f41beb4ee73b9 +#+rsync.a3914e6a58e85cc838ef8c8cda9ec4ba6e49cdd7376d09a2d0c6b072c656c3e7 +#+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 +#+libelf.e0061547c78397275ebd62dfe0e0b0640c7b7c1efdb341dc7763ac5c926b5106 #+pkgconf-pkg-config.a995904b89618eb027fc8e263bb25c635a63aa30c1e758baf29ef2798bb39185 #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -6,12 +6,26 @@ #+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ccx-utils.43c8d464c047f747d9f93c78da633212d337783f14700dd6947d33266581cfb9 +#+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps # - build script start - +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'logincaps' @@ -50,22 +64,10 @@ cp -a login "${dest}/command/" -check_static() { - local exe || true - exe=$pthbs_destdir'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} 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/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -4,4 +4,4 @@ #+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 #+mdev-scripts.b479f76641c75492c867bdb1f9d56b9a176b7b5221aee61154ac63011900ed1d #+mdevd.0502ff0a0d6e4f3b58469d0d3aef8816631718d5375ec0d41913dfa9121590fb -#+busybox.14049a2ed1b8715f25e96ae64b4b537f07618a1d08a273935b8f2963a8fd28de- \ No newline at end of file +#+busybox.76e164a3f374450080eb486a2c94ea5bb07bc030d6212014a91c4d2949cbbea3+ \ No newline at end of file diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog @@ -9,24 +9,11 @@ # - 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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static -name=mlog -make "$name" - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" - - check_static() { local exe || true @@ -41,6 +28,21 @@ check_static() { exit 1 fi } + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'mlog' + + +build_env_static +name=mlog +make "$name" + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static "command/$name" diff --git a/variants/root-x86_64/openssl b/variants/root-x86_64/openssl @@ -9,15 +9,30 @@ # - 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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } + +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'openssl-3.3.3' + build_env_static cd openssl-3.3.3 ./config # this will fail, perl is not packaged diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync @@ -7,8 +7,8 @@ #+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 #+popt.08360266ade94b08f97447cd43492a9371bcbf5945d818b15d39a1b36f0f3d40 -#+libressl.a934e3dca14a337f375d1c3120bbb2e6d1adbfb682650abb6c120cd08f05130b -#+zstd.3f759bb91d3c5d33700fa2c6d3be9c376957f9d719c2bc191d9a11bd0d61e9c2 +#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef +#+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking @@ -8,7 +8,7 @@ #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 #+s6-dns.66def5b5ecaa018779d26f6f341b8477f6e2ef8e6aee5e4f30e2f4ee36d59299 -#+libressl.a934e3dca14a337f375d1c3120bbb2e6d1adbfb682650abb6c120cd08f05130b +#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -6,7 +6,7 @@ #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+aat.13a9895e0bae8d3653d847a595f4e4cafd0fcc7c96e71b18dd0021d2fa034646 #+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a -#+rsync.764c2a430bb92a1a7d2241094aacc90e3f7296fb5556164946c0754030392565 +#+rsync.a3914e6a58e85cc838ef8c8cda9ec4ba6e49cdd7376d09a2d0c6b072c656c3e7 #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+kbd.6c8d2c7d8367fa6fe1ec7df2aa44c09f120f7ba886fc69cd39e336f8cd99121c #+mdevd.0502ff0a0d6e4f3b58469d0d3aef8816631718d5375ec0d41913dfa9121590fb @@ -15,8 +15,8 @@ #+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 #+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee #+system-config-scripts.6c3b2eb373b9768ac4d1ad2a919e8f514ef81d028db8dd4a27e7472cc7d97258 -#+logincaps.a6851e111580dc841cbe7b6b6258e6c93708990e24ef38508f1b84585b08f2a7 -#+busybox.14049a2ed1b8715f25e96ae64b4b537f07618a1d08a273935b8f2963a8fd28de +#+logincaps.9521f2ed324c343657aa56e7483577509f567566b97b84bac012a869096a4fff +#+busybox.76e164a3f374450080eb486a2c94ea5bb07bc030d6212014a91c4d2949cbbea3 #@git:ddb20e067ab184cd18ee8b88d74044dfeeaaad4c:system-config @@ -53,8 +53,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.4d5b172db6579372abd2a9c6732dc075e4a7b1f2f9cc5e00f2fb98429e857c6f' \ - 'pthbs_path_mdevd=/versions/env.4c535eac443330ff0714488458977c6a440d2a3708b5e69e28b82a794342a46f' \ + 'pthbs_path_containers=/versions/env.cf16190658b01a6dd0035eebc552e10f328762e8b345d5d662761d54a30ebf5f' \ + 'pthbs_path_mdevd=/versions/env.87e23dac6545777a3fd9b3921f151c7ef93b01d955730fb312ccff26b3f4957a' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -7,19 +7,15 @@ #+s6-portable-utils.07e8ff4d2d45a743ec810d3e27268460d201bafbb0a765756da09179758d4b0d #+s6-linux-init.e17bf07f726729c579bb12c1d25dad4bb263f96509f7ea852bb44d50737d0b4d #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+system-config-rc.49eca33dd2a80731c34905b575c62a1b57952ac734026ef33450cd33dae462f9 +#+system-config-rc.b12d4fe70b02e5d8e95ef628c85b4247b886d4aa9bbf17722d8ced0b4d7dc82f # - build script start - -prefix=/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd '.' - - q() { # quote list of strings to be suitable for execline "s6-quote" "$@" } + qx() { # register executable as dependency and quote full path to be suitable for execline exe=$(realpath "$(which "$1")") name=$(basename "$1") @@ -31,7 +27,12 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/versions/system-config-rc.49eca33dd2a80731c34905b575c62a1b57952ac734026ef33450cd33dae462f9/config/s6-rc-db +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' + + +s6rcdb=/versions/system-config-rc.b12d4fe70b02e5d8e95ef628c85b4247b886d4aa9bbf17722d8ced0b4d7dc82f/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//versions" diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc @@ -5,7 +5,7 @@ #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183 #+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a -#+system-config.48afff7eb2ed1eb1a01774dbac81fca21f4ae053fb26d837bf1bb14f919b2e74 +#+system-config.44a3c05b506aaaf54ea75378fdb57ddd72c68b5b4e6144b010190f5964f0322c # - build script start - @@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.48afff7eb2ed1eb1a01774dbac81fca21f4ae053fb26d837bf1bb14f919b2e74/config/s6-rc-source +src=/versions/system-config.44a3c05b506aaaf54ea75378fdb57ddd72c68b5b4e6144b010190f5964f0322c/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -6,7 +6,7 @@ #+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f #+flex.a0b530df71023dab46f59c8c0a6255bae4c6e8e8d88087364e36fcc86318f41b #+bison.50a879da42f360f6a461ecb3eaafaed1ee77389f064b469614f27328bbd15e44 -#+rsync.764c2a430bb92a1a7d2241094aacc90e3f7296fb5556164946c0754030392565 +#+rsync.a3914e6a58e85cc838ef8c8cda9ec4ba6e49cdd7376d09a2d0c6b072c656c3e7 #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 #+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183 @@ -15,28 +15,28 @@ #+s6-linux-init.e17bf07f726729c579bb12c1d25dad4bb263f96509f7ea852bb44d50737d0b4d #+mdevd.0502ff0a0d6e4f3b58469d0d3aef8816631718d5375ec0d41913dfa9121590fb #+s6-dns.66def5b5ecaa018779d26f6f341b8477f6e2ef8e6aee5e4f30e2f4ee36d59299 -#+libressl.a934e3dca14a337f375d1c3120bbb2e6d1adbfb682650abb6c120cd08f05130b -#+s6-networking.3b76ff75b186090993704d5488971d18301b3e5c775db152580d68b894581bdc +#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef +#+s6-networking.2e3a2b62476afed6b35e208fda1dfb764dc27b8319ec876411dcdb0c8e3bdc3e #+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee #+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 #+aat.13a9895e0bae8d3653d847a595f4e4cafd0fcc7c96e71b18dd0021d2fa034646 #+confz.b97475076615ecc6da4d79b348861a469c76564de60be552a257a11815203bda -#+containers.f92ad7464c95d08eca234c16cdd38981f04ef1261a960c295ef2ac5730845631 +#+containers.74c51512a8e0f9c617967f64fa1cb3fb19b507384e407dc9886df798712b968c #+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a -#+logincaps.a6851e111580dc841cbe7b6b6258e6c93708990e24ef38508f1b84585b08f2a7 +#+logincaps.9521f2ed324c343657aa56e7483577509f567566b97b84bac012a869096a4fff #+snaprep.995dc0361dc0ae81c7e079a2f785b716ee88490680be562cd751a2808328632c -#+curl.db9ea0a9f1673db0f2dac27c35fc82a0f45409eb6e64a0009e21a0aca55ebdce -#+git.30df03cafab3d94f54ae0c26009873c8bd0351397a04fa38bea9b86f0f1b859d -#+xbps.0a61fbc27cdf1fa321f32b14ff32a33444b02b478f68efa0756626002688da9c -#+apk-tools.34e756a4cc4c07dd3d4f62baeb467ffb13c0eb633ed9eaab8806bce25fa5fede -#+getent.fc996e1bf9c07ebf3955b5f1570e83657e4c9222f51b86b7cc7d179195feaaf8 -#+getconf.4b58b9410ad26e84492035678f7dd7922077fd3f1783004b97b10fb5e18d5265 -#+iconv.d10ea9a5e126233a9c16d73d1145f946ec660130ca05d49624fb506a929b1fba -#+libcap.64cd4091357805baa3e567b9f8a3ac56deef254819eea7698ac5d539478fb792 -#+applyuidgid-caps.a93060e2d7bcfd0dbcce9703918401530926f7d6ddd9934c614a194ada12a2b7 -#+ccx-utils.43c8d464c047f747d9f93c78da633212d337783f14700dd6947d33266581cfb9 +#+curl.718c045c064f1e9fd5a7c71f50384345e35e1fc80e3ae7fdacadce73454dd3e7 +#+git.96c05646b93e3a672c5591f704106d3f6fea912d796cd0df6abd655b243d86eb +#+xbps.842e6ebb5f6730c6aef95d07e8e2773cc1927c7be00a6541e057a0857f06801f +#+apk-tools.15367b4f5dd92474eac1f48f8a6f20f7e59524eb86d4494530353badb3b73378 +#+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 +#+getconf.a13baa310359caefe186a823f0386190b6286fccf30aaf8301e115f3dc973d44 +#+iconv.7afe835f0a03884e71f41bd2a96a88e9e1e73233137cb94da9f73a6721ed3001 +#+libcap.738fe1a044a48d3b316e0a5196bd27987e0d0a656471aa475139c1f3ba3d511e +#+applyuidgid-caps.7e7a19a986e85e5e678eb5359e801ed0a621283b9a61427a62e8e2fd44d99e2e +#+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 #+user-env.78b039be2e0732709774f80dd3455f3785f2b5febb591a956303c2aeed468547 #+strace.f67bc48859477eb362b356c2f4fd4d3a6a38fb3d32969338ec7f87dd48634904 -#+mlog.54bb21963344e806b9c342686157c4c1d7ee291cfc75bbbcb91fdcd95631f89d +#+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398 #+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 \ 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.58f38a37e12470bac65ffc9e0f991b42ee08b506c4fbb5ea7784d2faaed14696- \ No newline at end of file +#+linux-qemu-guest.b9fa53338a5b6d5092d55dc1cc3ce5adfb2b5876b3465a1010b92d5a1da39946+ \ No newline at end of file diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps @@ -5,13 +5,33 @@ #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+libarchive.5aff27330d5fcb7f41de35cd02349baee7d80da706457bbb7dbb9c235f2c51e7 -#+libressl.a934e3dca14a337f375d1c3120bbb2e6d1adbfb682650abb6c120cd08f05130b +#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef #+pkgconf-pkg-config.a995904b89618eb027fc8e263bb25c635a63aa30c1e758baf29ef2798bb39185 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. # - build script start - +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} + +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'xbps-0.59.2' @@ -19,11 +39,6 @@ cd 'xbps-0.59.2' export LDFLAGS=--static export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} build_env_static find lib bin -name '*.c' -exec sed -iEe '/^[\t ]*#[\t ]*define[\t ]+_GNU_SOURCE/d' '{}' \; @@ -56,19 +71,6 @@ 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 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} check_static command/xbps-install.static mkdir -p "$dest/keys" mv -v "$pthbs_destdir/var/db/xbps/keys" "$dest/keys/void" diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd @@ -10,27 +10,11 @@ # - 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" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -build_env_static - -make -j${JOBS:-1} -l$((1+${JOBS:-1})) default install \ - V=1 \ - DESTDIR="$pthbs_destdir" \ - prefix="/versions/$pthbs_package" \ - datarootdir="/versions/$pthbs_package" \ - bindir="/versions/$pthbs_package/command" \ - libdir="/versions/$pthbs_package/library" -rm -v "$pthbs_destdir//versions/$pthbs_package/library"/*.so* - check_static() { local exe || true @@ -45,6 +29,24 @@ check_static() { exit 1 fi } + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'zstd-1.5.5' + + +build_env_static + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) default install \ + V=1 \ + DESTDIR="$pthbs_destdir" \ + prefix="/versions/$pthbs_package" \ + datarootdir="/versions/$pthbs_package" \ + bindir="/versions/$pthbs_package/command" \ + libdir="/versions/$pthbs_package/library" +rm -v "$pthbs_destdir//versions/$pthbs_package/library"/*.so* + + check_static command/zstd