commit e6c97da40e788483a7a4b224708964bfb435de2a parent 65d0a3918b61cb4c995e36fba97bf0c2912e4ad9 Author: Jan Pobrislo <ccx@te2000.cz> Date: Thu, 9 Oct 2025 23:29:14 +0000 whitespace fixes Diffstat:
263 files changed, 1670 insertions(+), 1846 deletions(-)
diff --git a/templates/genlinks b/templates/genlinks @@ -7,7 +7,7 @@ cd "$pthbs_destdir{{versions}}/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { -{%- block genlinks_begin %} +{%- block genlinks_begin -%} {% endblock -%} } @@ -26,8 +26,8 @@ function link(src) { } $1!="."{exit 1} -{% block genlinks_rules %} -{% endblock -%} +{% block genlinks_rules -%} +{% endblock %} $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/templates/pkg/aat b/templates/pkg/aat @@ -1,11 +1,11 @@ {%- set pkg_source="git" -%} {% extends "scriptsetup" %} -{%- block install %} -{{ super() }} +{% block install -%} +{{ super() -}} mv -v data.awk "$pkgdir/" -{%- endblock %} +{% endblock %} {% block genlinks_begin %} x["./command/aat"]=1 x["./command/aat.awk"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/abduco b/templates/pkg/abduco @@ -1,12 +1,12 @@ {%- set pkg_source="git" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("busybox-diffutils")}} {% endblock %} -{%- block configure %} +{% block configure -%} {% include "functions/build_env_static" %} build_env_static cd abduco @@ -24,13 +24,13 @@ EOF sed 's/^/> /' config.mk {% endblock %} -{%- block install %} -{{ super() }} +{% block install -%} +{{ super() -}} # the Makefile hardcodes 'bin' despite configure undersanding BINDIR mv "${dest}/bin" "${dest}/command" {% endblock %} -{%- block check %} +{% block check -%} {% include "functions/check_static" %} check_static command/abduco @@ -38,4 +38,4 @@ check_static command/abduco {% endblock %} {% block genlinks_begin %} x["./command/abduco"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/alpine-keys b/templates/pkg/alpine-keys @@ -1,8 +1,8 @@ {%- set pkg_source="git" -%} {% extends "genlinks" %} -{%- block build %} +{% block build -%} {% endblock %} -{%- block install %} +{% block install -%} mkdir -p "${dest}/keys" mv alpine-keys/keys "${dest}/keys/alpine" {% endblock %} diff --git a/templates/pkg/apk-tools b/templates/pkg/apk-tools @@ -12,7 +12,7 @@ #@sha256:{{files["apk-tools.patch"]}}:apk-tools.patch {% endblock %} {% block prepare -%} -{{ super() }} +{{ super() -}} patch -p1 <../apk-tools.patch {% endblock %} {% block build -%} @@ -41,4 +41,4 @@ check_static command/apk.static x["./command/apk.static"]=1 x["./library/libapk.a"]=1 x["./library/pkgconfig/apk.pc"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/applyuidgid-caps b/templates/pkg/applyuidgid-caps @@ -3,7 +3,7 @@ #+{{pkg_install_name("skalibs")}} #+{{pkg_install_name("libcap")}} {% endblock %} -{%- block configure %} +{% block configure -%} CFLAGS="-D_GNU_SOURCE" LDFLAGS="-lskarnet -lcap" {% endblock %} diff --git a/templates/pkg/attr b/templates/pkg/attr @@ -3,7 +3,7 @@ {% extends "autotools_static" %} {% block configure %} LDFLAGS=--static -{{ super() }} +{{ super() -}} {% endblock %} {% block genlinks_begin %} x["./command/attr"]=1 diff --git a/templates/pkg/bison b/templates/pkg/bison @@ -1,23 +1,23 @@ {%- set pkg_version="3.8.2" -%} {%- set pkg_source="tar.xz" -%} {% extends "autotools_static" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("flex")}} #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. -{%- endblock %} +{% endblock %} {% block configure %} export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" -{{ super() }} -{%- endblock %} +{{ super() -}} +{% endblock %} {% block configure_args %}--disable-nls{% endblock %} {% block install %} -{{ super() }} +{{ super() -}} rm -vrf "$pthbs_destdir"/$prefix/lib/charset.alias rmdir -p "$pthbs_destdir"/$prefix/lib || true {% endblock %} {% block check %} check_static command/bison -{%- endblock %} +{% endblock %} {% block genlinks_begin %} x["./command/bison"]=1 {% endblock %} diff --git a/templates/pkg/busybox b/templates/pkg/busybox @@ -1,5 +1,5 @@ {% extends "base" %} -{%- block body %} +{%- block body -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make:bootstrap")}} #+{{pkg_install_name("busybox:bootstrap")}} diff --git a/templates/pkg/busybox-diffutils b/templates/pkg/busybox-diffutils @@ -1,5 +1,5 @@ {% extends "base" %} -{%- block body %} +{% block body -%} #+{{pkg_install_name("busybox")}} mkdir -p "$pthbs_destdir{{versions}}/$pthbs_package" diff --git a/templates/pkg/busybox-findutils b/templates/pkg/busybox-findutils @@ -1,5 +1,5 @@ {% extends "base" %} -{%- block body %} +{% block body -%} #+{{pkg_install_name("busybox")}} mkdir -p "$pthbs_destdir{{versions}}/$pthbs_package" diff --git a/templates/pkg/busybox-kbd b/templates/pkg/busybox-kbd @@ -1,5 +1,5 @@ {% extends "base" %} -{%- block body %} +{% block body -%} #+{{pkg_install_name("busybox")}} mkdir -p "$pthbs_destdir{{versions}}/$pthbs_package" diff --git a/templates/pkg/busybox-login b/templates/pkg/busybox-login @@ -1,5 +1,5 @@ {% extends "base" %} -{%- block body %} +{% block body -%} #+{{pkg_install_name("busybox")}} mkdir -p "$pthbs_destdir{{versions}}/$pthbs_package" diff --git a/templates/pkg/busybox:bootstrap b/templates/pkg/busybox:bootstrap @@ -1,5 +1,5 @@ {% extends "base" %} -{%- block body %} +{%- block body -%} #@pragma:nosandbox #@pragma:nopath #+{{pkg_install_name("musl-cross-make:bootstrap-1")}} diff --git a/templates/pkg/busybox:modutils b/templates/pkg/busybox:modutils @@ -1,13 +1,13 @@ {%- set pkg_source="git" -%} {% extends "generic" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("linux")}} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox")}} #@sha256:{{files["busybox_modutils.config"]}}:busybox/.config {% endblock %} -{%- block configure %} +{% block configure -%} export CC="$pthbs_build_environment/command/{{triplet}}-gcc" export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" @@ -17,12 +17,12 @@ CONFIG_DEFAULT_MODULES_DIR="{{pkg_install_dir("linux")}}" EOF {% endblock %} -{%- block build %} +{% block build -%} make V=1 CROSS_COMPILE={{triplet}}- LDFLAGS=-static HOSTLDFLAGS=-static \ HOSTCC="$CC -static" CC="$CC -static" HOSTCFLAGS=-D_GNU_SOURCE -j${JOBS:-1} {% endblock %} -{%- block install %} +{% block install -%} {% include "functions/check_static" %} mkdir -p "${dest}/command" @@ -35,7 +35,7 @@ for exe in depmod insmod lsmod modinfo modprobe rmmod; do done {% endblock %} -{%- block finish %} +{% block finish -%} cd "$pthbs_destdir{{versions}}/$pthbs_package" mv .install-links.new .install-links {% endblock %} diff --git a/templates/pkg/ca-certificates-wip-donotuse b/templates/pkg/ca-certificates-wip-donotuse @@ -1,15 +1,15 @@ {%- set src_dir="ca-certificates-20241121" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("certdata2pem")}} #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. {% endblock %} -{%- block build %} +{% block build -%} touch blacklist.txt # TODO! certdata2pem {% endblock %} -{%- block install %} +{% block install -%} install -d "${dest}/config/ssl/certs" for file in ./*.crt; do install -m 644 $file "${dest}/config/ssl/certs" @@ -24,4 +24,4 @@ $2 == "config" { link($0); next } {% block genlinks_begin %} x["./config/ssl/certs/ISRG_Root_X1.crt"]=1 x["./config/ssl/certs/ISRG_Root_X2.crt"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/ccx-utils b/templates/pkg/ccx-utils @@ -1,12 +1,12 @@ {%- set pkg_source="git" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("skalibs")}} #+{{pkg_install_name("s6")}} {% endblock %} -{%- block build %} +{% block build -%} {% include "functions/check_static" %} {% include "functions/build_env_static" %} build_env_static @@ -35,7 +35,7 @@ do check_static command/$name done {% endblock %} -{%- block install %} +{% block install -%} {% endblock %} {% block genlinks_begin %} x["./command/spawn-pty"]=1 @@ -53,4 +53,4 @@ done x["./command/ucspi-socksserver"]=1 x["./command/ucspi-socksserver-connected"]=1 x["./command/ucspi-socksserver-access"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/certdata2pem b/templates/pkg/certdata2pem @@ -1,7 +1,7 @@ {% extends "single_static_c" %} -{%- block configure %} +{% block configure -%} CFLAGS="-D_GNU_SOURCE" {% endblock %} {% block genlinks_begin %} x["./command/certdata2pem"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/confz b/templates/pkg/confz @@ -1,4 +1,4 @@ {% extends "scriptsetup" %} {% block genlinks_begin %} x["./command/confz"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/container-bin-image b/templates/pkg/container-bin-image @@ -1,5 +1,5 @@ {% extends "base" %} -{%- block body %} +{% block body -%} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("busybox-diffutils")}} #+{{pkg_install_name("busybox-login")}} diff --git a/templates/pkg/containers b/templates/pkg/containers @@ -1,14 +1,14 @@ {%- set pkg_source="git" -%} {% extends "scriptsetup" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("execline")}} #+{{pkg_install_name("alpine-keys")}} #+{{pkg_install_name("apk-tools")}} #+{{pkg_install_name("xbps")}} #+{{pkg_install_name("container-bin-image")}} -{%- endblock %} -{%- block install %} -{{ super() }} +{% endblock %} +{% block install -%} +{{ super() -}} mkdir "${dest}/data" mv -v service_scripts container_template "${dest}/data/" printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ @@ -41,7 +41,7 @@ test -d '{{pkg_install_dir("container-bin-image")}}/container-bin-image' test -f '{{pkg_install_dir("container-bin-image")}}/container-bin-image/if' ln -sf '{{pkg_install_dir("container-bin-image")}}/container-bin-image' "${dest}/deps/" -{%- endblock %} +{% endblock %} {% block genlinks_begin %} x["./command/container_sysroot_run"]=1 x["./command/ns_run"]=1 @@ -49,4 +49,4 @@ ln -sf '{{pkg_install_dir("container-bin-image")}}/container-bin-image' "${dest} x["./command/pidns_run.py"]=1 x["./zsh/site-functions/confz_containers_init"]=1 x["./zsh/site-functions/confz_site_containers_init"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/curl b/templates/pkg/curl @@ -1,9 +1,9 @@ {%- set pkg_version="8.6.0" -%} {%- set pkg_source="tar.xz" -%} {% extends "autotools_static" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("libressl")}} -{%- endblock %} +{% endblock %} {% block configure %} # Do not generate manpages (requires Perl) @@ -27,12 +27,12 @@ autotools_config_static \ --without-libpsl \ --disable-manual -{%- endblock %} +{% endblock %} {% block install %} -{{ super() }} +{{ super() -}} rm -r -v "$pthbs_destdir"'{{versions}}'"/$pthbs_package/man" -{%- endblock %} +{% endblock %} {% block check %} check_static command/curl diff --git a/templates/pkg/easyseccomp b/templates/pkg/easyseccomp @@ -1,6 +1,6 @@ {%- set pkg_source="git" -%} {% extends "autotools" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("patch")}} #+{{pkg_install_name("flex")}} #+{{pkg_install_name("bison")}} @@ -10,23 +10,23 @@ #@untar::sha256:{{files["easyseccomp-configure.tar"]}}:{{name}} #@sha256:{{files["easyseccomp_fix_includes.patch"]}}:easyseccomp_fix_includes.patch {% endblock %} -{%- block prepare %} -{{ super() }} +{% block prepare -%} +{{ super() -}} patch -p1 <../easyseccomp_fix_includes.patch touch Makefile.in configure {% endblock %} -{%- block configure %} +{% block configure -%} build_env_static autotools_config --enable-seccomp {% endblock %} -{%- block build %} +{% block build -%} make -j1 V=1 DESTDIR="$pthbs_destdir" LIBS="-lseccomp -lerror -largp" install {% endblock %} -{%- block install %} +{% block install -%} {% endblock %} -{%- block check %} +{% block check -%} {% include "functions/check_static" %} check_static command/easyseccomp diff --git a/templates/pkg/error-standalone b/templates/pkg/error-standalone @@ -1,12 +1,12 @@ {%- set pkg_version="2.0" -%} {%- set pkg_source="tar.gz" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox-diffutils")}} {% endblock %} -{%- block build %} +{% block build -%} {% include "functions/build_env_static" %} cd error-standalone-2.0 {{make}} PREFIX={{versions}}/$pthbs_package \ @@ -16,7 +16,7 @@ cd error-standalone-2.0 install-static {% endblock %} -{%- block install %} +{% block install -%} {% endblock %} {% block genlinks_begin %} x["./library/liberror.a"]=1 diff --git a/templates/pkg/execline b/templates/pkg/execline @@ -1,6 +1,6 @@ {% extends "skaware" %} -{%- block install %} -{{ super() }} +{% block install -%} +{{ super() -}} if ! test -e "${dest}/command/eltest"; then # TODO printf '%s\n' >"${dest}/command/eltest" \ @@ -9,4 +9,4 @@ if ! test -e "${dest}/command/eltest"; then chmod +x "${dest}/command/eltest" fi -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/fileset b/templates/pkg/fileset @@ -3,4 +3,4 @@ x["./command/fslist"]=1 x["./command/fsapply"]=1 x["./command/fileset"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/flex b/templates/pkg/flex @@ -1,13 +1,13 @@ {%- set pkg_version="2.6.4" -%} {%- set pkg_source="tar.gz" -%} {% extends "autotools_static" %} -{%- block configure %} +{% block configure -%} export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" export LDFLAGS="--static" -{{ super() }} +{{ super() -}} {% endblock %} -{%- block check %} +{% block check -%} check_static command/flex check_static command/flex++ diff --git a/templates/pkg/getconf b/templates/pkg/getconf @@ -1,4 +1,4 @@ {% extends "single_static_c" %} -{%- block source_deps %} -#@sha256:{{ downloads[shortname + ".c"] }}:{{ shortname }}.c +{% block source_deps -%} +#@{{ downloads[shortname + ".c"] }}:{{ shortname }}.c {% endblock %} diff --git a/templates/pkg/getent b/templates/pkg/getent @@ -1,4 +1,4 @@ {% extends "single_static_c" %} -{%- block source_deps %} -#@sha256:{{ downloads[shortname + ".c"] }}:{{ shortname }}.c +{% block source_deps -%} +#@{{ downloads[shortname + ".c"] }}:{{ shortname }}.c {% endblock %} diff --git a/templates/pkg/git b/templates/pkg/git @@ -1,7 +1,7 @@ {%- set pkg_version="2.43.2" -%} {%- set pkg_source="tar.xz" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox")}} @@ -10,7 +10,7 @@ #+{{pkg_install_name("libressl")}} #+{{pkg_install_name("curl")}} {% endblock %} -{%- block build %} +{% block build -%} {{make}} -C ./git-2.43.2 \ LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" \ CPATH="$pthbs_build_environment/include" \ @@ -29,9 +29,9 @@ V=1 all install {% endblock %} -{%- block install %} +{% block install -%} {% endblock %} -{%- block check %} +{% block check -%} {% include "functions/check_static" %} check_static command/git diff --git a/templates/pkg/gnu-make b/templates/pkg/gnu-make @@ -2,12 +2,12 @@ {%- set src_dir="make-"+pkg_version -%} {% extends "autotools_static" %} {%- block template_deps %}{% endblock %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make:bootstrap")}} #+{{pkg_install_name("busybox:bootstrap")}} #@untar:-z:{{downloads["make-" + assertion(pkg_version) + ".tar.gz"]}}:. -{%- endblock %} +{% endblock %} {% block configure_args %}--disable-nls{% endblock %} {% block check %} check_static command/make diff --git a/templates/pkg/gnu-make:bootstrap b/templates/pkg/gnu-make:bootstrap @@ -1,12 +1,12 @@ {%- set pkg_version="4.4.1" -%} {%- set src_dir="make-"+pkg_version -%} {% extends "autotools" %} -{%- block template_deps %} +{% block template_deps -%} #@pragma:nosandbox #@pragma:nopath #+{{pkg_install_name("musl-cross-make:bootstrap-1")}} #@untar:-z:{{downloads["make-" + assertion(pkg_version) + ".tar.gz"]}}:. -{%- endblock %} +{% endblock %} {% block configure %} mcm={{versions}}/musl-cross-make.{{pkg_sha256("musl-cross-make:bootstrap-1")}} diff --git a/templates/pkg/iconv b/templates/pkg/iconv @@ -1,4 +1,4 @@ {% extends "single_static_c" %} -{%- block source_deps %} -#@sha256:{{ downloads[shortname + ".c"] }}:{{ shortname }}.c +{% block source_deps -%} +#@{{ downloads[shortname + ".c"] }}:{{ shortname }}.c {% endblock %} diff --git a/templates/pkg/kbd b/templates/pkg/kbd @@ -1,24 +1,24 @@ {%- set pkg_version="2.6.4" -%} {%- set pkg_source="tar.gz" -%} {% extends "autotools_static" %} -{%- block package_deps %} +{% block package_deps -%} #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. -{%- endblock %} -{%- block configure %} +{% endblock %} +{% block configure -%} export LDFLAGS="--static" -{{ super() }} +{{ super() -}} {% endblock %} {%- block configure_args -%} --disable-nls --disable-vlock --disable-werror --disable-tests \ --datadir="$prefix/data" --datarootdir="$prefix/data" {% endblock %} -{%- block install %} -{{ super() }} +{% block install -%} +{{ super() -}} cd ../destdir mv -v data ".$prefix/" {% endblock %} -{%- block check %} +{% block check -%} check_static command/loadkeys {% endblock %} {% block genlinks_begin %} diff --git a/templates/pkg/libarchive b/templates/pkg/libarchive @@ -1,12 +1,12 @@ {%- set pkg_version="3.7.2" -%} {%- set pkg_source="tar.xz" -%} {% extends "autotools_static" %} -{%- block configure %} +{% block configure -%} export LDFLAGS=--static -{{ super() }} +{{ super() -}} {% endblock %} {%- block configure_args %}--without-xml2{% endblock %} -{%- block check %} +{% block check -%} check_static command/bsdtar check_static command/bsdcpio @@ -15,4 +15,4 @@ check_static command/bsdcpio x["./command/bsdtar"]=1 x["./command/bsdcpio"]=1 x["./library/libarchive.a"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/libbsd b/templates/pkg/libbsd @@ -1,9 +1,9 @@ {%- set pkg_version="0.11.8" -%} {%- set pkg_source="tar.xz" -%} {% extends "autotools_static" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("libmd")}} -{%- endblock %} +{% endblock %} {% block genlinks_begin %} x["./library/libbsd.a"]=1 x["./include/bsd/bsd.h"]=1 diff --git a/templates/pkg/libcap b/templates/pkg/libcap @@ -1,24 +1,24 @@ {%- set pkg_version="2.69" -%} {%- set pkg_source="tar.xz" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox-diffutils")}} #+{{pkg_install_name("pkgconf-pkg-config")}} -{%- endblock %} -{%- block prepare %} -{{ super() }} +{% endblock %} +{% block prepare -%} +{{ super() -}} sed -i '1 s|^#!/bin/bash|#!/bin/sh|' progs/*.sh {% endblock %} -{%- block configure %} +{% block configure -%} {% include "functions/build_env_static" %} LDFLAGS=--static build_env_static {% endblock %} -{%- block build_and_install %} +{% block build_and_install -%} {{make}} \ DESTDIR="$pthbs_destdir" \ SHARED=no DYNAMIC=no LIBCSTATIC=yes \ @@ -38,7 +38,7 @@ build_env_static LDFLAGS="$LDFLAGS" \ all install {% endblock %} -{%- block check %} +{% block check -%} {% include "functions/check_static" %} check_static command/capsh check_static command/getcap diff --git a/templates/pkg/libcgroup b/templates/pkg/libcgroup @@ -1,11 +1,11 @@ {%- set pkg_version="3.0.0" -%} {%- set pkg_source="tar.gz" -%} {% extends "autotools_static" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("flex")}} #+{{pkg_install_name("bison")}} #+{{pkg_install_name("musl-fts")}} -{%- endblock %} +{% endblock %} {% block check %} check_static command/cgconfigparser diff --git a/templates/pkg/libelf b/templates/pkg/libelf @@ -1,13 +1,13 @@ {%- set pkg_source="git" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("busybox-diffutils")}} #+{{pkg_install_name("zstd")}} -{%- endblock %} -{%- block build_and_install %} +{% endblock %} +{% block build_and_install -%} {% include "functions/build_env_static" %} build_env_static {{make}} PREFIX="$prefix" \ diff --git a/templates/pkg/libressl b/templates/pkg/libressl @@ -1,17 +1,17 @@ {%- set pkg_version="3.8.2" -%} {%- set pkg_source="tar.gz" -%} {% extends "autotools_static" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("ca-certificates-wip-donotuse")}} #@sha256:{{files["c_rehash.c"]}}:c_rehash.c -{%- endblock %} +{% endblock %} {% block configure %} export LDFLAGS="--static" -{{ super() }} +{{ super() -}} {% endblock %} {% block configure_args %}--with-openssldir="$prefix/config/ssl"{% endblock %} {% block build %} -{{ super() }} +{{ super() -}} cd .. gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto cp -vs '{{pkg_install_dir("ca-certificates-wip-donotuse")}}/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" diff --git a/templates/pkg/libretls b/templates/pkg/libretls @@ -3,7 +3,7 @@ {% extends "autotools_static" %} {% block configure %} export LDFLAGS="--static" -{{ super() }} +{{ super() -}} {% endblock %} {% block genlinks_begin %} x["./man/man3/tls_connect.3"]=1 diff --git a/templates/pkg/libseccomp b/templates/pkg/libseccomp @@ -1,13 +1,13 @@ {%- set pkg_version="2.6.0" -%} {%- set pkg_source="tar.gz" -%} {% extends "autotools_static" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("pkgconf-pkg-config")}} #+{{pkg_install_name("gperf")}} {% endblock %} {% block configure %} export LDFLAGS="--static" -{{ super() }} +{{ super() -}} {% endblock %} {% block check %} check_static command/scmp_sys_resolver diff --git a/templates/pkg/logincaps b/templates/pkg/logincaps @@ -1,11 +1,11 @@ {% extends "scriptsetup" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("execline")}} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("ccx-utils")}} -{%- endblock %} -{%- block install %} -{{ super() }} +{% endblock %} +{% block install -%} +{{ super() -}} pthbs-banginstall etc/loginexec "${dest}" @@ -20,7 +20,7 @@ sh build_static.sh -DLOGINEXEC_PATH="\"$prefix/command/loginexec\"" cp -a login "${dest}/command/" {% endblock %} -{%- block check %} +{% block check -%} {% include "functions/check_static" %} check_static command/login {% endblock %} @@ -31,4 +31,4 @@ check_static command/login x["./command/login.capability.brightness"]=1 x["./command/login.capability.service"]=1 x["./command/logincaps"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/m4 b/templates/pkg/m4 @@ -2,13 +2,13 @@ {%- set pkg_source="tar.gz" -%} {% extends "autotools_static" %} {%- block template_deps %}{% endblock %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("busybox-diffutils")}} #+{{pkg_install_name("busybox-findutils")}} -{%- endblock %} +{% endblock %} {% block configure_args %}--disable-nls{% endblock %} {% block check %} check_static command/m4 diff --git a/templates/pkg/mdev-scripts b/templates/pkg/mdev-scripts @@ -1,11 +1,11 @@ {% extends "genlinks" %} -{%- block deps %} +{% block deps -%} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("zsh")}} #+{{pkg_install_name("pthbs-banginstall")}} #@git:{{submodule.current["mdev-conf"]}}:{{name}} -{%- endblock %} -{%- block build_and_install %} +{% endblock %} +{% block build_and_install -%} mkdir -p "$dest" for script in persistent-storage dvbdev ptpdev usbdev; do mv -v $script mdev-hook-$script diff --git a/templates/pkg/mdevd b/templates/pkg/mdevd @@ -1,4 +1,4 @@ {% extends "skaware" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("execline")}} -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/mlog b/templates/pkg/mlog @@ -1,27 +1,27 @@ {%- set pkg_source="git" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} -{%- endblock %} -{%- block build %} +{% endblock %} +{% block build -%} {% include "functions/build_env_static" %} build_env_static name=mlog make "$name" {% endblock %} -{%- block install %} +{% block install -%} install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" {% endblock %} -{%- block check %} +{% block check -%} {% include "functions/check_static" %} check_static "command/$name" {% endblock %} {% block genlinks_begin %} x["./command/mlog"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/musl-cross-make b/templates/pkg/musl-cross-make @@ -2,7 +2,7 @@ {%- set src_dir="." -%} {% extends "genlinks" %} {%- block template_deps %}{% endblock %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("musl-cross-make:bootstrap-1")}} #+{{pkg_install_name("gnu-make:bootstrap")}} #+{{pkg_install_name("busybox:bootstrap")}} @@ -17,7 +17,7 @@ #@sha256:4213e75809588e3f32ae0fde8fb11df2dfd6e0e013762ff5ee951c3aadb7ffc0:musl-cross-make/patches/linux-6.5.4/0001-no-rsync-headers.diff #@sha256:{{files["zpipe.c"]}}:zpipe.c {% endblock %} -{%- block configure %} +{% block configure -%} # For validating the compiler printf '%s\n' 'int main(void) { return 0; }' >true.c @@ -37,7 +37,7 @@ printf '%s %s\n' >musl-cross-make/hashes/linux-6.5.4.tar.xz.sha1 \ touch musl-cross-make/sources/* {% endblock %} -{%- block build_and_install %} +{% block build_and_install -%} # Patch linker path for dynamic executables make -C musl-cross-make gcc-11.2.0 sed -i -e 's|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h diff --git a/templates/pkg/musl-cross-make:bootstrap-0 b/templates/pkg/musl-cross-make:bootstrap-0 @@ -2,7 +2,7 @@ {%- set src_dir="." -%} {% extends "genlinks" %} {%- block template_deps %}{% endblock %} -{%- block package_deps %} +{% block package_deps -%} #@pragma:nosandbox #@pragma:nopath #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz @@ -14,7 +14,7 @@ #@sha256:c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc:musl-cross-make/sources/mpfr-4.0.2.tar.bz2 #@sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:musl-cross-make/sources/musl-1.2.5.tar.gz {% endblock %} -{%- block configure %} +{% block configure -%} # For validating the compiler printf '%s\n' 'int main(void) { return 0; }' >true.c @@ -27,7 +27,7 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* {% endblock %} -{%- block build_and_install %} +{% block build_and_install -%} # Patch linker path for dynamic executables make -C musl-cross-make gcc-9.4.0 sed -i -e 's|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-musl-|' musl-cross-make/gcc-9.4.0/gcc/config/*/linux*.h diff --git a/templates/pkg/musl-cross-make:bootstrap-1 b/templates/pkg/musl-cross-make:bootstrap-1 @@ -2,7 +2,7 @@ {%- set src_dir="." -%} {% extends "genlinks" %} {%- block template_deps %}{% endblock %} -{%- block package_deps %} +{% block package_deps -%} #@pragma:nosandbox #@pragma:nopath #+{{pkg_install_name("musl-cross-make:bootstrap-0")}} @@ -15,7 +15,7 @@ #@sha256:c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc:musl-cross-make/sources/mpfr-4.0.2.tar.bz2 #@sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:musl-cross-make/sources/musl-1.2.5.tar.gz {% endblock %} -{%- block configure %} +{% block configure -%} bootstrap={{versions}}/musl-cross-make.{{pkg_sha256("musl-cross-make:bootstrap-0")}} "$bootstrap/bin/{{triplet}}-gcc" --version @@ -35,7 +35,7 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* {% endblock %} -{%- block build_and_install %} +{% block build_and_install -%} # Patch linker path for dynamic executables make -C musl-cross-make gcc-11.2.0 sed -i -e 's|/lib/ld-musl-|{{versions}}/'"$pthbs_package"'/{{triplet}}/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h diff --git a/templates/pkg/musl-fts b/templates/pkg/musl-fts @@ -1,8 +1,8 @@ {%- set pkg_version="1.2.7" -%} {% extends "autotools_static" %} -{%- block package_deps %} +{% block package_deps -%} #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. -{%- endblock %} +{% endblock %} {% block genlinks_begin %} x["./library/libfts.a"]=1 x["./include/fts.h"]=1 diff --git a/templates/pkg/netbsd-curses b/templates/pkg/netbsd-curses @@ -1,17 +1,17 @@ {%- set pkg_source="git" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("musl-cross-make")}} {% endblock %} -{%- block configure %} +{% block configure -%} export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" export CPATH="$pthbs_build_environment/include" {% endblock %} -{%- block install %} +{% block install -%} cat << EOF > config.mak PREFIX=$prefix PREFIX="$prefix" diff --git a/templates/pkg/openssl b/templates/pkg/openssl @@ -1,17 +1,17 @@ {%- set pkg_version="3.3.3" -%} {%- set pkg_source="tar.gz" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("musl-cross-make")}} -{%- endblock %} -{%- block configure %} +{% endblock %} +{% block configure -%} {% include "functions/build_env_static" %} build_env_static cd openssl-3.3.3 ./config # this will fail, perl is not packaged -{%- endblock %} -{%- block check %} +{% endblock %} +{% block check -%} check_static command/openssl check_static command/ocspcheck diff --git a/templates/pkg/patch b/templates/pkg/patch @@ -8,4 +8,4 @@ check_static command/patch {% endblock %} {% block genlinks_begin %} x["./command/patch"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/patchelf:bootstrap b/templates/pkg/patchelf:bootstrap @@ -1,15 +1,15 @@ {%- set pkg_source="git" -%} {% extends "autotools_static" %} {%- block template_deps %}{% endblock %} -{%- block package_deps %} +{% block package_deps -%} #@pragma:nosandbox #@pragma:nopath -{%- endblock %} -{%- block configure %} +{% endblock %} +{% block configure -%} ./bootstrap.sh autotools_config_static . --disable-nls {% endblock %} -{%- block check %} +{% block check -%} check_static command/patchelf {% endblock %} {% block genlinks_begin %} diff --git a/templates/pkg/pkgconf b/templates/pkg/pkgconf @@ -12,4 +12,4 @@ check_static command/pkgconf {% endblock %} {% block genlinks_begin %} x["./command/pkgconf"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/pkgconf-pkg-config b/templates/pkg/pkgconf-pkg-config @@ -1,5 +1,5 @@ {% extends "base" %} -{%- block body %} +{% block body -%} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("pkgconf")}} diff --git a/templates/pkg/pthbs-banginstall b/templates/pkg/pthbs-banginstall @@ -1,10 +1,10 @@ {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("zsh")}} #@sha256:{{files["pthbs-banginstall"]}}:pthbs-banginstall {% endblock %} -{%- block build_and_install %} +{% block build_and_install -%} mkdir -p "${dest}/command" chmod +x pthbs-banginstall zsh -x pthbs-banginstall pthbs-banginstall "${dest}" diff --git a/templates/pkg/rsync b/templates/pkg/rsync @@ -1,11 +1,11 @@ {%- set pkg_version="3.2.7" -%} {%- set pkg_source="tar.gz" -%} {% extends "autotools_static" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("popt")}} #+{{pkg_install_name("libressl")}} #+{{pkg_install_name("zstd")}} -{%- endblock %} +{% endblock %} {% block configure_args -%} --without-included-popt \ --enable-openssl \ diff --git a/templates/pkg/s6 b/templates/pkg/s6 @@ -1,9 +1,9 @@ {%- set pkg_source="git" -%} {% extends "skaware" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("execline")}} {% endblock %} -{%- block build %} +{% block build -%} {{make}} CFLAGS=-DWANT_CLONE_NEWPID {% endblock %} {% block genlinks_begin %} diff --git a/templates/pkg/s6-linux-init b/templates/pkg/s6-linux-init @@ -1,6 +1,6 @@ {%- set pkg_source="git" -%} {% extends "skaware" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("execline")}} #+{{pkg_install_name("s6")}} -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/s6-networking b/templates/pkg/s6-networking @@ -1,11 +1,11 @@ {%- set pkg_source="git" -%} {% extends "skaware" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("execline")}} #+{{pkg_install_name("s6")}} #+{{pkg_install_name("s6-dns")}} #+{{pkg_install_name("libressl")}} -{%- endblock %} +{% endblock %} {%- block configure_args %}--enable-ssl=libtls{% endblock %} {% block genlinks_begin %} x["./command/s6-tcpclient"]=1 diff --git a/templates/pkg/s6-rc b/templates/pkg/s6-rc @@ -1,6 +1,6 @@ {%- set pkg_source="git" -%} {% extends "skaware" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("execline")}} #+{{pkg_install_name("s6")}} -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/skalibs b/templates/pkg/skalibs @@ -1,10 +1,10 @@ {%- set pkg_source="git" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} -{%- endblock %} -{%- block configure %} +{% endblock %} +{% block configure -%} export CC="$pthbs_build_environment/command/{{triplet}}-gcc" export CXX="$pthbs_build_environment/command/{{triplet}}-g++" export LD="$pthbs_build_environment/command/{{triplet}}-ld" diff --git a/templates/pkg/snaprep b/templates/pkg/snaprep @@ -3,4 +3,4 @@ {% block genlinks_begin %} x["./command/snap.push"]=1 x["./command/snap.lvm2"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/strace b/templates/pkg/strace @@ -1,18 +1,18 @@ {%- set pkg_version="6.13" -%} {%- set pkg_source="tar.xz" -%} {% extends "autotools_static" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("patch")}} #+{{pkg_install_name("libunwind")}} #@sha256:{{files["strace-6.5-static.patch"]}}:strace-6.5-static.patch -{%- endblock %} -{%- block prepare %} -{{ super() }} +{% endblock %} +{% block prepare -%} +{{ super() -}} patch -p1 <../strace-6.5-static.patch {% endblock %} {%- block configure_args %}--with-unwind --without-libdw --enable-mpers=check{% endblock %} -{%- block check %} +{% block check -%} check_static command/strace {% endblock %} diff --git a/templates/pkg/system-config b/templates/pkg/system-config @@ -1,6 +1,6 @@ {%- set pkg_source="git" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("diffutils")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("aat")}} @@ -15,8 +15,8 @@ #+{{pkg_install_name("zsh")}} #+{{pkg_install_name("system-config-scripts")}} #+{{pkg_install_name("logincaps")}} -{%- endblock %} -{%- block build_and_install %} +{% endblock %} +{% block build_and_install -%} err_notfound() { printf >&2 'Executable not found for command "%s"\n' "$1" exit 1 diff --git a/templates/pkg/system-config-init b/templates/pkg/system-config-init @@ -1,5 +1,5 @@ {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("s6")}} #+{{pkg_install_name("s6-rc")}} #+{{pkg_install_name("s6-portable-utils")}} @@ -7,7 +7,7 @@ #+{{pkg_install_name("execline")}} #+{{pkg_install_name("system-config-rc")}} {% endblock %} -{%- block build_and_install %} +{% block build_and_install -%} {% include "functions/q" %} {% include "functions/qx" %} @@ -101,7 +101,7 @@ EOF s6-chmod 755 "${dest}/run-image/service/console-log-tail/run" exit $? {% endblock %} -{%- block check %} +{% block check -%} {% include "functions/check_static" %} check_static bin/init check_static bin/halt @@ -114,4 +114,4 @@ check_static bin/reboot x["./bin/halt"]=1 x["./bin/poweroff"]=1 x["./bin/reboot"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/system-config-rc b/templates/pkg/system-config-rc @@ -1,11 +1,11 @@ {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("busybox-diffutils")}} #+{{pkg_install_name("s6-rc")}} #+{{pkg_install_name("fileset")}} #+{{pkg_install_name("system-config")}} {% endblock %} -{%- block build_and_install %} +{% block build_and_install -%} src={{pkg_install_dir("system-config")}}/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" diff --git a/templates/pkg/system-config-scripts b/templates/pkg/system-config-scripts @@ -2,4 +2,4 @@ {% block genlinks_begin %} x["./command/s"]=1 x["./command/issue-gen"]=1 -{%- endblock %} +{% endblock %} diff --git a/templates/pkg/system-config-zsh b/templates/pkg/system-config-zsh @@ -1,10 +1,10 @@ {%- set pkg_source="git" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("zsh")}} {% endblock %} -{%- block build_and_install %} +{% block build_and_install -%} mkdir -p "$dest/zsh" mv -v zsh-functions "$dest/zsh/site-functions" diff --git a/templates/pkg/user-env b/templates/pkg/user-env @@ -1,11 +1,11 @@ {%- set src_dir='.' -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("execline")}} #+{{pkg_install_name("pthbs-banginstall")}} #@sha256:{{ files[shortname] }}:{{ shortname }} {% endblock %} -{%- block build_and_install %} +{% block build_and_install -%} mkdir -p "${dest}/command" chmod +x user-env pthbs-banginstall user-env "${dest}" diff --git a/templates/pkg/xbps b/templates/pkg/xbps @@ -1,11 +1,11 @@ {%- set pkg_version="0.59.2" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("libarchive")}} #+{{pkg_install_name("libressl")}} #+{{pkg_install_name("pkgconf-pkg-config")}} #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. -{%- endblock %} +{% endblock %} {% block configure %} {% include "functions/build_env_static" %} build_env_static @@ -25,11 +25,11 @@ find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \; --enable-static {% endblock %} -{%- block build %} +{% block build -%} {{make}} -C include {{make}} -C lib libxbps.a {% endblock %} -{%- block install %} +{% block install -%} install -d "$dest/library" install -m 644 lib/libxbps.a "$dest/library" install -d "$dest/command" @@ -41,7 +41,7 @@ done {{make}} -C data install DESTDIR="$pthbs_destdir" {% endblock %} -{%- block check %} +{% block check -%} {% include "functions/check_static" %} check_static command/xbps-install.static mkdir -p "$dest/keys" @@ -50,7 +50,7 @@ mv -v "$pthbs_destdir/var/db/xbps/keys" "$dest/keys/void" {% endblock %} {% block genlinks_begin %} x["./command/xbps-install.static"]=1 -{%- endblock %} +{% endblock %} {% block genlinks_rules %} $2 == "keys" { link($0); next } {% endblock -%} diff --git a/templates/pkg/zsh b/templates/pkg/zsh @@ -1,11 +1,11 @@ {%- set pkg_version="5.9" -%} {%- set pkg_source="tar.xz" -%} {% extends "autotools_static" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("netbsd-curses")}} #+{{pkg_install_name("libbsd")}} #@git:{{submodule.current["zsh_config"]}}:zsh_config -{%- endblock %} +{% endblock %} {% block configure_args -%} --enable-static --disable-shared \ --enable-libc-musl --disable-locale \ @@ -19,9 +19,9 @@ --enable-fndir="${prefix}/zsh/functions" \ --enable-site-fndir="${prefix}/zsh/site-functions" \ --enable-runhelpdir="${prefix}/zsh/help" -{%- endblock %} +{% endblock %} {% block configure -%} -{{ super() }} +{{ super() -}} sed -Ee '/name=zsh\/(files|stat|system|zselect|zutil|regex|net\/socket|net\/tcp) /s/link=[^ ]+/link=static/' -i config.modules cat config.modules diff --git a/templates/pkg/zstd b/templates/pkg/zstd @@ -1,13 +1,13 @@ {%- set pkg_version="1.5.5" -%} {% extends "genlinks" %} -{%- block package_deps %} +{% block package_deps -%} #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("busybox-diffutils")}} #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. {% endblock %} -{%- block build_and_install %} +{% block build_and_install -%} {% include "functions/build_env_static" %} build_env_static @@ -21,7 +21,7 @@ build_env_static rm -v "$pthbs_destdir/{{versions}}/$pthbs_package/library"/*.so* {% endblock %} -{%- block check %} +{% block check -%} {% include "functions/check_static" %} check_static command/zstd @@ -29,4 +29,4 @@ check_static command/zstd {% block genlinks_begin %} x["./command/zstd"]=1 x["./library/libzstd.a"]=1 -{%- endblock %} +{% endblock %} diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea -#+pthbs-banginstall.f1d99f011cc72d4de97caa40d293937a24ad834e3327a0b1a3a6771bb7ceed5a +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat @@ -13,7 +13,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'aat' - for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -30,14 +29,16 @@ if test -d zsh-functions; then mv -v zsh-functions "${dest}/zsh/site-functions" fi - mv -v data.awk "$pkgdir/" + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/aat"]=1 - x["./command/aat.awk"]=1} + x["./command/aat.awk"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -56,6 +57,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco @@ -14,7 +13,6 @@ 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" @@ -39,15 +37,12 @@ sed 's/^/> /' config.mk make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install - # the Makefile hardcodes 'bin' despite configure undersanding BINDIR mv "${dest}/bin" "${dest}/command" - check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -67,7 +62,8 @@ check_static command/abduco cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/abduco"]=1} + x["./command/abduco"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/acl b/variants/ccx-x86_64/acl @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 -#+attr.e6ae3af541a2dcd3779346b83dd54207c454b208940e425fca26945c3e808983 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+attr.11e7f0ac6d7f0d3062c35a9df9314bb4834a468c71cbb69dca08e8b5bf9c4256 #@untar:-z:sha256:5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c:. diff --git a/variants/ccx-x86_64/alpine-keys b/variants/ccx-x86_64/alpine-keys @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys @@ -10,8 +10,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'alpine-keys' - - mkdir -p "${dest}/keys" mv alpine-keys/keys "${dest}/keys/alpine" @@ -40,6 +38,7 @@ $1!="."{exit 1} $2 == "keys" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+patch.09d4fde2cc449c20e50730dcb31872e9664e9b9f3909ac8b7c64185bf8b1e791 -#+libressl.6ae71a2ea8760b1df675e5c6ca7bda0aa50743aa95ae1c9c845a99c069468878 -#+zstd.70a597602efb350f43289d7a85b6d9ddc579b1a2740b66937733776f6217ea46 -#+pkgconf-pkg-config.7e7258f89b19d6cee5343533bd64ae0929a8a28cb31347c9273e4e30939db328 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 +#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 +#+zstd.90a7a74d0ca174c3fff868f77b2d35d292cafef51ba5f416940921188ff32212 +#+pkgconf-pkg-config.c6e3db01553a2cc6c92422f8d60a33dcb49f60862cded670dea79029b938af22 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools @@ -18,7 +18,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'apk-tools' - patch -p1 <../apk-tools.patch build_env_static() { @@ -59,7 +58,8 @@ find -type d -o -print | awk -F/ ' BEGIN { x["./command/apk.static"]=1 x["./library/libapk.a"]=1 - x["./library/pkgconfig/apk.pc"]=1} + x["./library/pkgconfig/apk.pc"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404 -#+libcap.8be85c868570d048d8335c209bb32aa78857e81909e4d330e58ba5b824eacb61 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f +#+libcap.edba12ebbc6125fa22e3ae179b50d06c360eba333b3bdf20d8c82cb3f563f132 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c @@ -13,7 +13,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'applyuidgid-caps' name='applyuidgid-caps' - CFLAGS="-D_GNU_SOURCE" LDFLAGS="-lskarnet -lcap" build_env_static() { diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:. #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0 diff --git a/variants/ccx-x86_64/attr b/variants/ccx-x86_64/attr @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:. @@ -64,7 +64,6 @@ LDFLAGS=--static autotools_config_static - make -j${JOBS:-1} -l$((1+${JOBS:-1})) diff --git a/variants/ccx-x86_64/bison b/variants/ccx-x86_64/bison @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 - -#+flex.4b339b3e1369be8953130e9993dbdc01d1b47a1b1d3ffa62c2ab0a636768e2c3 -#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e +#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. +#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. # - build script start - @@ -72,12 +72,12 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - rm -vrf "$pthbs_destdir"/$prefix/lib/charset.alias rmdir -p "$pthbs_destdir"/$prefix/lib || true -check_static command/bisoncd "$pthbs_destdir/home/ccx/versions/$pthbs_package" +check_static command/bison +cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/bison"]=1 diff --git a/variants/ccx-x86_64/bootstrap.environment b/variants/ccx-x86_64/bootstrap.environment @@ -1,4 +1,4 @@ #!/usr/bin/env pthbs-build -#+busybox.bfa6aab64960f43f8891e63f1f276808dbb257d21cdfc21ce889e6a4fd807095 -#+gnu-make.cca39ff03bab3680d922446aaa172ca22ab0ef0697a6f456fcd10be44fbe4cfd -#+musl-cross-make.a87c891620b89902a411024e8b9fff8555d086e60920661673a0fa4b65f81e5b- \ No newline at end of file +#+busybox.60b492e1fc87ac8497f899148aa74ccc308cca4ae57c84a94b36f122cf4ed752 +#+gnu-make.63505628ae7ef34bfd526ff096c3a87a5bbc187d1d5278663520e990c1620d05 +#+musl-cross-make.ba5394c0e347ba680a13da1f05c91406b6b2fe218739f86d6418d3622e98624d+ \ No newline at end of file diff --git a/variants/ccx-x86_64/busybox b/variants/ccx-x86_64/busybox @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build - -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.cca39ff03bab3680d922446aaa172ca22ab0ef0697a6f456fcd10be44fbe4cfd -#+busybox.bfa6aab64960f43f8891e63f1f276808dbb257d21cdfc21ce889e6a4fd807095 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.63505628ae7ef34bfd526ff096c3a87a5bbc187d1d5278663520e990c1620d05 +#+busybox.60b492e1fc87ac8497f899148aa74ccc308cca4ae57c84a94b36f122cf4ed752 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab:busybox/.config diff --git a/variants/ccx-x86_64/busybox-diffutils b/variants/ccx-x86_64/busybox-diffutils @@ -1,6 +1,5 @@ #!/usr/bin/env pthbs-build - -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-findutils b/variants/ccx-x86_64/busybox-findutils @@ -1,6 +1,5 @@ #!/usr/bin/env pthbs-build - -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-kbd b/variants/ccx-x86_64/busybox-kbd @@ -1,6 +1,5 @@ #!/usr/bin/env pthbs-build - -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-login b/variants/ccx-x86_64/busybox-login @@ -1,6 +1,5 @@ #!/usr/bin/env pthbs-build - -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox:bootstrap b/variants/ccx-x86_64/busybox:bootstrap @@ -1,14 +1,13 @@ #!/usr/bin/env pthbs-build - #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.a87c891620b89902a411024e8b9fff8555d086e60920661673a0fa4b65f81e5b -#+gnu-make.cca39ff03bab3680d922446aaa172ca22ab0ef0697a6f456fcd10be44fbe4cfd +#+musl-cross-make.ba5394c0e347ba680a13da1f05c91406b6b2fe218739f86d6418d3622e98624d +#+gnu-make.63505628ae7ef34bfd526ff096c3a87a5bbc187d1d5278663520e990c1620d05 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config -mcm=/home/ccx/versions/musl-cross-make.a87c891620b89902a411024e8b9fff8555d086e60920661673a0fa4b65f81e5b -make=/home/ccx/versions/gnu-make.cca39ff03bab3680d922446aaa172ca22ab0ef0697a6f456fcd10be44fbe4cfd +mcm=/home/ccx/versions/musl-cross-make.ba5394c0e347ba680a13da1f05c91406b6b2fe218739f86d6418d3622e98624d +make=/home/ccx/versions/gnu-make.63505628ae7ef34bfd526ff096c3a87a5bbc187d1d5278663520e990c1620d05 export PATH="$mcm/bin:$make/command:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build - -#+linux.ada392b2baf73381a87e5befa633dc5ec1b0d9880178eaf8a775b56614018a96 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e +#+linux.78b3b18bfec0045153b2b0f16a599e05dc07b067a6cecfe922ab68fe461f2157 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 #@sha256:ea5d8b394f6e9c3a6cf03d6f4cd3a04db5d9209e7d25bc89aa4de5ac4cb0c141:busybox/.config #@git:887295686dbc69e5b2d530f0e6a8dbf94094ac9f:busybox @@ -13,20 +12,17 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'busybox' - export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.ada392b2baf73381a87e5befa633dc5ec1b0d9880178eaf8a775b56614018a96" +CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.78b3b18bfec0045153b2b0f16a599e05dc07b067a6cecfe922ab68fe461f2157" EOF - make V=1 CROSS_COMPILE=x86_64-linux-musl- LDFLAGS=-static HOSTLDFLAGS=-static \ HOSTCC="$CC -static" CC="$CC -static" HOSTCFLAGS=-D_GNU_SOURCE -j${JOBS:-1} - check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -52,7 +48,6 @@ done - cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" mv .install-links.new .install-links diff --git a/variants/ccx-x86_64/ca-certificates-wip-donotuse b/variants/ccx-x86_64/ca-certificates-wip-donotuse @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+certdata2pem.ec80a43980fb3e56638be1155b7d1fbd8570426c66ccd459770a235544ff534a +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+certdata2pem.02822a7fce42892f7735dd8605305fb31a12657b010cde6a5a35876f54c10811 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. @@ -12,11 +11,9 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'ca-certificates-20241121' - touch blacklist.txt # TODO! certdata2pem - install -d "${dest}/config/ssl/certs" for file in ./*.crt; do install -m 644 $file "${dest}/config/ssl/certs" @@ -30,7 +27,8 @@ cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./config/ssl/certs/ISRG_Root_X1.crt"]=1 - x["./config/ssl/certs/ISRG_Root_X2.crt"]=1} + x["./config/ssl/certs/ISRG_Root_X2.crt"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -49,6 +47,7 @@ $1!="."{exit 1} $2 == "config" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404 -#+s6.ec65ee6650aa00884dfde1ea071761104bb258a3a05382734449177574a2994b +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f +#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c #@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils @@ -15,7 +14,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'ccx-utils' - check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -61,7 +59,6 @@ do done - cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -79,7 +76,8 @@ BEGIN { x["./command/mtime_to_uuidv7"]=1 x["./command/ucspi-socksserver"]=1 x["./command/ucspi-socksserver-connected"]=1 - x["./command/ucspi-socksserver-access"]=1} + x["./command/ucspi-socksserver-access"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c @@ -11,7 +11,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'certdata2pem' name='certdata2pem' - CFLAGS="-D_GNU_SOURCE" build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" @@ -44,7 +43,8 @@ check_static "command/$name" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/certdata2pem"]=1} + x["./command/certdata2pem"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea -#+pthbs-banginstall.f1d99f011cc72d4de97caa40d293937a24ad834e3327a0b1a3a6771bb7ceed5a +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe # - build script start - @@ -33,7 +33,8 @@ fi cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/confz"]=1} + x["./command/confz"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -52,6 +53,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -1,15 +1,14 @@ #!/usr/bin/env pthbs-build - -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+busybox-login.2c38a9d4ad3c2b8465106ea6b5994851189f60e68c9405eb0b999c3c4ce1ab34 -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 -#+s6.ec65ee6650aa00884dfde1ea071761104bb258a3a05382734449177574a2994b -#+ccx-utils.1a02d7ace44a130ee20eb90dd460d259c0d008dae9a55cfdfd16c1c5a340e56b -#+applyuidgid-caps.53e5a421a1bfe10fd81cbbb3f53e8bb77bf703842f017bffab6be6d69bdeaef6 -#+easyseccomp.5545a5929246707599cba18827740dedea685321a12a5758eaec134b907b85fa -#+mlog.937af4c7e19b2cd79179cd672911b372f65063d336aed408fd40a3e3a20286fc -#+abduco.cf477c64f3b21ce7845008a22683d155959e52c7805d84063cfadda726505ddc +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+busybox-login.372c9ec7edef829f034b2d2d819950214c9c3b218d25b37c02fa7fd61dfc92a6 +#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c +#+ccx-utils.d7071841c5bc68c1b4b19e97755afad512ea8d0e607b182d7943c45c3e3c4229 +#+applyuidgid-caps.bfa3d7590305d3fe051d101c056822ece5038783ef3ada05761aa3a1bfcdd58f +#+easyseccomp.b252fe82a86fab29aa35ebd32129753e686f666bb7311ebf20cd56452470878a +#+mlog.4aacddf4a772148aea1dca6b4434b2afdd88caf58b482501dec770cce7684dfb +#+abduco.bb5757f8a5ef9f0dc4e0ab4dcb7ea107b2e54ccf2ed13971d6bde77011292552 #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp img="$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image" diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea -#+pthbs-banginstall.f1d99f011cc72d4de97caa40d293937a24ad834e3327a0b1a3a6771bb7ceed5a - -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 -#+alpine-keys.53bf7d86beb683df9b7272aee6b34a6a5071eddaf40f6b48d1767f933c896702 -#+apk-tools.2c52c6f774eb9d581f5d4071ac5bbecfce3390e2516000c40aa12b2059cb82f4 -#+xbps.b8a253085e59065c944723f9cd8a1261472bd9694ef8185f010d9227ec3cee41 -#+container-bin-image.8ec52d9ee555dfe7a7d6305bddaf55cb29c967ddac3a4a4dbdb48d6987a82dd3#@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe +#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+alpine-keys.3cfc13320ba0778b72fd75a740d6a0f065ba0ee8a83e08d2cbf1ad72410d726a +#+apk-tools.d49d10fb5e01a7f5e1f7cbeec800e2b96ca00797e370d3aead643fe7b9233f30 +#+xbps.cfd899b2267e63867c9cd239c49374dc36a3cc0ded4b90ad6f525e567f079818 +#+container-bin-image.31115c828c429ca73339d18a97371575056310292e959641a4a88668c53660ec +#@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers # - build script start - @@ -18,7 +18,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'containers' - for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -35,7 +34,6 @@ if test -d zsh-functions; then mv -v zsh-functions "${dest}/zsh/site-functions" fi - mkdir "${dest}/data" mv -v service_scripts container_template "${dest}/data/" printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ @@ -49,10 +47,10 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "${dest}/deps/command" -ln -sf '/home/ccx/versions/apk-tools.2c52c6f774eb9d581f5d4071ac5bbecfce3390e2516000c40aa12b2059cb82f4/command/apk.static' "${dest}/deps/command/" -ln -sf '/home/ccx/versions/xbps.b8a253085e59065c944723f9cd8a1261472bd9694ef8185f010d9227ec3cee41/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.d49d10fb5e01a7f5e1f7cbeec800e2b96ca00797e370d3aead643fe7b9233f30/command/apk.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/xbps.cfd899b2267e63867c9cd239c49374dc36a3cc0ded4b90ad6f525e567f079818/command/xbps-install.static' "${dest}/deps/command/" -for f in '/home/ccx/versions/alpine-keys.53bf7d86beb683df9b7272aee6b34a6a5071eddaf40f6b48d1767f933c896702'/keys/alpine/*/*; do +for f in '/home/ccx/versions/alpine-keys.3cfc13320ba0778b72fd75a740d6a0f065ba0ee8a83e08d2cbf1ad72410d726a'/keys/alpine/*/*; do test -f "$f" d=$(basename "${f%/*}") mkdir -p "${dest}/deps/keys/alpine/$d" @@ -60,13 +58,15 @@ for f in '/home/ccx/versions/alpine-keys.53bf7d86beb683df9b7272aee6b34a6a5071edd done mkdir -p "${dest}/deps/keys/void" -for f in '/home/ccx/versions/xbps.b8a253085e59065c944723f9cd8a1261472bd9694ef8185f010d9227ec3cee41'/keys/void/*; do +for f in '/home/ccx/versions/xbps.cfd899b2267e63867c9cd239c49374dc36a3cc0ded4b90ad6f525e567f079818'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.8ec52d9ee555dfe7a7d6305bddaf55cb29c967ddac3a4a4dbdb48d6987a82dd3/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.8ec52d9ee555dfe7a7d6305bddaf55cb29c967ddac3a4a4dbdb48d6987a82dd3/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.8ec52d9ee555dfe7a7d6305bddaf55cb29c967ddac3a4a4dbdb48d6987a82dd3/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.31115c828c429ca73339d18a97371575056310292e959641a4a88668c53660ec/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.31115c828c429ca73339d18a97371575056310292e959641a4a88668c53660ec/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.31115c828c429ca73339d18a97371575056310292e959641a4a88668c53660ec/container-bin-image' "${dest}/deps/" + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -76,7 +76,8 @@ BEGIN { x["./command/ns_umount_script.awk"]=1 x["./command/pidns_run.py"]=1 x["./zsh/site-functions/confz_containers_init"]=1 - x["./zsh/site-functions/confz_site_containers_init"]=1} + x["./zsh/site-functions/confz_site_containers_init"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -95,6 +96,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 -#+s6.ec65ee6650aa00884dfde1ea071761104bb258a3a05382734449177574a2994b -#+s6-portable-utils.06591b1f326e31dbb42eede040f709212f86bb891de7bf8544f70a753594b418 -#+s6-linux-utils.21f2aba793feb3e2ccb9c4a444b07cb4f5584a481e5c5b13aa9d596f21845463 -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea -#+confz.ed5eaee438e4cc16cfc671f09e106695430e8cf41e11cf0eabbfecfeb0dab0ab -#+containers.8a33fc1d657c140072852ff30756bf17bd693ce06d995b2eda93132c4b192cf2 -#+xbps.b8a253085e59065c944723f9cd8a1261472bd9694ef8185f010d9227ec3cee41 -#+zstd.70a597602efb350f43289d7a85b6d9ddc579b1a2740b66937733776f6217ea46 -#+apk-tools.2c52c6f774eb9d581f5d4071ac5bbecfce3390e2516000c40aa12b2059cb82f4 -#+alpine-keys.53bf7d86beb683df9b7272aee6b34a6a5071eddaf40f6b48d1767f933c896702 -#+getent.7ae64900dba9a5bcfd9b4dcd8a85dad96769c19b9b5c5b316c21d25c562ec74b -#+fileset.2e22a61d22911f22a3eecdfaef08d2b3b317410d8995e8978fa808e9e76dc225 -#+ccx-utils.1a02d7ace44a130ee20eb90dd460d259c0d008dae9a55cfdfd16c1c5a340e56b -#+easyseccomp.5545a5929246707599cba18827740dedea685321a12a5758eaec134b907b85fa- \ No newline at end of file +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c +#+s6-portable-utils.a20039a7da7a366a5000f8370f6273fff9abd8d4758c6117e4cab89cbc686397 +#+s6-linux-utils.dccb2f978285051d60ce0bb1a7a1eaddffee03b09eb04db26fa3a32c8836d613 +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+confz.7096c6907e9cc6998358f5c6a41346b7cc59cc13168b0741b68ade0001a8fd77 +#+containers.d1bf556661f3e0e560cc82d13b89700d6f112c010e436d0693861cbbc3b61977 +#+xbps.cfd899b2267e63867c9cd239c49374dc36a3cc0ded4b90ad6f525e567f079818 +#+zstd.90a7a74d0ca174c3fff868f77b2d35d292cafef51ba5f416940921188ff32212 +#+apk-tools.d49d10fb5e01a7f5e1f7cbeec800e2b96ca00797e370d3aead643fe7b9233f30 +#+alpine-keys.3cfc13320ba0778b72fd75a740d6a0f065ba0ee8a83e08d2cbf1ad72410d726a +#+getent.93e754ab9d00c23421e3adb407cf8901d6013d4331f5267f6dd10173c0be1030 +#+fileset.1c1a255aa16f92cf86a8ce188828bf4c2375a3c660fa54e47c637a7ef4510592 +#+ccx-utils.d7071841c5bc68c1b4b19e97755afad512ea8d0e607b182d7943c45c3e3c4229 +#+easyseccomp.b252fe82a86fab29aa35ebd32129753e686f666bb7311ebf20cd56452470878a+ \ No newline at end of file diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 - -#+libressl.6ae71a2ea8760b1df675e5c6ca7bda0aa50743aa95ae1c9c845a99c069468878#@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 +#@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. # - build script start - @@ -81,15 +81,18 @@ autotools_config_static \ --without-libssh2 \ --without-libpsl \ --disable-manual + + make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - rm -r -v "$pthbs_destdir"'/home/ccx/versions'"/$pthbs_package/man" + + check_static command/curl cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -1,45 +1,45 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+diffutils.76f3c13b49c11e721590d9b3f4dc7892e1ae498e99505af8a27902767718bf9f -#+patch.09d4fde2cc449c20e50730dcb31872e9664e9b9f3909ac8b7c64185bf8b1e791 -#+flex.4b339b3e1369be8953130e9993dbdc01d1b47a1b1d3ffa62c2ab0a636768e2c3 -#+bison.a8def3acce294256a503b8950b486c91db0a48b00ffdd4dd8b86475c9e417d7d -#+rsync.a2c600f9198beaf4bb4be2babed6ab2f0ea1e38e75cc06404ccfcd878a774fa2 -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 -#+s6.ec65ee6650aa00884dfde1ea071761104bb258a3a05382734449177574a2994b -#+s6-rc.a37fe0c3a290d48b0158385044bf7f6699b51ab14feef7e4b6087e9415ff2e9d -#+s6-portable-utils.06591b1f326e31dbb42eede040f709212f86bb891de7bf8544f70a753594b418 -#+s6-linux-utils.21f2aba793feb3e2ccb9c4a444b07cb4f5584a481e5c5b13aa9d596f21845463 -#+s6-linux-init.7d29a7011644b39a13cb988fc79ac9d1ac506d966c2cff6a1e3430eb2bd6fc82 -#+mdevd.700bf96a56491b62f3eaf3e1550460838d3089f22a0e9dd3d28813eb97d214e1 -#+s6-dns.42d9cf224aeff2790069671c3539099f016337f1b1dcf2f971c8c10befa80f31 -#+libressl.6ae71a2ea8760b1df675e5c6ca7bda0aa50743aa95ae1c9c845a99c069468878 -#+s6-networking.b269cc0de3d4d5d0475a3838d0b49f43e43d36935ca2c358a05d6dd93389a055 -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea -#+pthbs-banginstall.f1d99f011cc72d4de97caa40d293937a24ad834e3327a0b1a3a6771bb7ceed5a -#+aat.0c31e41cc29067fa4d5a46437fd131c2ddc45969b70ecf562e7ddea7f4d91fb6 -#+confz.ed5eaee438e4cc16cfc671f09e106695430e8cf41e11cf0eabbfecfeb0dab0ab -#+containers.8a33fc1d657c140072852ff30756bf17bd693ce06d995b2eda93132c4b192cf2 -#+fileset.2e22a61d22911f22a3eecdfaef08d2b3b317410d8995e8978fa808e9e76dc225 -#+logincaps.4a398684a8b537c147a65d1f7514685386c643da15105f4fa41c57a685129155 -#+snaprep.7a504c265d2999c88c0de7e0c664c6e0fc61337d25bb5e94f9b09551447f81c8 -#+curl.54d3c0fdf07c1a8259ce30defb6a615b2d209bc293f6798f72518927b22fd5ef -#+git.7e8869142b69cfece3083cfb6b44c1bb4b4ef6b8c1fb70960f4c49d3e3fae299 -#+xbps.b8a253085e59065c944723f9cd8a1261472bd9694ef8185f010d9227ec3cee41 -#+apk-tools.2c52c6f774eb9d581f5d4071ac5bbecfce3390e2516000c40aa12b2059cb82f4 -#+getent.7ae64900dba9a5bcfd9b4dcd8a85dad96769c19b9b5c5b316c21d25c562ec74b -#+getconf.0d1a3c1bfe45dcd0465497230b20dcb47b18e1f095781a477c895d330d9b15a6 -#+iconv.c78704ea54023f29c45cbefb9d49c74868dc00af42c22b23a462742a023fe8fe -#+libcap.8be85c868570d048d8335c209bb32aa78857e81909e4d330e58ba5b824eacb61 -#+applyuidgid-caps.53e5a421a1bfe10fd81cbbb3f53e8bb77bf703842f017bffab6be6d69bdeaef6 -#+ccx-utils.1a02d7ace44a130ee20eb90dd460d259c0d008dae9a55cfdfd16c1c5a340e56b -#+user-env.e3d0ef11c1d9886d1098080506d08fc15326b45399ebad9d2bf68ec2898155ca -#+strace.d3c7b4b2eee1c9ffa29d0da0e539d6f4844ee3ee04f455d46e6cbf07960fb4fe -#+mlog.937af4c7e19b2cd79179cd672911b372f65063d336aed408fd40a3e3a20286fc -#+system-config.89344e829aa5262d7890869416a1672e598605af0a6e8d7997cbe823e457ad25 -#+system-config-rc.4948e66597cd5ec031fc38272cd7df5c00c6697a80514be59795b515deb834cd -#+system-config-scripts.a66c8493c215f8f21c67d8ee37ca77da9df676e8792b0243b66859ec0848d24a -#+system-config-init.d7d2b848335baf30c82ce039001e8d50bf1024fb303a615b566c2d7e7da63836 -#+system-config-zsh.6f484c99d2fb3aa13dc3fea93b9e5974dae2810fe64e84f8d13b3a32c14feb8e- \ No newline at end of file +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+diffutils.7de7d6cf0cec86d9cc6a0b8fb912f6729c86b6d0b83347c738d6c46bbfed0962 +#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 +#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e +#+bison.e7b17457cc09694ac840e07ceb8bc81a250e1235c1735ff77738672aef455999 +#+rsync.73f73fd81fa4d43d714b22e8f9045b7437c5863e6d2a095d85c07ca39483ab59 +#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c +#+s6-rc.5bf8666d6b8c62af9da348bfc46e6680fad8330b9d7376efd1a092f74a1658ce +#+s6-portable-utils.a20039a7da7a366a5000f8370f6273fff9abd8d4758c6117e4cab89cbc686397 +#+s6-linux-utils.dccb2f978285051d60ce0bb1a7a1eaddffee03b09eb04db26fa3a32c8836d613 +#+s6-linux-init.a6524dc0da3a64eca6605fbab5387fc23aee11641e8c78df8ff11dff7cbe2a23 +#+mdevd.9eb4e080ae1f77a023a765bfe64c84969de5a2799ec28196c58a417dd0cf7a67 +#+s6-dns.cc60cc673e7826433641ed3e2aad4efc643e1e617382dfc98a75a33afd10e138 +#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 +#+s6-networking.ad286bd57500a51f79ad09bf3c0984c5b8b97a2a27d3089b2b0fb0f11c117033 +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe +#+aat.b4bf9a146b5cdfb5882fcee353c62b121a3237a2da7e967d53edfac6ad18f099 +#+confz.7096c6907e9cc6998358f5c6a41346b7cc59cc13168b0741b68ade0001a8fd77 +#+containers.d1bf556661f3e0e560cc82d13b89700d6f112c010e436d0693861cbbc3b61977 +#+fileset.1c1a255aa16f92cf86a8ce188828bf4c2375a3c660fa54e47c637a7ef4510592 +#+logincaps.97234d9f65fd1ef50bb8a47c6f27d436f4f8c2a5cf11601a7f5cc32bd4bd7fac +#+snaprep.fd1e6daf121d491db22320dcfe3b6e064a88dabb30e9ee9928bd7c0594cde7fe +#+curl.0061e2b4e63f55797ee20fa643207dc815bd54b0faa8a55276d92f334d6ed837 +#+git.582d85f2c473c8974ee778632c4389b28a265f70565c2245fb733badb3ab8ab1 +#+xbps.cfd899b2267e63867c9cd239c49374dc36a3cc0ded4b90ad6f525e567f079818 +#+apk-tools.d49d10fb5e01a7f5e1f7cbeec800e2b96ca00797e370d3aead643fe7b9233f30 +#+getent.93e754ab9d00c23421e3adb407cf8901d6013d4331f5267f6dd10173c0be1030 +#+getconf.1573dd9b2e84f540bfcfa7d53568064c1b54fb0c49755201fe76a3df979bf403 +#+iconv.9755d220925a69dbb6b79798b75afe2aa3dc77ecb991e81ffb8fd12747c8080f +#+libcap.edba12ebbc6125fa22e3ae179b50d06c360eba333b3bdf20d8c82cb3f563f132 +#+applyuidgid-caps.bfa3d7590305d3fe051d101c056822ece5038783ef3ada05761aa3a1bfcdd58f +#+ccx-utils.d7071841c5bc68c1b4b19e97755afad512ea8d0e607b182d7943c45c3e3c4229 +#+user-env.1bb4a783dfbc7e1f0f0ca0911ae2aca4091c4b869dd8ff48c2b5cd95cb0f1c94 +#+strace.8f47a6c70de766eb8c9cad6c9a2ff23e75e4ad3bf281062e457f396cedd9ea9a +#+mlog.4aacddf4a772148aea1dca6b4434b2afdd88caf58b482501dec770cce7684dfb +#+system-config.cb4c35302d6e68937b1580241062287cfdcc869aa3cc9d2be4118c4a1e6e64ee +#+system-config-rc.973bc8d4e9960860af852b490ad609d58cedbd2c5159bd346e7704a5cb979222 +#+system-config-scripts.ad3e9037eca35543ec995ba7f47300d77edd178b9872d1b9e82ed4fce6058222 +#+system-config-init.c2c882f8a3558248e0c068052f9568d6597de073940c9d164f6bf5bf8b40d705 +#+system-config-zsh.de46dfbb1edb7dcef66778c42b4cb5ab9de3eadabe4b7f28a240229bd4bdff9d+ \ No newline at end of file diff --git a/variants/ccx-x86_64/diffutils b/variants/ccx-x86_64/diffutils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp @@ -1,17 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 - -#+patch.09d4fde2cc449c20e50730dcb31872e9664e9b9f3909ac8b7c64185bf8b1e791 -#+flex.4b339b3e1369be8953130e9993dbdc01d1b47a1b1d3ffa62c2ab0a636768e2c3 -#+bison.a8def3acce294256a503b8950b486c91db0a48b00ffdd4dd8b86475c9e417d7d -#+libseccomp.7ec9f4526dbac3e4a7f1ce57a7a2741ae8e2b457d05b393c495223979f600a80 -#+error-standalone.b88c1f4207d390ed16f92563674fa7675e489d701fe2a461a4be86d7a96c35ec -#+argp-standalone.fe31940f41fbe93b03424a7b8529bff8c8cc22c8ad761571471abddda6dbb1b2 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 +#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e +#+bison.e7b17457cc09694ac840e07ceb8bc81a250e1235c1735ff77738672aef455999 +#+libseccomp.49f898683170a896641aaabd7d903a40fcdcddc0239e884647d9c303f56f1430 +#+error-standalone.4e56527fff943597ddac42982fdee3f3a2099f8ef487eee8c2ecfdf982f89dca +#+argp-standalone.50e78dee0e19476708441f42d1ebf8fa185f65c8b0cea1a2c9027fe408beb8d1 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp @@ -19,7 +18,6 @@ # - build script start - - autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -48,19 +46,14 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'easyseccomp' - patch -p1 <../easyseccomp_fix_includes.patch touch Makefile.in configure - build_env_static autotools_config --enable-seccomp - make -j1 V=1 DESTDIR="$pthbs_destdir" LIBS="-lseccomp -lerror -largp" install - - check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone @@ -1,10 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:. @@ -14,7 +13,6 @@ 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" @@ -29,7 +27,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/home/ccx/versions/$pthbs_package \ - cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f # - build script start - @@ -19,7 +19,7 @@ cd 'execline' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -29,10 +29,8 @@ cd 'execline' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install - if ! test -e "${dest}/command/eltest"; then # TODO printf '%s\n' >"${dest}/command/eltest" \ @@ -41,10 +39,11 @@ if ! test -e "${dest}/command/eltest"; then chmod +x "${dest}/command/eltest" fi + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea -#+pthbs-banginstall.f1d99f011cc72d4de97caa40d293937a24ad834e3327a0b1a3a6771bb7ceed5a +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe # - build script start - @@ -35,7 +35,8 @@ find -type d -o -print | awk -F/ ' BEGIN { x["./command/fslist"]=1 x["./command/fsapply"]=1 - x["./command/fileset"]=1} + x["./command/fileset"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -54,6 +55,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/findutils b/variants/ccx-x86_64/findutils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:. diff --git a/variants/ccx-x86_64/flex b/variants/ccx-x86_64/flex @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. @@ -58,7 +58,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'flex-2.6.4' - export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" export LDFLAGS="--static" @@ -66,14 +65,12 @@ export LDFLAGS="--static" autotools_config_static - make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - check_static command/flex check_static command/flex++ diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe - -#@sha256:sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c # - build script start - diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe - -#@sha256:sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c # - build script start - diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git @@ -1,14 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 -#+libressl.6ae71a2ea8760b1df675e5c6ca7bda0aa50743aa95ae1c9c845a99c069468878 -#+curl.54d3c0fdf07c1a8259ce30defb6a615b2d209bc293f6798f72518927b22fd5ef +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 +#+curl.0061e2b4e63f55797ee20fa643207dc815bd54b0faa8a55276d92f334d6ed837 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. @@ -18,7 +17,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'git-2.43.2' - make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" \ CPATH="$pthbs_build_environment/include" \ @@ -37,8 +35,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ V=1 all install - - check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 diff --git a/variants/ccx-x86_64/gnu-make b/variants/ccx-x86_64/gnu-make @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build - -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.cca39ff03bab3680d922446aaa172ca22ab0ef0697a6f456fcd10be44fbe4cfd -#+busybox.bfa6aab64960f43f8891e63f1f276808dbb257d21cdfc21ce889e6a4fd807095 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.63505628ae7ef34bfd526ff096c3a87a5bbc187d1d5278663520e990c1620d05 +#+busybox.60b492e1fc87ac8497f899148aa74ccc308cca4ae57c84a94b36f122cf4ed752 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. + # - build script start - build_env_static() { diff --git a/variants/ccx-x86_64/gnu-make:bootstrap b/variants/ccx-x86_64/gnu-make:bootstrap @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build - #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.a87c891620b89902a411024e8b9fff8555d086e60920661673a0fa4b65f81e5b +#+musl-cross-make.ba5394c0e347ba680a13da1f05c91406b6b2fe218739f86d6418d3622e98624d #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. + # - build script start - autotools_config() { @@ -36,7 +36,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'make-4.4.1' -mcm=/home/ccx/versions/musl-cross-make.a87c891620b89902a411024e8b9fff8555d086e60920661673a0fa4b65f81e5b +mcm=/home/ccx/versions/musl-cross-make.ba5394c0e347ba680a13da1f05c91406b6b2fe218739f86d6418d3622e98624d export PATH="$mcm/bin:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:. diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe - -#@sha256:sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c # - build script start - diff --git a/variants/ccx-x86_64/kbd b/variants/ccx-x86_64/kbd @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 - -#@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.#@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. +#@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. # - build script start - @@ -59,7 +59,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'kbd-2.6.4' - export LDFLAGS="--static" autotools_config_static --disable-nls --disable-vlock --disable-werror --disable-tests \ @@ -67,19 +66,15 @@ autotools_config_static --disable-nls --disable-vlock --disable-werror --disable - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install - cd ../destdir mv -v data ".$prefix/" - check_static command/loadkeys cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' 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.ada392b2baf73381a87e5befa633dc5ec1b0d9880178eaf8a775b56614018a96 -#+busybox.8a28401148d3997ea66cef4a25640192a066631a802cf8023b6c8e21c323d206- \ No newline at end of file +#+linux.78b3b18bfec0045153b2b0f16a599e05dc07b067a6cecfe922ab68fe461f2157 +#+busybox.9e905493073bad6a68886625e0d644b28d353050182e847b931f57269e0c5bac+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libarchive b/variants/ccx-x86_64/libarchive @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:. @@ -58,20 +58,17 @@ dest=${pthbs_destdir%/}${prefix} cd 'libarchive-3.7.2' - export LDFLAGS=--static autotools_config_static --without-xml2 - make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - check_static command/bsdtar check_static command/bsdcpio @@ -80,7 +77,8 @@ find -type d -o -print | awk -F/ ' BEGIN { x["./command/bsdtar"]=1 x["./command/bsdcpio"]=1 - x["./library/libarchive.a"]=1} + x["./library/libarchive.a"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 - -#+libmd.2babce6c11c6084a9beb0e6d81bb889f0b441f321efe0f3a2a79b489193a2526#@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:. +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+libmd.5a13f5284b12557b047c6c97cdef2d19c6e81fdcbd49818c1f21bc2a4c632a4f +#@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:. # - build script start - diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap @@ -1,23 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+pkgconf-pkg-config.7e7258f89b19d6cee5343533bd64ae0929a8a28cb31347c9273e4e30939db328#@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+pkgconf-pkg-config.c6e3db01553a2cc6c92422f8d60a33dcb49f60862cded670dea79029b938af22 +#@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. # - build script start - - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libcap-2.69' - sed -i '1 s|^#!/bin/bash|#!/bin/sh|' progs/*.sh - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -26,7 +23,6 @@ build_env_static() { LDFLAGS=--static build_env_static - make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ DESTDIR="$pthbs_destdir" \ SHARED=no DYNAMIC=no LIBCSTATIC=yes \ @@ -45,7 +41,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ CAPSH_SHELL="'-DSHELL=\"$(which sh)\"'" \ LDFLAGS="$LDFLAGS" \ all install - check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 - -#+flex.4b339b3e1369be8953130e9993dbdc01d1b47a1b1d3ffa62c2ab0a636768e2c3 -#+bison.a8def3acce294256a503b8950b486c91db0a48b00ffdd4dd8b86475c9e417d7d -#+musl-fts.effd20a3c7c028ec71490f2817a3d18e1fca37507276c5267d3fcce312f86c45#@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e +#+bison.e7b17457cc09694ac840e07ceb8bc81a250e1235c1735ff77738672aef455999 +#+musl-fts.ece197d16a1f0926e6391891380b7779e7ce09fe1bbb5ce952255238345df823 +#@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. # - build script start - diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+zstd.70a597602efb350f43289d7a85b6d9ddc579b1a2740b66937733776f6217ea46#@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+zstd.90a7a74d0ca174c3fff868f77b2d35d292cafef51ba5f416940921188ff32212 +#@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf # - build script start - @@ -15,7 +15,6 @@ 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" diff --git a/variants/ccx-x86_64/libmd b/variants/ccx-x86_64/libmd @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:. diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 - -#+ca-certificates-wip-donotuse.e38e4ab15bf257921adc1c2b30abb99488f072032519f1cbfd9d4f542c19dc88 -#@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c#@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+ca-certificates-wip-donotuse.80a3542382d5618d9a0cd329c1aef59756ae1f37fdf9a1639a49ca950e83e587 +#@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c +#@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. # - build script start - @@ -67,13 +67,11 @@ autotools_config_static --with-openssldir="$prefix/config/ssl" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - cd .. gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto -cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.e38e4ab15bf257921adc1c2b30abb99488f072032519f1cbfd9d4f542c19dc88/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.80a3542382d5618d9a0cd329c1aef59756ae1f37fdf9a1639a49ca950e83e587/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" ./c_rehash "$pthbs_destdir/$prefix/config/ssl/certs/" cd "$pthbs_destdir/$prefix/config/ssl/" mv cert.pem libressl-cert.pem diff --git a/variants/ccx-x86_64/libretls b/variants/ccx-x86_64/libretls @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-z:sha256:3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5:. @@ -64,7 +64,6 @@ export LDFLAGS="--static" autotools_config_static - make -j${JOBS:-1} -l$((1+${JOBS:-1})) diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp @@ -1,13 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 - -#+pkgconf-pkg-config.7e7258f89b19d6cee5343533bd64ae0929a8a28cb31347c9273e4e30939db328 -#+gperf.cd9f5292d68ebeb0767752605a50e6498c34cd4b8f66a9b2b6ca5ba2ab7ef388 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+pkgconf-pkg-config.c6e3db01553a2cc6c92422f8d60a33dcb49f60862cded670dea79029b938af22 +#+gperf.5c541f3f6b7f7db53f868856be4786a945b92e22a7caa4f0296676263b8efb8a #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:. @@ -67,7 +66,6 @@ export LDFLAGS="--static" autotools_config_static - make -j${JOBS:-1} -l$((1+${JOBS:-1})) diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:. diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+findutils.e83f692c8518a069f3ebe3bf28ad837c4bfefba6f64fc6e52b16306afd9621c6 -#+diffutils.76f3c13b49c11e721590d9b3f4dc7892e1ae498e99505af8a27902767718bf9f -#+patch.09d4fde2cc449c20e50730dcb31872e9664e9b9f3909ac8b7c64185bf8b1e791 -#+flex.4b339b3e1369be8953130e9993dbdc01d1b47a1b1d3ffa62c2ab0a636768e2c3 -#+bison.a8def3acce294256a503b8950b486c91db0a48b00ffdd4dd8b86475c9e417d7d -#+rsync.a2c600f9198beaf4bb4be2babed6ab2f0ea1e38e75cc06404ccfcd878a774fa2 -#+zstd.70a597602efb350f43289d7a85b6d9ddc579b1a2740b66937733776f6217ea46 -#+libelf.f9a0ed76632466c5609a42bf5822d6842a4cf90a3c400d90a83ca147b6e0381c -#+pkgconf-pkg-config.7e7258f89b19d6cee5343533bd64ae0929a8a28cb31347c9273e4e30939db328 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+findutils.3e193a778304c75a8019bf418b08653daa53dccbdcdbb6ff2a2e0c281675a46b +#+diffutils.7de7d6cf0cec86d9cc6a0b8fb912f6729c86b6d0b83347c738d6c46bbfed0962 +#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 +#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e +#+bison.e7b17457cc09694ac840e07ceb8bc81a250e1235c1735ff77738672aef455999 +#+rsync.73f73fd81fa4d43d714b22e8f9045b7437c5863e6d2a095d85c07ca39483ab59 +#+zstd.90a7a74d0ca174c3fff868f77b2d35d292cafef51ba5f416940921188ff32212 +#+libelf.d616f401321a0b75f4e22d6979a87dba7c0e6eb138dc5af55742dbf956a4d2ee +#+pkgconf-pkg-config.c6e3db01553a2cc6c92422f8d60a33dcb49f60862cded670dea79029b938af22 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config @@ -91,6 +91,7 @@ function mod_path(s) { return s } $2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+findutils.e83f692c8518a069f3ebe3bf28ad837c4bfefba6f64fc6e52b16306afd9621c6 -#+diffutils.76f3c13b49c11e721590d9b3f4dc7892e1ae498e99505af8a27902767718bf9f -#+patch.09d4fde2cc449c20e50730dcb31872e9664e9b9f3909ac8b7c64185bf8b1e791 -#+flex.4b339b3e1369be8953130e9993dbdc01d1b47a1b1d3ffa62c2ab0a636768e2c3 -#+bison.a8def3acce294256a503b8950b486c91db0a48b00ffdd4dd8b86475c9e417d7d -#+rsync.a2c600f9198beaf4bb4be2babed6ab2f0ea1e38e75cc06404ccfcd878a774fa2 -#+zstd.70a597602efb350f43289d7a85b6d9ddc579b1a2740b66937733776f6217ea46 -#+libelf.f9a0ed76632466c5609a42bf5822d6842a4cf90a3c400d90a83ca147b6e0381c -#+pkgconf-pkg-config.7e7258f89b19d6cee5343533bd64ae0929a8a28cb31347c9273e4e30939db328 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+findutils.3e193a778304c75a8019bf418b08653daa53dccbdcdbb6ff2a2e0c281675a46b +#+diffutils.7de7d6cf0cec86d9cc6a0b8fb912f6729c86b6d0b83347c738d6c46bbfed0962 +#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 +#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e +#+bison.e7b17457cc09694ac840e07ceb8bc81a250e1235c1735ff77738672aef455999 +#+rsync.73f73fd81fa4d43d714b22e8f9045b7437c5863e6d2a095d85c07ca39483ab59 +#+zstd.90a7a74d0ca174c3fff868f77b2d35d292cafef51ba5f416940921188ff32212 +#+libelf.d616f401321a0b75f4e22d6979a87dba7c0e6eb138dc5af55742dbf956a4d2ee +#+pkgconf-pkg-config.c6e3db01553a2cc6c92422f8d60a33dcb49f60862cded670dea79029b938af22 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch @@ -89,6 +89,7 @@ function mod_path(s) { return s } $2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea -#+pthbs-banginstall.f1d99f011cc72d4de97caa40d293937a24ad834e3327a0b1a3a6771bb7ceed5a +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe +#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+ccx-utils.d7071841c5bc68c1b4b19e97755afad512ea8d0e607b182d7943c45c3e3c4229 -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+ccx-utils.1a02d7ace44a130ee20eb90dd460d259c0d008dae9a55cfdfd16c1c5a340e56b # - build script start - @@ -15,7 +15,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'logincaps' - for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -32,8 +31,6 @@ if test -d zsh-functions; then mv -v zsh-functions "${dest}/zsh/site-functions" fi - - pthbs-banginstall etc/loginexec "${dest}" cat >"${dest}/command/login-keepenv" <<EOF @@ -47,7 +44,6 @@ sh build_static.sh -DLOGINEXEC_PATH="\"$prefix/command/loginexec\"" cp -a login "${dest}/command/" - check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -70,7 +66,8 @@ BEGIN { x["./command/login-keepenv"]=1 x["./command/login.capability.brightness"]=1 x["./command/login.capability.service"]=1 - x["./command/logincaps"]=1} + x["./command/logincaps"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -89,6 +86,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/m4 b/variants/ccx-x86_64/m4 @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build - -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432#@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. # - build script start - diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts @@ -1,17 +1,16 @@ #!/usr/bin/env pthbs-build - -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea -#+pthbs-banginstall.f1d99f011cc72d4de97caa40d293937a24ad834e3327a0b1a3a6771bb7ceed5a +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts + # - build script start - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'mdev-scripts' - mkdir -p "$dest" for script in persistent-storage dvbdev ptpdev usbdev; do mv -v $script mdev-hook-$script @@ -21,8 +20,7 @@ done cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 + +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404 -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 # - build script start - @@ -20,7 +20,7 @@ cd 'mdevd' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -36,8 +36,7 @@ make DESTDIR="$pthbs_destdir" install cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 -#+s6.ec65ee6650aa00884dfde1ea071761104bb258a3a05382734449177574a2994b -#+mdev-scripts.e41c71e0d350939075e7addf9c62434c27b19bd4da8cac6cd7e6d4b64b0f47f0 -#+mdevd.700bf96a56491b62f3eaf3e1550460838d3089f22a0e9dd3d28813eb97d214e1- \ No newline at end of file +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c +#+mdev-scripts.78c09cd77deb44ec08747e748b7bd3679e049308c3fb980cd65a0563aa2001b9 +#+mdevd.9eb4e080ae1f77a023a765bfe64c84969de5a2799ec28196c58a417dd0cf7a67+ \ No newline at end of file diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737#@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog # - build script start - @@ -12,7 +12,6 @@ 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" @@ -22,12 +21,10 @@ 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 exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -46,7 +43,8 @@ check_static "command/$name" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/mlog"]=1} + x["./command/mlog"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/musl-cross-make b/variants/ccx-x86_64/musl-cross-make @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build - -#+musl-cross-make.a87c891620b89902a411024e8b9fff8555d086e60920661673a0fa4b65f81e5b -#+gnu-make.cca39ff03bab3680d922446aaa172ca22ab0ef0697a6f456fcd10be44fbe4cfd -#+busybox.bfa6aab64960f43f8891e63f1f276808dbb257d21cdfc21ce889e6a4fd807095 +#+musl-cross-make.ba5394c0e347ba680a13da1f05c91406b6b2fe218739f86d6418d3622e98624d +#+gnu-make.63505628ae7ef34bfd526ff096c3a87a5bbc187d1d5278663520e990c1620d05 +#+busybox.60b492e1fc87ac8497f899148aa74ccc308cca4ae57c84a94b36f122cf4ed752 #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -21,7 +20,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' - # For validating the compiler printf '%s\n' 'int main(void) { return 0; }' >true.c @@ -40,7 +38,6 @@ printf '%s %s\n' >musl-cross-make/hashes/linux-6.5.4.tar.xz.sha1 \ touch musl-cross-make/sources/* - # Patch linker path for dynamic executables make -C musl-cross-make gcc-11.2.0 sed -i -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h @@ -125,6 +122,7 @@ $1!="."{exit 1} $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-", "", target); link("./command/" target) } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/musl-cross-make:bootstrap-0 b/variants/ccx-x86_64/musl-cross-make:bootstrap-0 @@ -1,5 +1,4 @@ #!/usr/bin/env pthbs-build - #@pragma:nosandbox #@pragma:nopath #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz @@ -18,7 +17,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' - # For validating the compiler printf '%s\n' 'int main(void) { return 0; }' >true.c @@ -30,7 +28,6 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* - # Patch linker path for dynamic executables make -C musl-cross-make gcc-9.4.0 sed -i -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-9.4.0/gcc/config/*/linux*.h @@ -74,6 +71,7 @@ $1!="."{exit 1} $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-", "", target); link("./command/" target) } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/musl-cross-make:bootstrap-1 b/variants/ccx-x86_64/musl-cross-make:bootstrap-1 @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build - #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.966b0010690bea89bd90cd8922ccdcac67d706fc1838b587768aff7a16329242 +#+musl-cross-make.25e1c532af9ee197ac27ce2dec1246be716b05a6a263ee72cca6ee91a07af31a #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -19,8 +18,7 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' - -bootstrap=/home/ccx/versions/musl-cross-make.966b0010690bea89bd90cd8922ccdcac67d706fc1838b587768aff7a16329242 +bootstrap=/home/ccx/versions/musl-cross-make.25e1c532af9ee197ac27ce2dec1246be716b05a6a263ee72cca6ee91a07af31a "$bootstrap/bin/x86_64-linux-musl-gcc" --version # For validating the compiler @@ -38,7 +36,6 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* - # Patch linker path for dynamic executables make -C musl-cross-make gcc-11.2.0 sed -i -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h @@ -83,6 +80,7 @@ $1!="."{exit 1} $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-", "", target); link("./command/" target) } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 - +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. + # - build script start - build_env_static() { diff --git a/variants/ccx-x86_64/netbsd-curses b/variants/ccx-x86_64/netbsd-curses @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses @@ -12,7 +11,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'netbsd-curses' - export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" @@ -21,7 +19,6 @@ export CPATH="$pthbs_build_environment/include" make -j${JOBS:-1} -l$((1+${JOBS:-1})) - cat << EOF > config.mak PREFIX=$prefix PREFIX="$prefix" diff --git a/variants/ccx-x86_64/openssl b/variants/ccx-x86_64/openssl @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe#@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. # - build script start - @@ -11,7 +11,6 @@ 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" @@ -20,13 +19,13 @@ build_env_static() { build_env_static cd openssl-3.3.3 ./config # this will fail, perl is not packaged + make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - check_static command/openssl check_static command/ocspcheck diff --git a/variants/ccx-x86_64/patch b/variants/ccx-x86_64/patch @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. @@ -74,7 +74,8 @@ check_static command/patch cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/patch"]=1} + x["./command/patch"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/patchelf:bootstrap b/variants/ccx-x86_64/patchelf:bootstrap @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build - #@pragma:nosandbox -#@pragma:nopath#@git:523f401584d9584e76c9c77004e7abeb9e6c4551:patchelf +#@pragma:nopath +#@git:523f401584d9584e76c9c77004e7abeb9e6c4551:patchelf # - build script start - @@ -54,7 +54,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'patchelf' - ./bootstrap.sh autotools_config_static . --disable-nls @@ -64,7 +63,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - check_static command/patchelf cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:. @@ -75,7 +75,8 @@ check_static command/pkgconf cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/pkgconf"]=1} + x["./command/pkgconf"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/pkgconf-pkg-config b/variants/ccx-x86_64/pkgconf-pkg-config @@ -1,7 +1,6 @@ #!/usr/bin/env pthbs-build - -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+pkgconf.56d7fa80d0c2392c4cc687d901e69c8e6ee74f9936ee00151b41d370eff8916f +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+pkgconf.48e188b1d85804b842c81f44538fc4881b0061214dc69d650f3a058b4e8b10fb mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/popt b/variants/ccx-x86_64/popt @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. diff --git a/variants/ccx-x86_64/pthbs-banginstall b/variants/ccx-x86_64/pthbs-banginstall @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall @@ -13,7 +12,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'pthbs-banginstall' - mkdir -p "${dest}/command" chmod +x pthbs-banginstall zsh -x pthbs-banginstall pthbs-banginstall "${dest}" diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 - -#+popt.955e94bac349691df856fb1c5e763a41f11c2f9bfa0a7d1bc2a60b7d18024bc9 -#+libressl.6ae71a2ea8760b1df675e5c6ca7bda0aa50743aa95ae1c9c845a99c069468878 -#+zstd.70a597602efb350f43289d7a85b6d9ddc579b1a2740b66937733776f6217ea46#@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+popt.de7bcad4919ea09329928871d9fd917f25f0a43d46a10cd3b0c754af4599e61b +#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 +#+zstd.90a7a74d0ca174c3fff868f77b2d35d292cafef51ba5f416940921188ff32212 +#@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. # - build script start - diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6 @@ -1,12 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404 -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 @@ -22,13 +21,12 @@ cd 's6' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ --disable-shared --enable-static --enable-allstatic --enable-static-libc --absolute-paths - make -j${JOBS:-1} -l$((1+${JOBS:-1})) CFLAGS=-DWANT_CLONE_NEWPID make DESTDIR="$pthbs_destdir" install diff --git a/variants/ccx-x86_64/s6-dns b/variants/ccx-x86_64/s6-dns @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404#@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns # - build script start - @@ -20,7 +20,7 @@ cd 's6-dns' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -36,8 +36,7 @@ make DESTDIR="$pthbs_destdir" install cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/s6-linux-init b/variants/ccx-x86_64/s6-linux-init @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404 -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 -#+s6.ec65ee6650aa00884dfde1ea071761104bb258a3a05382734449177574a2994b#@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c +#@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init # - build script start - @@ -22,7 +22,7 @@ cd 's6-linux-init' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -38,8 +38,7 @@ make DESTDIR="$pthbs_destdir" install cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/s6-linux-utils b/variants/ccx-x86_64/s6-linux-utils @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404#@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils # - build script start - @@ -20,7 +20,7 @@ cd 's6-linux-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -36,8 +36,7 @@ make DESTDIR="$pthbs_destdir" install cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking @@ -1,15 +1,15 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404 -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 -#+s6.ec65ee6650aa00884dfde1ea071761104bb258a3a05382734449177574a2994b -#+s6-dns.42d9cf224aeff2790069671c3539099f016337f1b1dcf2f971c8c10befa80f31 -#+libressl.6ae71a2ea8760b1df675e5c6ca7bda0aa50743aa95ae1c9c845a99c069468878#@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c +#+s6-dns.cc60cc673e7826433641ed3e2aad4efc643e1e617382dfc98a75a33afd10e138 +#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 +#@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking # - build script start - @@ -24,7 +24,7 @@ cd 's6-networking' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/s6-portable-utils b/variants/ccx-x86_64/s6-portable-utils @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404#@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils # - build script start - @@ -20,7 +20,7 @@ cd 's6-portable-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -36,8 +36,7 @@ make DESTDIR="$pthbs_destdir" install cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/s6-rc b/variants/ccx-x86_64/s6-rc @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404 -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 -#+s6.ec65ee6650aa00884dfde1ea071761104bb258a3a05382734449177574a2994b#@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c +#@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc # - build script start - @@ -22,7 +22,7 @@ cd 's6-rc' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.ff179afce49817372321f457434ee224e15a899f9ad6505b87dd5cc453eba404/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.ca6493d2e23d90bbd4514dbc550cd832fe76d62ca466eb27edd447de43537b0f/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -38,8 +38,7 @@ make DESTDIR="$pthbs_destdir" install cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/skalibs b/variants/ccx-x86_64/skalibs @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737#@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs # - build script start - @@ -11,7 +11,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'skalibs' - export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" export CXX="$pthbs_build_environment/command/x86_64-linux-musl-g++" export LD="$pthbs_build_environment/command/x86_64-linux-musl-ld" diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea -#+pthbs-banginstall.f1d99f011cc72d4de97caa40d293937a24ad834e3327a0b1a3a6771bb7ceed5a +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep @@ -35,7 +35,8 @@ cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/snap.push"]=1 - x["./command/snap.lvm2"]=1} + x["./command/snap.lvm2"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -54,6 +55,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace @@ -1,19 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 - -#+patch.09d4fde2cc449c20e50730dcb31872e9664e9b9f3909ac8b7c64185bf8b1e791 -#+libunwind.344e83466804eb1505a80a7d86fbd41814df55ec2ea442376957a9f9d2bd25aa -#@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch#@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 +#+libunwind.7c111bdb09331db1a765ca6b81e96418fc29ee6fcacf608f1ad7ca6b41e12bef +#@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch +#@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. # - build script start - - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -62,7 +61,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'strace-6.13' - patch -p1 <../strace-6.5-static.patch @@ -75,7 +73,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - check_static command/strace cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -1,21 +1,21 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+diffutils.76f3c13b49c11e721590d9b3f4dc7892e1ae498e99505af8a27902767718bf9f -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+aat.0c31e41cc29067fa4d5a46437fd131c2ddc45969b70ecf562e7ddea7f4d91fb6 -#+fileset.2e22a61d22911f22a3eecdfaef08d2b3b317410d8995e8978fa808e9e76dc225 -#+rsync.a2c600f9198beaf4bb4be2babed6ab2f0ea1e38e75cc06404ccfcd878a774fa2 -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 -#+kbd.c9c3371fcb507c2020a4a3992104642511da35d7c71871ae4ca74f0be34cba99 -#+mdevd.700bf96a56491b62f3eaf3e1550460838d3089f22a0e9dd3d28813eb97d214e1 -#+s6-linux-utils.21f2aba793feb3e2ccb9c4a444b07cb4f5584a481e5c5b13aa9d596f21845463 -#+s6-rc.a37fe0c3a290d48b0158385044bf7f6699b51ab14feef7e4b6087e9415ff2e9d -#+s6.ec65ee6650aa00884dfde1ea071761104bb258a3a05382734449177574a2994b -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea -#+system-config-scripts.a66c8493c215f8f21c67d8ee37ca77da9df676e8792b0243b66859ec0848d24a -#+logincaps.4a398684a8b537c147a65d1f7514685386c643da15105f4fa41c57a685129155#@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+diffutils.7de7d6cf0cec86d9cc6a0b8fb912f6729c86b6d0b83347c738d6c46bbfed0962 +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+aat.b4bf9a146b5cdfb5882fcee353c62b121a3237a2da7e967d53edfac6ad18f099 +#+fileset.1c1a255aa16f92cf86a8ce188828bf4c2375a3c660fa54e47c637a7ef4510592 +#+rsync.73f73fd81fa4d43d714b22e8f9045b7437c5863e6d2a095d85c07ca39483ab59 +#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+kbd.835b85cf6d602390f2bd12405c85a1f211ffa0347f62a6619ffa6553a0742e67 +#+mdevd.9eb4e080ae1f77a023a765bfe64c84969de5a2799ec28196c58a417dd0cf7a67 +#+s6-linux-utils.dccb2f978285051d60ce0bb1a7a1eaddffee03b09eb04db26fa3a32c8836d613 +#+s6-rc.5bf8666d6b8c62af9da348bfc46e6680fad8330b9d7376efd1a092f74a1658ce +#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+system-config-scripts.ad3e9037eca35543ec995ba7f47300d77edd178b9872d1b9e82ed4fce6058222 +#+logincaps.97234d9f65fd1ef50bb8a47c6f27d436f4f8c2a5cf11601a7f5cc32bd4bd7fac +#@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config # - build script start - @@ -24,7 +24,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config' - err_notfound() { printf >&2 'Executable not found for command "%s"\n' "$1" exit 1 @@ -51,8 +50,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/home/ccx/versions/env.2d49fa03b33450b97f3f38ebbff19f9d8926309935c308d52a88fa89fac1e3d1' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.5a0a68a034e3f0368b41c0a036293272f626464be51fce460f966405d988aef0' \ + 'pthbs_path_containers=/home/ccx/versions/env.16b05d60b31076d77e9b3179c7b24ab0513bc62f70558ccaf883f7195a02a1ae' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.be1e2f797fce97340d454e21024854ce6b054158fd8f5bb586e77d5ee02d8553' \ 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 @@ -1,13 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+s6.ec65ee6650aa00884dfde1ea071761104bb258a3a05382734449177574a2994b -#+s6-rc.a37fe0c3a290d48b0158385044bf7f6699b51ab14feef7e4b6087e9415ff2e9d -#+s6-portable-utils.06591b1f326e31dbb42eede040f709212f86bb891de7bf8544f70a753594b418 -#+s6-linux-init.7d29a7011644b39a13cb988fc79ac9d1ac506d966c2cff6a1e3430eb2bd6fc82 -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 -#+system-config-rc.4948e66597cd5ec031fc38272cd7df5c00c6697a80514be59795b515deb834cd +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c +#+s6-rc.5bf8666d6b8c62af9da348bfc46e6680fad8330b9d7376efd1a092f74a1658ce +#+s6-portable-utils.a20039a7da7a366a5000f8370f6273fff9abd8d4758c6117e4cab89cbc686397 +#+s6-linux-init.a6524dc0da3a64eca6605fbab5387fc23aee11641e8c78df8ff11dff7cbe2a23 +#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+system-config-rc.973bc8d4e9960860af852b490ad609d58cedbd2c5159bd346e7704a5cb979222 # - build script start - @@ -16,7 +15,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-init' - q() { # quote list of strings to be suitable for execline "s6-quote" "$@" } @@ -31,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/home/ccx/versions/system-config-rc.4948e66597cd5ec031fc38272cd7df5c00c6697a80514be59795b515deb834cd/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.973bc8d4e9960860af852b490ad609d58cedbd2c5159bd346e7704a5cb979222/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//home/ccx/versions" @@ -120,7 +118,6 @@ $(qx tail) -F -n +1 /run/uncaught-logs/current EOF s6-chmod 755 "${dest}/run-image/service/console-log-tail/run" exit $? - check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -145,7 +142,8 @@ BEGIN { x["./bin/init"]=1 x["./bin/halt"]=1 x["./bin/poweroff"]=1 - x["./bin/reboot"]=1} + x["./bin/reboot"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+s6-rc.a37fe0c3a290d48b0158385044bf7f6699b51ab14feef7e4b6087e9415ff2e9d -#+fileset.2e22a61d22911f22a3eecdfaef08d2b3b317410d8995e8978fa808e9e76dc225 -#+system-config.89344e829aa5262d7890869416a1672e598605af0a6e8d7997cbe823e457ad25 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+s6-rc.5bf8666d6b8c62af9da348bfc46e6680fad8330b9d7376efd1a092f74a1658ce +#+fileset.1c1a255aa16f92cf86a8ce188828bf4c2375a3c660fa54e47c637a7ef4510592 +#+system-config.cb4c35302d6e68937b1580241062287cfdcc869aa3cc9d2be4118c4a1e6e64ee # - build script start - @@ -14,8 +13,7 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' - -src=/home/ccx/versions/system-config.89344e829aa5262d7890869416a1672e598605af0a6e8d7997cbe823e457ad25/config/s6-rc-source +src=/home/ccx/versions/system-config.cb4c35302d6e68937b1580241062287cfdcc869aa3cc9d2be4118c4a1e6e64ee/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" @@ -23,8 +21,7 @@ mv -v s6-rc-db "$dest/config/" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/system-config-scripts b/variants/ccx-x86_64/system-config-scripts @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea -#+pthbs-banginstall.f1d99f011cc72d4de97caa40d293937a24ad834e3327a0b1a3a6771bb7ceed5a +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe # - build script start - @@ -34,7 +34,8 @@ cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/s"]=1 - x["./command/issue-gen"]=1} + x["./command/issue-gen"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -53,6 +54,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/system-config-zsh b/variants/ccx-x86_64/system-config-zsh @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh @@ -13,15 +12,13 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-zsh' - mkdir -p "$dest/zsh" mv -v zsh-functions "$dest/zsh/site-functions" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 -#+pthbs-banginstall.f1d99f011cc72d4de97caa40d293937a24ad834e3327a0b1a3a6771bb7ceed5a +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env @@ -13,7 +12,6 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' - mkdir -p "${dest}/command" chmod +x user-env pthbs-banginstall user-env "${dest}" diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -1,40 +1,40 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+diffutils.76f3c13b49c11e721590d9b3f4dc7892e1ae498e99505af8a27902767718bf9f -#+patch.09d4fde2cc449c20e50730dcb31872e9664e9b9f3909ac8b7c64185bf8b1e791 -#+flex.4b339b3e1369be8953130e9993dbdc01d1b47a1b1d3ffa62c2ab0a636768e2c3 -#+bison.a8def3acce294256a503b8950b486c91db0a48b00ffdd4dd8b86475c9e417d7d -#+rsync.a2c600f9198beaf4bb4be2babed6ab2f0ea1e38e75cc06404ccfcd878a774fa2 -#+execline.4311493c86f93deb3c4b36b0a3d9ec5631f0a4cadca56c6d752f8340c9f60c92 -#+s6.ec65ee6650aa00884dfde1ea071761104bb258a3a05382734449177574a2994b -#+s6-rc.a37fe0c3a290d48b0158385044bf7f6699b51ab14feef7e4b6087e9415ff2e9d -#+s6-portable-utils.06591b1f326e31dbb42eede040f709212f86bb891de7bf8544f70a753594b418 -#+s6-linux-utils.21f2aba793feb3e2ccb9c4a444b07cb4f5584a481e5c5b13aa9d596f21845463 -#+s6-linux-init.7d29a7011644b39a13cb988fc79ac9d1ac506d966c2cff6a1e3430eb2bd6fc82 -#+mdevd.700bf96a56491b62f3eaf3e1550460838d3089f22a0e9dd3d28813eb97d214e1 -#+s6-dns.42d9cf224aeff2790069671c3539099f016337f1b1dcf2f971c8c10befa80f31 -#+libressl.6ae71a2ea8760b1df675e5c6ca7bda0aa50743aa95ae1c9c845a99c069468878 -#+s6-networking.b269cc0de3d4d5d0475a3838d0b49f43e43d36935ca2c358a05d6dd93389a055 -#+zsh.b5067accaf1875f5cb0131b981f013ff8d656434f454b74b74b4d033fbc196ea -#+pthbs-banginstall.f1d99f011cc72d4de97caa40d293937a24ad834e3327a0b1a3a6771bb7ceed5a -#+aat.0c31e41cc29067fa4d5a46437fd131c2ddc45969b70ecf562e7ddea7f4d91fb6 -#+confz.ed5eaee438e4cc16cfc671f09e106695430e8cf41e11cf0eabbfecfeb0dab0ab -#+containers.8a33fc1d657c140072852ff30756bf17bd693ce06d995b2eda93132c4b192cf2 -#+fileset.2e22a61d22911f22a3eecdfaef08d2b3b317410d8995e8978fa808e9e76dc225 -#+logincaps.4a398684a8b537c147a65d1f7514685386c643da15105f4fa41c57a685129155 -#+snaprep.7a504c265d2999c88c0de7e0c664c6e0fc61337d25bb5e94f9b09551447f81c8 -#+curl.54d3c0fdf07c1a8259ce30defb6a615b2d209bc293f6798f72518927b22fd5ef -#+git.7e8869142b69cfece3083cfb6b44c1bb4b4ef6b8c1fb70960f4c49d3e3fae299 -#+xbps.b8a253085e59065c944723f9cd8a1261472bd9694ef8185f010d9227ec3cee41 -#+apk-tools.2c52c6f774eb9d581f5d4071ac5bbecfce3390e2516000c40aa12b2059cb82f4 -#+getent.7ae64900dba9a5bcfd9b4dcd8a85dad96769c19b9b5c5b316c21d25c562ec74b -#+getconf.0d1a3c1bfe45dcd0465497230b20dcb47b18e1f095781a477c895d330d9b15a6 -#+iconv.c78704ea54023f29c45cbefb9d49c74868dc00af42c22b23a462742a023fe8fe -#+libcap.8be85c868570d048d8335c209bb32aa78857e81909e4d330e58ba5b824eacb61 -#+applyuidgid-caps.53e5a421a1bfe10fd81cbbb3f53e8bb77bf703842f017bffab6be6d69bdeaef6 -#+ccx-utils.1a02d7ace44a130ee20eb90dd460d259c0d008dae9a55cfdfd16c1c5a340e56b -#+user-env.e3d0ef11c1d9886d1098080506d08fc15326b45399ebad9d2bf68ec2898155ca -#+strace.d3c7b4b2eee1c9ffa29d0da0e539d6f4844ee3ee04f455d46e6cbf07960fb4fe -#+mlog.937af4c7e19b2cd79179cd672911b372f65063d336aed408fd40a3e3a20286fc- \ No newline at end of file +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+diffutils.7de7d6cf0cec86d9cc6a0b8fb912f6729c86b6d0b83347c738d6c46bbfed0962 +#+patch.43095aa9a4e8ebe5f5e23985177f1ed78e1f6fd7c20c4a8e20fca1a0c042cc66 +#+flex.2cf032b0f5944cbc628a1e667f2f095bf0422c918844f5c163921579f4a5521e +#+bison.e7b17457cc09694ac840e07ceb8bc81a250e1235c1735ff77738672aef455999 +#+rsync.73f73fd81fa4d43d714b22e8f9045b7437c5863e6d2a095d85c07ca39483ab59 +#+execline.c9181abc1b5f8d16808970d503403e1f33b4cb73afb5abe2627e4323e0b3ff45 +#+s6.a66b879dc6553ef2b4f17eddbe4e94e77116b29279d0bc47247e48b950f2638c +#+s6-rc.5bf8666d6b8c62af9da348bfc46e6680fad8330b9d7376efd1a092f74a1658ce +#+s6-portable-utils.a20039a7da7a366a5000f8370f6273fff9abd8d4758c6117e4cab89cbc686397 +#+s6-linux-utils.dccb2f978285051d60ce0bb1a7a1eaddffee03b09eb04db26fa3a32c8836d613 +#+s6-linux-init.a6524dc0da3a64eca6605fbab5387fc23aee11641e8c78df8ff11dff7cbe2a23 +#+mdevd.9eb4e080ae1f77a023a765bfe64c84969de5a2799ec28196c58a417dd0cf7a67 +#+s6-dns.cc60cc673e7826433641ed3e2aad4efc643e1e617382dfc98a75a33afd10e138 +#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 +#+s6-networking.ad286bd57500a51f79ad09bf3c0984c5b8b97a2a27d3089b2b0fb0f11c117033 +#+zsh.8fb854b3005d5abb7e87c9c5cc7ab61189b42bc8a7e55de85c3c56c8916cecf2 +#+pthbs-banginstall.d5f5c0f230aa3303b55950682c43acfbacb513dacde279830e59d548e8b71ebe +#+aat.b4bf9a146b5cdfb5882fcee353c62b121a3237a2da7e967d53edfac6ad18f099 +#+confz.7096c6907e9cc6998358f5c6a41346b7cc59cc13168b0741b68ade0001a8fd77 +#+containers.d1bf556661f3e0e560cc82d13b89700d6f112c010e436d0693861cbbc3b61977 +#+fileset.1c1a255aa16f92cf86a8ce188828bf4c2375a3c660fa54e47c637a7ef4510592 +#+logincaps.97234d9f65fd1ef50bb8a47c6f27d436f4f8c2a5cf11601a7f5cc32bd4bd7fac +#+snaprep.fd1e6daf121d491db22320dcfe3b6e064a88dabb30e9ee9928bd7c0594cde7fe +#+curl.0061e2b4e63f55797ee20fa643207dc815bd54b0faa8a55276d92f334d6ed837 +#+git.582d85f2c473c8974ee778632c4389b28a265f70565c2245fb733badb3ab8ab1 +#+xbps.cfd899b2267e63867c9cd239c49374dc36a3cc0ded4b90ad6f525e567f079818 +#+apk-tools.d49d10fb5e01a7f5e1f7cbeec800e2b96ca00797e370d3aead643fe7b9233f30 +#+getent.93e754ab9d00c23421e3adb407cf8901d6013d4331f5267f6dd10173c0be1030 +#+getconf.1573dd9b2e84f540bfcfa7d53568064c1b54fb0c49755201fe76a3df979bf403 +#+iconv.9755d220925a69dbb6b79798b75afe2aa3dc77ecb991e81ffb8fd12747c8080f +#+libcap.edba12ebbc6125fa22e3ae179b50d06c360eba333b3bdf20d8c82cb3f563f132 +#+applyuidgid-caps.bfa3d7590305d3fe051d101c056822ece5038783ef3ada05761aa3a1bfcdd58f +#+ccx-utils.d7071841c5bc68c1b4b19e97755afad512ea8d0e607b182d7943c45c3e3c4229 +#+user-env.1bb4a783dfbc7e1f0f0ca0911ae2aca4091c4b869dd8ff48c2b5cd95cb0f1c94 +#+strace.8f47a6c70de766eb8c9cad6c9a2ff23e75e4ad3bf281062e457f396cedd9ea9a +#+mlog.4aacddf4a772148aea1dca6b4434b2afdd88caf58b482501dec770cce7684dfb+ \ No newline at end of file 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.6e12ffdb6e3b33ebe368254f26634a9b935a22b6b0bdeb425c799adc669f6ce3- \ No newline at end of file +#+linux-qemu-guest.29e443bec295f6d124ad3aa0ec8a113ac304470593f988acfca22e0974e441b4+ \ No newline at end of file diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+libarchive.4bb890dd63422ebbb2354a369f83fdb5ffcaaecd1b0a65ef74589cefc92b5083 -#+libressl.6ae71a2ea8760b1df675e5c6ca7bda0aa50743aa95ae1c9c845a99c069468878 -#+pkgconf-pkg-config.7e7258f89b19d6cee5343533bd64ae0929a8a28cb31347c9273e4e30939db328 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+libarchive.38000329c85525e1fb8085f1153bc50b9141730dacb8eef538fa63cf775464a5 +#+libressl.e6dc0a0819f1f22d9f71f04c31ee287e059db8c980f43532ab97fcfd6abc6a60 +#+pkgconf-pkg-config.c6e3db01553a2cc6c92422f8d60a33dcb49f60862cded670dea79029b938af22 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. + # - build script start - prefix=/home/ccx/versions/$pthbs_package @@ -34,10 +34,8 @@ find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \; --localstatedir=/var \ --enable-static - make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C include make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C lib libxbps.a - install -d "$dest/library" install -m 644 lib/libxbps.a "$dest/library" install -d "$dest/command" @@ -49,7 +47,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C data make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C data install DESTDIR="$pthbs_destdir" - check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -70,7 +67,8 @@ mv -v "$pthbs_destdir/var/db/xbps/keys" "$dest/keys/void" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/xbps-install.static"]=1} + x["./command/xbps-install.static"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -89,6 +87,7 @@ $1!="."{exit 1} $2 == "keys" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+m4.956e6a294bce56e38d80487ccf26ea991163e43a8c65c609fe149465a49223e9 - -#+netbsd-curses.21fab54a50f097f43e126f0a903996439d008b5626c0c788b2e4d06412a427a6 -#+libbsd.eda127abd4edbdf046ada29e5851a49f721a3aaebc136edda7c1251dec6f4200 -#@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config#@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+m4.b64d78b9c4ea141c0a9d06898201f06a01ec79b021055adf4b3e672c31710d06 +#+netbsd-curses.4422dee0f4fad4914f08acb2f92b5dabd342647ae55e5ff8b91a85907ffe18dd +#+libbsd.aaea717e06577badc7f693869f11f04566a3aed12596a15a4bac60b7db195f53 +#@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config +#@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. # - build script start - @@ -115,6 +115,7 @@ $1!="."{exit 1} $2 == "zsh" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-findutils.c6ca001e09767cc93bc9f2165769776e9a3654d0c333f86fa17a1a576eddd432 - -#+musl-cross-make.2a66103b64813908f9ea7999403f2842f4e476441b9f8b5e871b088b45866afe -#+gnu-make.c3725d495769c3bb874b5ae4e8633e2bf664116dbbd5b09afeabf817f1a49737 -#+busybox.9196a8fdee32cc7c6d8b3003ad6ae966b6afbc450e923ce69628e6e1241c0d1e -#+busybox-diffutils.8ca885d6bbe0c5a824bbcae49b2ae979cb3f8331267e4806ce3ad4ea33b9c9a2 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-findutils.599390c03204529689dc1f4e7cbc76d24cc877181107870a332e0e45412613f0 +#+musl-cross-make.dd391c3bb95375ba3c5c3b60a24a68462425ba4f7a5ad8203a9a6c5e73292f5c +#+gnu-make.7d0a825c3225573398b3275c42b3c8a71073690e66e0e312acef21247aacb624 +#+busybox.0b4cace673527d66880802ae9309cf900d0a9039b58a078beb4e2ab478860b07 +#+busybox-diffutils.5a6f5c1e48448a0b9e1680e64ca8882527497b8ed54bdc0e82ad0ff044e88161 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. @@ -15,7 +14,6 @@ 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" @@ -32,7 +30,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) default install \ libdir="/home/ccx/versions/$pthbs_package/library" rm -v "$pthbs_destdir//home/ccx/versions/$pthbs_package/library"/*.so* - check_static() { local exe || true exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 @@ -52,7 +49,8 @@ cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/zstd"]=1 - x["./library/libzstd.a"]=1} + x["./library/libzstd.a"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae -#+pthbs-banginstall.c7a7c7334ef8d695c6f0818379ead02487e1ccfc5be3baf48e50f2a31096e82f +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat @@ -13,7 +13,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'aat' - for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -30,14 +29,16 @@ if test -d zsh-functions; then mv -v zsh-functions "${dest}/zsh/site-functions" fi - mv -v data.awk "$pkgdir/" + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/aat"]=1 - x["./command/aat.awk"]=1} + x["./command/aat.awk"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -56,6 +57,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco @@ -14,7 +13,6 @@ 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" @@ -39,15 +37,12 @@ sed 's/^/> /' config.mk make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install - # the Makefile hardcodes 'bin' despite configure undersanding BINDIR mv "${dest}/bin" "${dest}/command" - check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -67,7 +62,8 @@ check_static command/abduco cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/abduco"]=1} + x["./command/abduco"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/acl b/variants/root-x86_64/acl @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b -#+attr.b587f0e5f6c600e0930148600b77c1038161157278f5d0a6a3bccc91e58ce504 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+attr.ad254c46ca6e415aee3acb033ca189f13568c3a285ea31b71f9da1613a922569 #@untar:-z:sha256:5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c:. diff --git a/variants/root-x86_64/alpine-keys b/variants/root-x86_64/alpine-keys @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys @@ -10,8 +10,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'alpine-keys' - - mkdir -p "${dest}/keys" mv alpine-keys/keys "${dest}/keys/alpine" @@ -40,6 +38,7 @@ $1!="."{exit 1} $2 == "keys" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+patch.a23cc33f498c9c0b5ba9c63d0004fb1462e15747c96b2459e044429a84ec6e90 -#+libressl.ec90626ce40a3a893217e9c051488e546edf2fb44b2d58e612a12582d4008e4c -#+zstd.9c9f265d4c95b43b467614745f39be4de8ee9b12d02dc377a516248c9dc0fa61 -#+pkgconf-pkg-config.91a7d8c303a14699701c81cccf9dfd946b3378c144da79ce318dfa4627757d2f +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 +#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 +#+zstd.afe7ff25aaafc3c81a21431d6fa60d8ea68c05aaae50d43d1106cb2af2606eae +#+pkgconf-pkg-config.7db40222b94aaaf29c4fd99c560d36879f964e41d462a658a30a58542d7e30a6 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools @@ -18,7 +18,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'apk-tools' - patch -p1 <../apk-tools.patch build_env_static() { @@ -59,7 +58,8 @@ find -type d -o -print | awk -F/ ' BEGIN { x["./command/apk.static"]=1 x["./library/libapk.a"]=1 - x["./library/pkgconfig/apk.pc"]=1} + x["./library/pkgconfig/apk.pc"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb -#+libcap.f777fc5b1d87a681e9e6137a6ddc284087ef31d2170084a50f5fd34fc7b7c3c3 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c +#+libcap.3a2674b04629180b1f8f8ee3b7d7133a3c45648fe2509a5c09f3fab249d7d814 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c @@ -13,7 +13,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'applyuidgid-caps' name='applyuidgid-caps' - CFLAGS="-D_GNU_SOURCE" LDFLAGS="-lskarnet -lcap" build_env_static() { diff --git a/variants/root-x86_64/argp-standalone b/variants/root-x86_64/argp-standalone @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:. #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0 diff --git a/variants/root-x86_64/attr b/variants/root-x86_64/attr @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:. @@ -64,7 +64,6 @@ LDFLAGS=--static autotools_config_static - make -j${JOBS:-1} -l$((1+${JOBS:-1})) diff --git a/variants/root-x86_64/bison b/variants/root-x86_64/bison @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b - -#+flex.d4f10cfd91781b553e6f60179e60e8fb9f497b85672923cdf8e9a3088f36080c -#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 +#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. +#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. # - build script start - @@ -72,12 +72,12 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - rm -vrf "$pthbs_destdir"/$prefix/lib/charset.alias rmdir -p "$pthbs_destdir"/$prefix/lib || true -check_static command/bisoncd "$pthbs_destdir/versions/$pthbs_package" +check_static command/bison +cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/bison"]=1 diff --git a/variants/root-x86_64/bootstrap.environment b/variants/root-x86_64/bootstrap.environment @@ -1,4 +1,4 @@ #!/usr/bin/env pthbs-build -#+busybox.e9a1c93f923b2405dc059dbbf63eb67215e6fd786aaa7d41d1125df1bd5fa5e4 -#+gnu-make.22213b9d6e08d9a389954cb2c6fbf05ec5f33d470b34485b0eec5ab487fc4baf -#+musl-cross-make.b712b4d71f139939df52c76078948fb83b0c1b728677bbb78cc52bbe67398824- \ No newline at end of file +#+busybox.575b177867cc3377d85bc687bb0d8a57ccb1341caf177904b42a9aaa0cdbd432 +#+gnu-make.65769f42a84e60386421be3588c53cbea2c2e02924eb7c459f8f9fe2c93ff60f +#+musl-cross-make.bc5c3622044466fcdca41ec6dc3e94a31b291bea73aa32c4b8c4ffb7358a238d+ \ No newline at end of file diff --git a/variants/root-x86_64/busybox b/variants/root-x86_64/busybox @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build - -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.22213b9d6e08d9a389954cb2c6fbf05ec5f33d470b34485b0eec5ab487fc4baf -#+busybox.e9a1c93f923b2405dc059dbbf63eb67215e6fd786aaa7d41d1125df1bd5fa5e4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.65769f42a84e60386421be3588c53cbea2c2e02924eb7c459f8f9fe2c93ff60f +#+busybox.575b177867cc3377d85bc687bb0d8a57ccb1341caf177904b42a9aaa0cdbd432 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab:busybox/.config diff --git a/variants/root-x86_64/busybox-diffutils b/variants/root-x86_64/busybox-diffutils @@ -1,6 +1,5 @@ #!/usr/bin/env pthbs-build - -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-findutils b/variants/root-x86_64/busybox-findutils @@ -1,6 +1,5 @@ #!/usr/bin/env pthbs-build - -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-kbd b/variants/root-x86_64/busybox-kbd @@ -1,6 +1,5 @@ #!/usr/bin/env pthbs-build - -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-login b/variants/root-x86_64/busybox-login @@ -1,6 +1,5 @@ #!/usr/bin/env pthbs-build - -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox:bootstrap b/variants/root-x86_64/busybox:bootstrap @@ -1,14 +1,13 @@ #!/usr/bin/env pthbs-build - #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.b712b4d71f139939df52c76078948fb83b0c1b728677bbb78cc52bbe67398824 -#+gnu-make.22213b9d6e08d9a389954cb2c6fbf05ec5f33d470b34485b0eec5ab487fc4baf +#+musl-cross-make.bc5c3622044466fcdca41ec6dc3e94a31b291bea73aa32c4b8c4ffb7358a238d +#+gnu-make.65769f42a84e60386421be3588c53cbea2c2e02924eb7c459f8f9fe2c93ff60f #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config -mcm=/versions/musl-cross-make.b712b4d71f139939df52c76078948fb83b0c1b728677bbb78cc52bbe67398824 -make=/versions/gnu-make.22213b9d6e08d9a389954cb2c6fbf05ec5f33d470b34485b0eec5ab487fc4baf +mcm=/versions/musl-cross-make.bc5c3622044466fcdca41ec6dc3e94a31b291bea73aa32c4b8c4ffb7358a238d +make=/versions/gnu-make.65769f42a84e60386421be3588c53cbea2c2e02924eb7c459f8f9fe2c93ff60f export PATH="$mcm/bin:$make/command:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/variants/root-x86_64/busybox:modutils b/variants/root-x86_64/busybox:modutils @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build - -#+linux.f41a069a16a33dae1a263b60777bfff478ee410e50ec8cb75c3d02f792fe2d6a -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 +#+linux.05e004ffc94ca217993ebb26f67bc5b80dfb5e1edcb7246fe97121382c5c2798 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 #@sha256:ea5d8b394f6e9c3a6cf03d6f4cd3a04db5d9209e7d25bc89aa4de5ac4cb0c141:busybox/.config #@git:887295686dbc69e5b2d530f0e6a8dbf94094ac9f:busybox @@ -13,20 +12,17 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'busybox' - export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/versions/linux.f41a069a16a33dae1a263b60777bfff478ee410e50ec8cb75c3d02f792fe2d6a" +CONFIG_DEFAULT_MODULES_DIR="/versions/linux.05e004ffc94ca217993ebb26f67bc5b80dfb5e1edcb7246fe97121382c5c2798" EOF - make V=1 CROSS_COMPILE=x86_64-linux-musl- LDFLAGS=-static HOSTLDFLAGS=-static \ HOSTCC="$CC -static" CC="$CC -static" HOSTCFLAGS=-D_GNU_SOURCE -j${JOBS:-1} - check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -52,7 +48,6 @@ done - cd "$pthbs_destdir/versions/$pthbs_package" mv .install-links.new .install-links diff --git a/variants/root-x86_64/ca-certificates-wip-donotuse b/variants/root-x86_64/ca-certificates-wip-donotuse @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+certdata2pem.6115bd3454b8949e430d65d0c86d0a9bea3825c783e598256ff2f1461af505c9 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+certdata2pem.717fb19fd2a5a27af0bba2d070e3976e8356e7741ffc8729d07ef0be2fd6ec90 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. @@ -12,11 +11,9 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'ca-certificates-20241121' - touch blacklist.txt # TODO! certdata2pem - install -d "${dest}/config/ssl/certs" for file in ./*.crt; do install -m 644 $file "${dest}/config/ssl/certs" @@ -30,7 +27,8 @@ cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./config/ssl/certs/ISRG_Root_X1.crt"]=1 - x["./config/ssl/certs/ISRG_Root_X2.crt"]=1} + x["./config/ssl/certs/ISRG_Root_X2.crt"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -49,6 +47,7 @@ $1!="."{exit 1} $2 == "config" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb -#+s6.36fe526aba41d08f6f694b82efeddb9c0bc592a58803b0a6537ca9be6ba7984a +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c +#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 #@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils @@ -15,7 +14,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'ccx-utils' - check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -61,7 +59,6 @@ do done - cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -79,7 +76,8 @@ BEGIN { x["./command/mtime_to_uuidv7"]=1 x["./command/ucspi-socksserver"]=1 x["./command/ucspi-socksserver-connected"]=1 - x["./command/ucspi-socksserver-access"]=1} + x["./command/ucspi-socksserver-access"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c @@ -11,7 +11,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'certdata2pem' name='certdata2pem' - CFLAGS="-D_GNU_SOURCE" build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" @@ -44,7 +43,8 @@ check_static "command/$name" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/certdata2pem"]=1} + x["./command/certdata2pem"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae -#+pthbs-banginstall.c7a7c7334ef8d695c6f0818379ead02487e1ccfc5be3baf48e50f2a31096e82f +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 # - build script start - @@ -33,7 +33,8 @@ fi cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/confz"]=1} + x["./command/confz"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -52,6 +53,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -1,15 +1,14 @@ #!/usr/bin/env pthbs-build - -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+busybox-login.1d03fbddba5eae3356aa599fffd06b5f0d3dc9d2478767ed22a22f1e2c104f8f -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 -#+s6.36fe526aba41d08f6f694b82efeddb9c0bc592a58803b0a6537ca9be6ba7984a -#+ccx-utils.f716b9a6637d2462df1185d6077e39c8fefe4119148a5dcea9048c413ddfcd0c -#+applyuidgid-caps.5cde852e5e330a5ef7d2f031a9b52a90d1c8ddfc02a8f35ecb8c14b0ad84b6a5 -#+easyseccomp.a2f3c15ca09d590cc4465d7caed56ceb65c1b827594737448518e8039d287770 -#+mlog.c5a1b32667cda7f8b5704b8542273f4b85a634d27331ba3effdae5e614164e97 -#+abduco.24487734cbf4c23daf65098d920a04c4e51c18f43c4d2c18e215cfb3f9b60c9a +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+busybox-login.c0cddb8b80bdb1c66c6a8dc41d985524d914e5b19fe883371763d0235e5de2e7 +#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 +#+ccx-utils.8a6cf2bc9e8fe5cb7eb99fcf5fb2aca24e21f1d980de28fb4054f7e196cff032 +#+applyuidgid-caps.7a74554cf64f149cb80fdc7caa69829b497c90c1caff248a1b3a07eb1c4d3ca1 +#+easyseccomp.5a28e31b07364f1f44076717a22f7606c762ef75d343f5ce57295b9e23bedeca +#+mlog.0bdee80b00d4018b1e3668ef9e05e2aaa3ffd00696fb1180c570aedcd4a6a863 +#+abduco.e6bfa836ce5039c063cb64afa8ce3940a8dcc194d6cae5bca8fbbf3de9a09dd2 #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp img="$pthbs_destdir/versions/$pthbs_package/container-bin-image" diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae -#+pthbs-banginstall.c7a7c7334ef8d695c6f0818379ead02487e1ccfc5be3baf48e50f2a31096e82f - -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 -#+alpine-keys.cc0bb1c546da0176f1b7ec5944fbd839abee2d7383b0cc1f46f56b0d72ca27e6 -#+apk-tools.5c35c6301fce2a74b60c62a831f7d24e2bdaae8fd16142febf8a7ffcf77dabd9 -#+xbps.996301a18f0f685e1e5f6bfd9833ab29664866c8b83af1838bd9354985304658 -#+container-bin-image.b75fc54dbfb64970dc0124fead256237822f119b3534a7c28dcb7c2b0dd1a1d4#@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 +#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+alpine-keys.48bf1534be10eaa033727aabc01b7e1d6ad571d37632f5e666a95c5b645e667f +#+apk-tools.b6ae2978c21328aef2cd7bee77918521adf924c5e6dafa2d6c1efac0aad437c6 +#+xbps.439919b3373859eccaed14cb1bdbc94948ccc1582a64025de6eb9828fd4714e5 +#+container-bin-image.a5caf82f57a03ca19230a8385dc2907b8751c102596617f33c894ee8b67cb16f +#@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers # - build script start - @@ -18,7 +18,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'containers' - for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -35,7 +34,6 @@ if test -d zsh-functions; then mv -v zsh-functions "${dest}/zsh/site-functions" fi - mkdir "${dest}/data" mv -v service_scripts container_template "${dest}/data/" printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ @@ -49,10 +47,10 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "${dest}/deps/command" -ln -sf '/versions/apk-tools.5c35c6301fce2a74b60c62a831f7d24e2bdaae8fd16142febf8a7ffcf77dabd9/command/apk.static' "${dest}/deps/command/" -ln -sf '/versions/xbps.996301a18f0f685e1e5f6bfd9833ab29664866c8b83af1838bd9354985304658/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/versions/apk-tools.b6ae2978c21328aef2cd7bee77918521adf924c5e6dafa2d6c1efac0aad437c6/command/apk.static' "${dest}/deps/command/" +ln -sf '/versions/xbps.439919b3373859eccaed14cb1bdbc94948ccc1582a64025de6eb9828fd4714e5/command/xbps-install.static' "${dest}/deps/command/" -for f in '/versions/alpine-keys.cc0bb1c546da0176f1b7ec5944fbd839abee2d7383b0cc1f46f56b0d72ca27e6'/keys/alpine/*/*; do +for f in '/versions/alpine-keys.48bf1534be10eaa033727aabc01b7e1d6ad571d37632f5e666a95c5b645e667f'/keys/alpine/*/*; do test -f "$f" d=$(basename "${f%/*}") mkdir -p "${dest}/deps/keys/alpine/$d" @@ -60,13 +58,15 @@ for f in '/versions/alpine-keys.cc0bb1c546da0176f1b7ec5944fbd839abee2d7383b0cc1f done mkdir -p "${dest}/deps/keys/void" -for f in '/versions/xbps.996301a18f0f685e1e5f6bfd9833ab29664866c8b83af1838bd9354985304658'/keys/void/*; do +for f in '/versions/xbps.439919b3373859eccaed14cb1bdbc94948ccc1582a64025de6eb9828fd4714e5'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.b75fc54dbfb64970dc0124fead256237822f119b3534a7c28dcb7c2b0dd1a1d4/container-bin-image' -test -f '/versions/container-bin-image.b75fc54dbfb64970dc0124fead256237822f119b3534a7c28dcb7c2b0dd1a1d4/container-bin-image/if' -ln -sf '/versions/container-bin-image.b75fc54dbfb64970dc0124fead256237822f119b3534a7c28dcb7c2b0dd1a1d4/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.a5caf82f57a03ca19230a8385dc2907b8751c102596617f33c894ee8b67cb16f/container-bin-image' +test -f '/versions/container-bin-image.a5caf82f57a03ca19230a8385dc2907b8751c102596617f33c894ee8b67cb16f/container-bin-image/if' +ln -sf '/versions/container-bin-image.a5caf82f57a03ca19230a8385dc2907b8751c102596617f33c894ee8b67cb16f/container-bin-image' "${dest}/deps/" + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -76,7 +76,8 @@ BEGIN { x["./command/ns_umount_script.awk"]=1 x["./command/pidns_run.py"]=1 x["./zsh/site-functions/confz_containers_init"]=1 - x["./zsh/site-functions/confz_site_containers_init"]=1} + x["./zsh/site-functions/confz_site_containers_init"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -95,6 +96,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 -#+s6.36fe526aba41d08f6f694b82efeddb9c0bc592a58803b0a6537ca9be6ba7984a -#+s6-portable-utils.fdbce5a2416da27bb7b4cfea05aba52e8c8db27b3643d90c9e406486753bb31a -#+s6-linux-utils.e47c3dd33fb202b8a2de0f986b408c530f3945cfff893cd643ba4519f587777c -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae -#+confz.be654016e9afd49abb659f110a62db7cbd495c083b5d6689ff7c1a5e713dae72 -#+containers.0b94f213d89000b98b2a6bc42911c042654e85403f09c71d75009ad16019190b -#+xbps.996301a18f0f685e1e5f6bfd9833ab29664866c8b83af1838bd9354985304658 -#+zstd.9c9f265d4c95b43b467614745f39be4de8ee9b12d02dc377a516248c9dc0fa61 -#+apk-tools.5c35c6301fce2a74b60c62a831f7d24e2bdaae8fd16142febf8a7ffcf77dabd9 -#+alpine-keys.cc0bb1c546da0176f1b7ec5944fbd839abee2d7383b0cc1f46f56b0d72ca27e6 -#+getent.67906fa621e23cf8fb4d6be708f7610122f72ac7e59a424d52257d09801c99f5 -#+fileset.72c6442a32acb200051d47e18fb90c4483b3ff87c308dacaed36d5b03deb4d8d -#+ccx-utils.f716b9a6637d2462df1185d6077e39c8fefe4119148a5dcea9048c413ddfcd0c -#+easyseccomp.a2f3c15ca09d590cc4465d7caed56ceb65c1b827594737448518e8039d287770- \ No newline at end of file +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 +#+s6-portable-utils.47861b330e2c41a239fb18461fbff57c7a6913de09f7d6be8ed478bb2590ca8f +#+s6-linux-utils.3267fe9747bb91e80ecbc74ae45688460b09ec212dae8a39e2e8aa7ebfda7570 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+confz.37863d2ec8636071b9d3cd90853d7c66d93a82ffe26af3091502a87f3d5e7b53 +#+containers.10cf2feb4247bdc7f05bdfb82c7a7f9fb553445140b9613258735e0ab610f2d1 +#+xbps.439919b3373859eccaed14cb1bdbc94948ccc1582a64025de6eb9828fd4714e5 +#+zstd.afe7ff25aaafc3c81a21431d6fa60d8ea68c05aaae50d43d1106cb2af2606eae +#+apk-tools.b6ae2978c21328aef2cd7bee77918521adf924c5e6dafa2d6c1efac0aad437c6 +#+alpine-keys.48bf1534be10eaa033727aabc01b7e1d6ad571d37632f5e666a95c5b645e667f +#+getent.0af39b5b26c83dd63917511aae3fc97fc08751558abe6852f92707dc17a4bf40 +#+fileset.6e662c8a49937222a1575d3de8b2363309b37ed74bd51559184afb3ce0266015 +#+ccx-utils.8a6cf2bc9e8fe5cb7eb99fcf5fb2aca24e21f1d980de28fb4054f7e196cff032 +#+easyseccomp.5a28e31b07364f1f44076717a22f7606c762ef75d343f5ce57295b9e23bedeca+ \ No newline at end of file diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b - -#+libressl.ec90626ce40a3a893217e9c051488e546edf2fb44b2d58e612a12582d4008e4c#@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 +#@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. # - build script start - @@ -81,15 +81,18 @@ autotools_config_static \ --without-libssh2 \ --without-libpsl \ --disable-manual + + make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - rm -r -v "$pthbs_destdir"'/versions'"/$pthbs_package/man" + + check_static command/curl cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -1,45 +1,45 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+diffutils.62d3ffdcf15d24bbaf7d3d73ee411d33abbe77ae0b845cfdd4b9d172bca71a61 -#+patch.a23cc33f498c9c0b5ba9c63d0004fb1462e15747c96b2459e044429a84ec6e90 -#+flex.d4f10cfd91781b553e6f60179e60e8fb9f497b85672923cdf8e9a3088f36080c -#+bison.407016a5daabe88cf5f124d4c04f7872d4a66640d439ca6272e858134fd573e4 -#+rsync.26ddbbebe834ea917486b9446f46faf924ff7ea81f49c061da75953d5016975b -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 -#+s6.36fe526aba41d08f6f694b82efeddb9c0bc592a58803b0a6537ca9be6ba7984a -#+s6-rc.66aaa87579aa50ce2578743ac3ee5195506be35b576f465a6c76347d87508c92 -#+s6-portable-utils.fdbce5a2416da27bb7b4cfea05aba52e8c8db27b3643d90c9e406486753bb31a -#+s6-linux-utils.e47c3dd33fb202b8a2de0f986b408c530f3945cfff893cd643ba4519f587777c -#+s6-linux-init.4ee1774e532b6a3e391908597b68337079b335beddf3c489ee18e79e3ddfda03 -#+mdevd.c3ed4a21dae1f719179cb11b59e8455147c63a5a809132e1afed36be403656af -#+s6-dns.f4a440553e5202eb84c6b57981e89d424d6c996b7ee786151b6f69a6799e3de4 -#+libressl.ec90626ce40a3a893217e9c051488e546edf2fb44b2d58e612a12582d4008e4c -#+s6-networking.33f206dd4ad7ae9b51f5c1c16b3832b9cfd598eb0fab20b5ba2fbcc53933d6ea -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae -#+pthbs-banginstall.c7a7c7334ef8d695c6f0818379ead02487e1ccfc5be3baf48e50f2a31096e82f -#+aat.535c27e05e9e1e24f05939516feecc0bbb4db0ea6372dade05a7ac47c835e195 -#+confz.be654016e9afd49abb659f110a62db7cbd495c083b5d6689ff7c1a5e713dae72 -#+containers.0b94f213d89000b98b2a6bc42911c042654e85403f09c71d75009ad16019190b -#+fileset.72c6442a32acb200051d47e18fb90c4483b3ff87c308dacaed36d5b03deb4d8d -#+logincaps.dabdb625ea4cbd5e8a7efe3460f1b8704d501b1906e9546c27459bab6ff97daa -#+snaprep.3764975a1374ee421d430ecccd0b6a97abef5e15ee052c8db6567e70681013d9 -#+curl.ccce2a71e10c51e10dc86c9908ba4fef95bc3b341c879e0b404f85f4ffe9286c -#+git.1b1d47e76c279c88699fc88b3f3a1e95770b1df05cc9cb8f676c192d421c2e4f -#+xbps.996301a18f0f685e1e5f6bfd9833ab29664866c8b83af1838bd9354985304658 -#+apk-tools.5c35c6301fce2a74b60c62a831f7d24e2bdaae8fd16142febf8a7ffcf77dabd9 -#+getent.67906fa621e23cf8fb4d6be708f7610122f72ac7e59a424d52257d09801c99f5 -#+getconf.b9a6b5312af3155a527e3c5c7c8822265ebdb505ac837344f35b2f80c3322d7e -#+iconv.54bf314954e6efc997d3f21be9a97ce90367b59661ab57981b5e8a1683255787 -#+libcap.f777fc5b1d87a681e9e6137a6ddc284087ef31d2170084a50f5fd34fc7b7c3c3 -#+applyuidgid-caps.5cde852e5e330a5ef7d2f031a9b52a90d1c8ddfc02a8f35ecb8c14b0ad84b6a5 -#+ccx-utils.f716b9a6637d2462df1185d6077e39c8fefe4119148a5dcea9048c413ddfcd0c -#+user-env.2379a9aab8e35fa4e3fa646b7b9be7541bb4c4c04c9a082c7721b4176fb3605f -#+strace.103dec81af050a0759e8e0906842af006ceff0fe5bd039f839e3006fa503372a -#+mlog.c5a1b32667cda7f8b5704b8542273f4b85a634d27331ba3effdae5e614164e97 -#+system-config.49df7e95861383aadc9e4c90f83d7659e6a2a3e715a0ecddbf50a0015ecd1841 -#+system-config-rc.ce661c2888bc973e33c004c5a2066b8ef95141e883bc103f6a60719b2eb592c8 -#+system-config-scripts.c485a4ff915c07133e6f709e33fefcb1696c68010f1daf2a0ba465f5ec2df772 -#+system-config-init.87a63238eee6c33de9a6e827155ce9622850cceefd4fbbf1cb386f31f6c591f3 -#+system-config-zsh.704b91c93d85baf0e74baafaeccc59857004d29b569ca0246dfe1d5e3487cf99- \ No newline at end of file +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+diffutils.2e5877895a6809ecb023cad32af3d596421a8f18b240885a808bdca09490de77 +#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 +#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 +#+bison.0874ec124e31d46bcb830839f339b9dad753f28f4a5870f76e88ed4d646766e6 +#+rsync.22db6b667e8faef094268871e4efd1c7fefd074b0db2ea9fbc88780853106ce7 +#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 +#+s6-rc.124d3e7a3b03971baf2e14cc88cd91357b1955f69f19fbd411476e16bfe5656d +#+s6-portable-utils.47861b330e2c41a239fb18461fbff57c7a6913de09f7d6be8ed478bb2590ca8f +#+s6-linux-utils.3267fe9747bb91e80ecbc74ae45688460b09ec212dae8a39e2e8aa7ebfda7570 +#+s6-linux-init.d63ab06d21a8cc4a5678c56a1a769094d11603171578ad8bc7cd06772189775d +#+mdevd.5637f01795442cb9da5ef88ce9ef666270e00ebccbcf8b366d9a28d5e77857cd +#+s6-dns.dd0033e6e131f9ec1c449937c9b1c9c232d61b60ec82be9f47e1b1e336690889 +#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 +#+s6-networking.af9eb9d407428d2c19d9d41872a18be611287b861ff8ac347eeb6af01ca7b095 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 +#+aat.20dac08b162245a67e629492b741fbf0d822608098090cdf1941dc9b4ae35597 +#+confz.37863d2ec8636071b9d3cd90853d7c66d93a82ffe26af3091502a87f3d5e7b53 +#+containers.10cf2feb4247bdc7f05bdfb82c7a7f9fb553445140b9613258735e0ab610f2d1 +#+fileset.6e662c8a49937222a1575d3de8b2363309b37ed74bd51559184afb3ce0266015 +#+logincaps.39e82ec4a208d3ff8d4e75f8e10d7154b66d299db4f13978faaded7957ecfb53 +#+snaprep.4741f235c2100e3518de2e9653755c87e4cc7f6668596829e6bb1e932ddc392d +#+curl.9e29d7b583bb221800bd4071a0710a06c45681d0bed5d54817b6adf3a7dd97f6 +#+git.9e4546cf110327e853beb1562ffe0dd0710e5a962fa285ddff0d8460a8b22c2a +#+xbps.439919b3373859eccaed14cb1bdbc94948ccc1582a64025de6eb9828fd4714e5 +#+apk-tools.b6ae2978c21328aef2cd7bee77918521adf924c5e6dafa2d6c1efac0aad437c6 +#+getent.0af39b5b26c83dd63917511aae3fc97fc08751558abe6852f92707dc17a4bf40 +#+getconf.31b660df2a017fa168106122353ca5a3db7fa1f81fe3dfc44bf65b717275db6e +#+iconv.edbfaa85b49793e93a9017a1783c2bde9a66f1af89603b4af16b9e820aca754f +#+libcap.3a2674b04629180b1f8f8ee3b7d7133a3c45648fe2509a5c09f3fab249d7d814 +#+applyuidgid-caps.7a74554cf64f149cb80fdc7caa69829b497c90c1caff248a1b3a07eb1c4d3ca1 +#+ccx-utils.8a6cf2bc9e8fe5cb7eb99fcf5fb2aca24e21f1d980de28fb4054f7e196cff032 +#+user-env.a42ddd75abbe51cbd88539cf8207ae32501e6fa5430bdf797b8970a14855f4af +#+strace.9de369dc2cf328c7737dd7936efe50c4f1d50835421813d2008a575b2ce88b4e +#+mlog.0bdee80b00d4018b1e3668ef9e05e2aaa3ffd00696fb1180c570aedcd4a6a863 +#+system-config.15492ab7d4db3b4327a62756c5d4aa965b8821bf1255d88393ef5a62587457f8 +#+system-config-rc.d784be950a1be2066ef6a35be339ca12cf961b32d69f5b06159e7eb5a8393250 +#+system-config-scripts.70a7cc705f2f44c94fc111ea29bd598aed790940c6a0c6ec50044753ef4877a8 +#+system-config-init.3a7fb21ce67c0ab7b1a6f11aba1495077addcabaaafda9233735665befdd95da +#+system-config-zsh.fbc38234ec3b05c54c1ec8d85f21fdd052463f3cbc54c123005e97cf8e031360+ \ No newline at end of file diff --git a/variants/root-x86_64/diffutils b/variants/root-x86_64/diffutils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp @@ -1,17 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b - -#+patch.a23cc33f498c9c0b5ba9c63d0004fb1462e15747c96b2459e044429a84ec6e90 -#+flex.d4f10cfd91781b553e6f60179e60e8fb9f497b85672923cdf8e9a3088f36080c -#+bison.407016a5daabe88cf5f124d4c04f7872d4a66640d439ca6272e858134fd573e4 -#+libseccomp.406d1465ddca70d2fa78e96d1032f662e87952cada36e8dd7531e8704f4bdda7 -#+error-standalone.7b78f0435b2b8086fa0de7ff005cc6b2ed4d65f923a9a03880272e6130d5832a -#+argp-standalone.73c6c68e8a77b7875f5183a3ac7965d4009168353483e9a8e5d0021dd9a107c9 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 +#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 +#+bison.0874ec124e31d46bcb830839f339b9dad753f28f4a5870f76e88ed4d646766e6 +#+libseccomp.61eb6183c7e6e4fc9671ed2fcf28b5a526cd92a28f419ff60fd82076f846ac57 +#+error-standalone.65426411bc5069615a2c8be644b446b3f0d40c5330b4f77921c183c59328bcc3 +#+argp-standalone.a760e52f052d81e23ea5e1faed791e7273d92fcb85169aa7b4d9cc42d020193c #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp @@ -19,7 +18,6 @@ # - build script start - - autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -48,19 +46,14 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'easyseccomp' - patch -p1 <../easyseccomp_fix_includes.patch touch Makefile.in configure - build_env_static autotools_config --enable-seccomp - make -j1 V=1 DESTDIR="$pthbs_destdir" LIBS="-lseccomp -lerror -largp" install - - check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone @@ -1,10 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:. @@ -14,7 +13,6 @@ 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" @@ -29,7 +27,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/versions/$pthbs_package \ - cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c # - build script start - @@ -19,7 +19,7 @@ cd 'execline' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb/sysdeps' \ + --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -29,10 +29,8 @@ cd 'execline' make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install - if ! test -e "${dest}/command/eltest"; then # TODO printf '%s\n' >"${dest}/command/eltest" \ @@ -41,10 +39,11 @@ if ! test -e "${dest}/command/eltest"; then chmod +x "${dest}/command/eltest" fi + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae -#+pthbs-banginstall.c7a7c7334ef8d695c6f0818379ead02487e1ccfc5be3baf48e50f2a31096e82f +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 # - build script start - @@ -35,7 +35,8 @@ find -type d -o -print | awk -F/ ' BEGIN { x["./command/fslist"]=1 x["./command/fsapply"]=1 - x["./command/fileset"]=1} + x["./command/fileset"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -54,6 +55,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/findutils b/variants/root-x86_64/findutils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:. diff --git a/variants/root-x86_64/flex b/variants/root-x86_64/flex @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. @@ -58,7 +58,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'flex-2.6.4' - export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" export LDFLAGS="--static" @@ -66,14 +65,12 @@ export LDFLAGS="--static" autotools_config_static - make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - check_static command/flex check_static command/flex++ diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae - -#@sha256:sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c # - build script start - diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae - -#@sha256:sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c # - build script start - diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git @@ -1,14 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b -#+libressl.ec90626ce40a3a893217e9c051488e546edf2fb44b2d58e612a12582d4008e4c -#+curl.ccce2a71e10c51e10dc86c9908ba4fef95bc3b341c879e0b404f85f4ffe9286c +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 +#+curl.9e29d7b583bb221800bd4071a0710a06c45681d0bed5d54817b6adf3a7dd97f6 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. @@ -18,7 +17,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'git-2.43.2' - make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" \ CPATH="$pthbs_build_environment/include" \ @@ -37,8 +35,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ V=1 all install - - check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 diff --git a/variants/root-x86_64/gnu-make b/variants/root-x86_64/gnu-make @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build - -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.22213b9d6e08d9a389954cb2c6fbf05ec5f33d470b34485b0eec5ab487fc4baf -#+busybox.e9a1c93f923b2405dc059dbbf63eb67215e6fd786aaa7d41d1125df1bd5fa5e4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.65769f42a84e60386421be3588c53cbea2c2e02924eb7c459f8f9fe2c93ff60f +#+busybox.575b177867cc3377d85bc687bb0d8a57ccb1341caf177904b42a9aaa0cdbd432 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. + # - build script start - build_env_static() { diff --git a/variants/root-x86_64/gnu-make:bootstrap b/variants/root-x86_64/gnu-make:bootstrap @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build - #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.b712b4d71f139939df52c76078948fb83b0c1b728677bbb78cc52bbe67398824 +#+musl-cross-make.bc5c3622044466fcdca41ec6dc3e94a31b291bea73aa32c4b8c4ffb7358a238d #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. + # - build script start - autotools_config() { @@ -36,7 +36,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'make-4.4.1' -mcm=/versions/musl-cross-make.b712b4d71f139939df52c76078948fb83b0c1b728677bbb78cc52bbe67398824 +mcm=/versions/musl-cross-make.bc5c3622044466fcdca41ec6dc3e94a31b291bea73aa32c4b8c4ffb7358a238d export PATH="$mcm/bin:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:. diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae - -#@sha256:sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c # - build script start - diff --git a/variants/root-x86_64/kbd b/variants/root-x86_64/kbd @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b - -#@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.#@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. +#@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. # - build script start - @@ -59,7 +59,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'kbd-2.6.4' - export LDFLAGS="--static" autotools_config_static --disable-nls --disable-vlock --disable-werror --disable-tests \ @@ -67,19 +66,15 @@ autotools_config_static --disable-nls --disable-vlock --disable-werror --disable - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install - cd ../destdir mv -v data ".$prefix/" - check_static command/loadkeys cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' 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.f41a069a16a33dae1a263b60777bfff478ee410e50ec8cb75c3d02f792fe2d6a -#+busybox.08ab9fb0fcd176256791114c9bef3a182ceba9cf34261af1009639ecaf9be36c- \ No newline at end of file +#+linux.05e004ffc94ca217993ebb26f67bc5b80dfb5e1edcb7246fe97121382c5c2798 +#+busybox.cdf151a5207a36a5dcaa29783c0e4e60f46160a895dd5cc0eff9f5744b7641df+ \ No newline at end of file diff --git a/variants/root-x86_64/libarchive b/variants/root-x86_64/libarchive @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:. @@ -58,20 +58,17 @@ dest=${pthbs_destdir%/}${prefix} cd 'libarchive-3.7.2' - export LDFLAGS=--static autotools_config_static --without-xml2 - make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - check_static command/bsdtar check_static command/bsdcpio @@ -80,7 +77,8 @@ find -type d -o -print | awk -F/ ' BEGIN { x["./command/bsdtar"]=1 x["./command/bsdcpio"]=1 - x["./library/libarchive.a"]=1} + x["./library/libarchive.a"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b - -#+libmd.5bd40af605278e41cfddeefb937f83fde7e3aa720b7a2a995501a44779fc5ae4#@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:. +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+libmd.b5502ca1cd7971309f0b8f015ca923ca749cd141aa619cd08866bc3fea038b65 +#@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:. # - build script start - diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap @@ -1,23 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+pkgconf-pkg-config.91a7d8c303a14699701c81cccf9dfd946b3378c144da79ce318dfa4627757d2f#@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+pkgconf-pkg-config.7db40222b94aaaf29c4fd99c560d36879f964e41d462a658a30a58542d7e30a6 +#@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. # - build script start - - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'libcap-2.69' - sed -i '1 s|^#!/bin/bash|#!/bin/sh|' progs/*.sh - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -26,7 +23,6 @@ build_env_static() { LDFLAGS=--static build_env_static - make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ DESTDIR="$pthbs_destdir" \ SHARED=no DYNAMIC=no LIBCSTATIC=yes \ @@ -45,7 +41,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ CAPSH_SHELL="'-DSHELL=\"$(which sh)\"'" \ LDFLAGS="$LDFLAGS" \ all install - check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b - -#+flex.d4f10cfd91781b553e6f60179e60e8fb9f497b85672923cdf8e9a3088f36080c -#+bison.407016a5daabe88cf5f124d4c04f7872d4a66640d439ca6272e858134fd573e4 -#+musl-fts.c0d7446ffc5c55cc6a2f8552c027ab23e0e26e1c866ce381974a68a7b2a2c8c1#@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 +#+bison.0874ec124e31d46bcb830839f339b9dad753f28f4a5870f76e88ed4d646766e6 +#+musl-fts.44d81e64b86b07b98577e659f7132b463318a5b823e9fb4021bbc9c6be00537b +#@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. # - build script start - diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+zstd.9c9f265d4c95b43b467614745f39be4de8ee9b12d02dc377a516248c9dc0fa61#@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+zstd.afe7ff25aaafc3c81a21431d6fa60d8ea68c05aaae50d43d1106cb2af2606eae +#@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf # - build script start - @@ -15,7 +15,6 @@ 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" diff --git a/variants/root-x86_64/libmd b/variants/root-x86_64/libmd @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:. diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b - -#+ca-certificates-wip-donotuse.0c9a94cff276582db566cf2a8bb8159f3f4bccb4c88d77c56cf02bcc7d68dc92 -#@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c#@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+ca-certificates-wip-donotuse.1189a43ba876b13b39b7c458d478642cf7b22643d3bc614970a6d424b8002eb0 +#@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c +#@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. # - build script start - @@ -67,13 +67,11 @@ autotools_config_static --with-openssldir="$prefix/config/ssl" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - cd .. gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto -cp -vs '/versions/ca-certificates-wip-donotuse.0c9a94cff276582db566cf2a8bb8159f3f4bccb4c88d77c56cf02bcc7d68dc92/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/versions/ca-certificates-wip-donotuse.1189a43ba876b13b39b7c458d478642cf7b22643d3bc614970a6d424b8002eb0/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" ./c_rehash "$pthbs_destdir/$prefix/config/ssl/certs/" cd "$pthbs_destdir/$prefix/config/ssl/" mv cert.pem libressl-cert.pem diff --git a/variants/root-x86_64/libretls b/variants/root-x86_64/libretls @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-z:sha256:3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5:. @@ -64,7 +64,6 @@ export LDFLAGS="--static" autotools_config_static - make -j${JOBS:-1} -l$((1+${JOBS:-1})) diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp @@ -1,13 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b - -#+pkgconf-pkg-config.91a7d8c303a14699701c81cccf9dfd946b3378c144da79ce318dfa4627757d2f -#+gperf.e1ea26bd60f8dbdfb26531529e4ae63acdd9a2fe2f412dfaef84b91b7057eed9 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+pkgconf-pkg-config.7db40222b94aaaf29c4fd99c560d36879f964e41d462a658a30a58542d7e30a6 +#+gperf.3d2985af9b04d9f74187af47b0719704a6211ee03ff357da514278165d84f6f4 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:. @@ -67,7 +66,6 @@ export LDFLAGS="--static" autotools_config_static - make -j${JOBS:-1} -l$((1+${JOBS:-1})) diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:. diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+findutils.8fedb4959eba7b07d6f623fff993dfea3015bbcad30311c66d777593239b204c -#+diffutils.62d3ffdcf15d24bbaf7d3d73ee411d33abbe77ae0b845cfdd4b9d172bca71a61 -#+patch.a23cc33f498c9c0b5ba9c63d0004fb1462e15747c96b2459e044429a84ec6e90 -#+flex.d4f10cfd91781b553e6f60179e60e8fb9f497b85672923cdf8e9a3088f36080c -#+bison.407016a5daabe88cf5f124d4c04f7872d4a66640d439ca6272e858134fd573e4 -#+rsync.26ddbbebe834ea917486b9446f46faf924ff7ea81f49c061da75953d5016975b -#+zstd.9c9f265d4c95b43b467614745f39be4de8ee9b12d02dc377a516248c9dc0fa61 -#+libelf.8dadbdd6b43ed08a88d4a6ce4990b00b76a2c0b5be717d6037a3f0c6eb449f55 -#+pkgconf-pkg-config.91a7d8c303a14699701c81cccf9dfd946b3378c144da79ce318dfa4627757d2f +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+findutils.6a815ac1b6d3973c196cb0ade4afcbac0671ca5d5468ba8848028f8f3c45ced0 +#+diffutils.2e5877895a6809ecb023cad32af3d596421a8f18b240885a808bdca09490de77 +#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 +#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 +#+bison.0874ec124e31d46bcb830839f339b9dad753f28f4a5870f76e88ed4d646766e6 +#+rsync.22db6b667e8faef094268871e4efd1c7fefd074b0db2ea9fbc88780853106ce7 +#+zstd.afe7ff25aaafc3c81a21431d6fa60d8ea68c05aaae50d43d1106cb2af2606eae +#+libelf.1d8be3f25eb73521b829c2515f8f4dc31c54adfcd03e6cbacf4df217fb81cc04 +#+pkgconf-pkg-config.7db40222b94aaaf29c4fd99c560d36879f964e41d462a658a30a58542d7e30a6 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config @@ -91,6 +91,7 @@ function mod_path(s) { return s } $2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+findutils.8fedb4959eba7b07d6f623fff993dfea3015bbcad30311c66d777593239b204c -#+diffutils.62d3ffdcf15d24bbaf7d3d73ee411d33abbe77ae0b845cfdd4b9d172bca71a61 -#+patch.a23cc33f498c9c0b5ba9c63d0004fb1462e15747c96b2459e044429a84ec6e90 -#+flex.d4f10cfd91781b553e6f60179e60e8fb9f497b85672923cdf8e9a3088f36080c -#+bison.407016a5daabe88cf5f124d4c04f7872d4a66640d439ca6272e858134fd573e4 -#+rsync.26ddbbebe834ea917486b9446f46faf924ff7ea81f49c061da75953d5016975b -#+zstd.9c9f265d4c95b43b467614745f39be4de8ee9b12d02dc377a516248c9dc0fa61 -#+libelf.8dadbdd6b43ed08a88d4a6ce4990b00b76a2c0b5be717d6037a3f0c6eb449f55 -#+pkgconf-pkg-config.91a7d8c303a14699701c81cccf9dfd946b3378c144da79ce318dfa4627757d2f +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+findutils.6a815ac1b6d3973c196cb0ade4afcbac0671ca5d5468ba8848028f8f3c45ced0 +#+diffutils.2e5877895a6809ecb023cad32af3d596421a8f18b240885a808bdca09490de77 +#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 +#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 +#+bison.0874ec124e31d46bcb830839f339b9dad753f28f4a5870f76e88ed4d646766e6 +#+rsync.22db6b667e8faef094268871e4efd1c7fefd074b0db2ea9fbc88780853106ce7 +#+zstd.afe7ff25aaafc3c81a21431d6fa60d8ea68c05aaae50d43d1106cb2af2606eae +#+libelf.1d8be3f25eb73521b829c2515f8f4dc31c54adfcd03e6cbacf4df217fb81cc04 +#+pkgconf-pkg-config.7db40222b94aaaf29c4fd99c560d36879f964e41d462a658a30a58542d7e30a6 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch @@ -89,6 +89,7 @@ function mod_path(s) { return s } $2 == "kernel" && $3 == "lib" && $4 == "modules" { link(mod_path($0)); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae -#+pthbs-banginstall.c7a7c7334ef8d695c6f0818379ead02487e1ccfc5be3baf48e50f2a31096e82f +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 +#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+ccx-utils.8a6cf2bc9e8fe5cb7eb99fcf5fb2aca24e21f1d980de28fb4054f7e196cff032 -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+ccx-utils.f716b9a6637d2462df1185d6077e39c8fefe4119148a5dcea9048c413ddfcd0c # - build script start - @@ -15,7 +15,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'logincaps' - for d in bin sbin command; do if test -d "$d"; then pthbs-banginstall "$d"/* "${dest}" @@ -32,8 +31,6 @@ if test -d zsh-functions; then mv -v zsh-functions "${dest}/zsh/site-functions" fi - - pthbs-banginstall etc/loginexec "${dest}" cat >"${dest}/command/login-keepenv" <<EOF @@ -47,7 +44,6 @@ sh build_static.sh -DLOGINEXEC_PATH="\"$prefix/command/loginexec\"" cp -a login "${dest}/command/" - check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -70,7 +66,8 @@ BEGIN { x["./command/login-keepenv"]=1 x["./command/login.capability.brightness"]=1 x["./command/login.capability.service"]=1 - x["./command/logincaps"]=1} + x["./command/logincaps"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -89,6 +86,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/m4 b/variants/root-x86_64/m4 @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build - -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b#@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. # - build script start - diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts @@ -1,17 +1,16 @@ #!/usr/bin/env pthbs-build - -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae -#+pthbs-banginstall.c7a7c7334ef8d695c6f0818379ead02487e1ccfc5be3baf48e50f2a31096e82f +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts + # - build script start - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'mdev-scripts' - mkdir -p "$dest" for script in persistent-storage dvbdev ptpdev usbdev; do mv -v $script mdev-hook-$script @@ -21,8 +20,7 @@ done cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 + +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 # - build script start - @@ -20,7 +20,7 @@ cd 'mdevd' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb/sysdeps' \ + --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -36,8 +36,7 @@ make DESTDIR="$pthbs_destdir" install cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 -#+s6.36fe526aba41d08f6f694b82efeddb9c0bc592a58803b0a6537ca9be6ba7984a -#+mdev-scripts.0f3f10e11fdd943f539eb62e4c017a79e09006e4a163c7cb052bc879dd877b3f -#+mdevd.c3ed4a21dae1f719179cb11b59e8455147c63a5a809132e1afed36be403656af- \ No newline at end of file +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 +#+mdev-scripts.3f42457c32a69a26e9132c7c1857d386f9c3213dc79884f5426644fafe8b4d0a +#+mdevd.5637f01795442cb9da5ef88ce9ef666270e00ebccbcf8b366d9a28d5e77857cd+ \ No newline at end of file diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa#@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog # - build script start - @@ -12,7 +12,6 @@ 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" @@ -22,12 +21,10 @@ 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 exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -46,7 +43,8 @@ check_static "command/$name" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/mlog"]=1} + x["./command/mlog"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/musl-cross-make b/variants/root-x86_64/musl-cross-make @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build - -#+musl-cross-make.b712b4d71f139939df52c76078948fb83b0c1b728677bbb78cc52bbe67398824 -#+gnu-make.22213b9d6e08d9a389954cb2c6fbf05ec5f33d470b34485b0eec5ab487fc4baf -#+busybox.e9a1c93f923b2405dc059dbbf63eb67215e6fd786aaa7d41d1125df1bd5fa5e4 +#+musl-cross-make.bc5c3622044466fcdca41ec6dc3e94a31b291bea73aa32c4b8c4ffb7358a238d +#+gnu-make.65769f42a84e60386421be3588c53cbea2c2e02924eb7c459f8f9fe2c93ff60f +#+busybox.575b177867cc3377d85bc687bb0d8a57ccb1341caf177904b42a9aaa0cdbd432 #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -21,7 +20,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' - # For validating the compiler printf '%s\n' 'int main(void) { return 0; }' >true.c @@ -40,7 +38,6 @@ printf '%s %s\n' >musl-cross-make/hashes/linux-6.5.4.tar.xz.sha1 \ touch musl-cross-make/sources/* - # Patch linker path for dynamic executables make -C musl-cross-make gcc-11.2.0 sed -i -e 's|/lib/ld-musl-|/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h @@ -125,6 +122,7 @@ $1!="."{exit 1} $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-", "", target); link("./command/" target) } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/musl-cross-make:bootstrap-0 b/variants/root-x86_64/musl-cross-make:bootstrap-0 @@ -1,5 +1,4 @@ #!/usr/bin/env pthbs-build - #@pragma:nosandbox #@pragma:nopath #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz @@ -18,7 +17,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' - # For validating the compiler printf '%s\n' 'int main(void) { return 0; }' >true.c @@ -30,7 +28,6 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* - # Patch linker path for dynamic executables make -C musl-cross-make gcc-9.4.0 sed -i -e 's|/lib/ld-musl-|/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-9.4.0/gcc/config/*/linux*.h @@ -74,6 +71,7 @@ $1!="."{exit 1} $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-", "", target); link("./command/" target) } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/musl-cross-make:bootstrap-1 b/variants/root-x86_64/musl-cross-make:bootstrap-1 @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build - #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.85669d3a16d4a690d104b001973d7f84c3b8fc359cf8a6cf619506a81679defb +#+musl-cross-make.5841ff0b059b96fd54f14b2e228eab2035b50bb18b92ea9d8036f28ca5f14392 #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -19,8 +18,7 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' - -bootstrap=/versions/musl-cross-make.85669d3a16d4a690d104b001973d7f84c3b8fc359cf8a6cf619506a81679defb +bootstrap=/versions/musl-cross-make.5841ff0b059b96fd54f14b2e228eab2035b50bb18b92ea9d8036f28ca5f14392 "$bootstrap/bin/x86_64-linux-musl-gcc" --version # For validating the compiler @@ -38,7 +36,6 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* - # Patch linker path for dynamic executables make -C musl-cross-make gcc-11.2.0 sed -i -e 's|/lib/ld-musl-|/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h @@ -83,6 +80,7 @@ $1!="."{exit 1} $2 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-", "", target); link("./command/" target) } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b - +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. + # - build script start - build_env_static() { diff --git a/variants/root-x86_64/netbsd-curses b/variants/root-x86_64/netbsd-curses @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses @@ -12,7 +11,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'netbsd-curses' - export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" @@ -21,7 +19,6 @@ export CPATH="$pthbs_build_environment/include" make -j${JOBS:-1} -l$((1+${JOBS:-1})) - cat << EOF > config.mak PREFIX=$prefix PREFIX="$prefix" diff --git a/variants/root-x86_64/openssl b/variants/root-x86_64/openssl @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae#@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. # - build script start - @@ -11,7 +11,6 @@ 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" @@ -20,13 +19,13 @@ build_env_static() { build_env_static cd openssl-3.3.3 ./config # this will fail, perl is not packaged + make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - check_static command/openssl check_static command/ocspcheck diff --git a/variants/root-x86_64/patch b/variants/root-x86_64/patch @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. @@ -74,7 +74,8 @@ check_static command/patch cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/patch"]=1} + x["./command/patch"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/patchelf:bootstrap b/variants/root-x86_64/patchelf:bootstrap @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build - #@pragma:nosandbox -#@pragma:nopath#@git:523f401584d9584e76c9c77004e7abeb9e6c4551:patchelf +#@pragma:nopath +#@git:523f401584d9584e76c9c77004e7abeb9e6c4551:patchelf # - build script start - @@ -54,7 +54,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'patchelf' - ./bootstrap.sh autotools_config_static . --disable-nls @@ -64,7 +63,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - check_static command/patchelf cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:. @@ -75,7 +75,8 @@ check_static command/pkgconf cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/pkgconf"]=1} + x["./command/pkgconf"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/pkgconf-pkg-config b/variants/root-x86_64/pkgconf-pkg-config @@ -1,7 +1,6 @@ #!/usr/bin/env pthbs-build - -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+pkgconf.772033ed6e93510ef1538055fbabf981101e74b8b54ef5f7b3b2a91c7e9e2008 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+pkgconf.c34f5725b4dc0f199f67c260706e4f7237486001a6bccf4a6a79efa2b1118193 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/popt b/variants/root-x86_64/popt @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. diff --git a/variants/root-x86_64/pthbs-banginstall b/variants/root-x86_64/pthbs-banginstall @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall @@ -13,7 +12,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'pthbs-banginstall' - mkdir -p "${dest}/command" chmod +x pthbs-banginstall zsh -x pthbs-banginstall pthbs-banginstall "${dest}" diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b - -#+popt.8f93435748a11c9eb23b40bbc69b3c332665afa399579a28abf5ecb5daf4975b -#+libressl.ec90626ce40a3a893217e9c051488e546edf2fb44b2d58e612a12582d4008e4c -#+zstd.9c9f265d4c95b43b467614745f39be4de8ee9b12d02dc377a516248c9dc0fa61#@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+popt.897db5cf333d2ed9418409a159e890ef0d88e33db408c96628bb1ed1ad593b76 +#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 +#+zstd.afe7ff25aaafc3c81a21431d6fa60d8ea68c05aaae50d43d1106cb2af2606eae +#@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. # - build script start - diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6 @@ -1,12 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 @@ -22,13 +21,12 @@ cd 's6' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb/sysdeps' \ + --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ --disable-shared --enable-static --enable-allstatic --enable-static-libc --absolute-paths - make -j${JOBS:-1} -l$((1+${JOBS:-1})) CFLAGS=-DWANT_CLONE_NEWPID make DESTDIR="$pthbs_destdir" install diff --git a/variants/root-x86_64/s6-dns b/variants/root-x86_64/s6-dns @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb#@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns # - build script start - @@ -20,7 +20,7 @@ cd 's6-dns' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb/sysdeps' \ + --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -36,8 +36,7 @@ make DESTDIR="$pthbs_destdir" install cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/s6-linux-init b/variants/root-x86_64/s6-linux-init @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 -#+s6.36fe526aba41d08f6f694b82efeddb9c0bc592a58803b0a6537ca9be6ba7984a#@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 +#@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init # - build script start - @@ -22,7 +22,7 @@ cd 's6-linux-init' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb/sysdeps' \ + --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -38,8 +38,7 @@ make DESTDIR="$pthbs_destdir" install cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/s6-linux-utils b/variants/root-x86_64/s6-linux-utils @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb#@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils # - build script start - @@ -20,7 +20,7 @@ cd 's6-linux-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb/sysdeps' \ + --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -36,8 +36,7 @@ make DESTDIR="$pthbs_destdir" install cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking @@ -1,15 +1,15 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 -#+s6.36fe526aba41d08f6f694b82efeddb9c0bc592a58803b0a6537ca9be6ba7984a -#+s6-dns.f4a440553e5202eb84c6b57981e89d424d6c996b7ee786151b6f69a6799e3de4 -#+libressl.ec90626ce40a3a893217e9c051488e546edf2fb44b2d58e612a12582d4008e4c#@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 +#+s6-dns.dd0033e6e131f9ec1c449937c9b1c9c232d61b60ec82be9f47e1b1e336690889 +#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 +#@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking # - build script start - @@ -24,7 +24,7 @@ cd 's6-networking' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb/sysdeps' \ + --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/s6-portable-utils b/variants/root-x86_64/s6-portable-utils @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb#@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils # - build script start - @@ -20,7 +20,7 @@ cd 's6-portable-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb/sysdeps' \ + --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -36,8 +36,7 @@ make DESTDIR="$pthbs_destdir" install cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/s6-rc b/variants/root-x86_64/s6-rc @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 -#+s6.36fe526aba41d08f6f694b82efeddb9c0bc592a58803b0a6537ca9be6ba7984a#@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 +#@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc # - build script start - @@ -22,7 +22,7 @@ cd 's6-rc' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2ec5a9065c15984068b62cdb53b1dbb9f02e024043c4e2a119f5fe47fa94dbdb/sysdeps' \ + --with-sysdeps='/versions/skalibs.2bfee7508aa740f059f28b30d87f93bb98c01176c26faeabad967bf46509355c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -38,8 +38,7 @@ make DESTDIR="$pthbs_destdir" install cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/skalibs b/variants/root-x86_64/skalibs @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa#@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs # - build script start - @@ -11,7 +11,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'skalibs' - export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" export CXX="$pthbs_build_environment/command/x86_64-linux-musl-g++" export LD="$pthbs_build_environment/command/x86_64-linux-musl-ld" diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae -#+pthbs-banginstall.c7a7c7334ef8d695c6f0818379ead02487e1ccfc5be3baf48e50f2a31096e82f +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep @@ -35,7 +35,8 @@ cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/snap.push"]=1 - x["./command/snap.lvm2"]=1} + x["./command/snap.lvm2"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -54,6 +55,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace @@ -1,19 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b - -#+patch.a23cc33f498c9c0b5ba9c63d0004fb1462e15747c96b2459e044429a84ec6e90 -#+libunwind.a662ea069f8fe4644d70fa92c65f6902646d95ef7e34f0da592c9e1ed7f5ea95 -#@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch#@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 +#+libunwind.2086d4b5362b021de30a906b5b4ba5595425bacb94d1ee2d8b348f65bb2cf49c +#@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch +#@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. # - build script start - - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -62,7 +61,6 @@ dest=${pthbs_destdir%/}${prefix} cd 'strace-6.13' - patch -p1 <../strace-6.5-static.patch @@ -75,7 +73,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install - check_static command/strace cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -1,21 +1,21 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+diffutils.62d3ffdcf15d24bbaf7d3d73ee411d33abbe77ae0b845cfdd4b9d172bca71a61 -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+aat.535c27e05e9e1e24f05939516feecc0bbb4db0ea6372dade05a7ac47c835e195 -#+fileset.72c6442a32acb200051d47e18fb90c4483b3ff87c308dacaed36d5b03deb4d8d -#+rsync.26ddbbebe834ea917486b9446f46faf924ff7ea81f49c061da75953d5016975b -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 -#+kbd.3f21cf8fcc31e133834358ffe400cda99e9f397a87d3a6dc6faf9795afba70f0 -#+mdevd.c3ed4a21dae1f719179cb11b59e8455147c63a5a809132e1afed36be403656af -#+s6-linux-utils.e47c3dd33fb202b8a2de0f986b408c530f3945cfff893cd643ba4519f587777c -#+s6-rc.66aaa87579aa50ce2578743ac3ee5195506be35b576f465a6c76347d87508c92 -#+s6.36fe526aba41d08f6f694b82efeddb9c0bc592a58803b0a6537ca9be6ba7984a -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae -#+system-config-scripts.c485a4ff915c07133e6f709e33fefcb1696c68010f1daf2a0ba465f5ec2df772 -#+logincaps.dabdb625ea4cbd5e8a7efe3460f1b8704d501b1906e9546c27459bab6ff97daa#@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+diffutils.2e5877895a6809ecb023cad32af3d596421a8f18b240885a808bdca09490de77 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+aat.20dac08b162245a67e629492b741fbf0d822608098090cdf1941dc9b4ae35597 +#+fileset.6e662c8a49937222a1575d3de8b2363309b37ed74bd51559184afb3ce0266015 +#+rsync.22db6b667e8faef094268871e4efd1c7fefd074b0db2ea9fbc88780853106ce7 +#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+kbd.39c0f8afcfb985bea3e602ba3cb7ac002d41c33c5b1e3466eda1543527aaaa72 +#+mdevd.5637f01795442cb9da5ef88ce9ef666270e00ebccbcf8b366d9a28d5e77857cd +#+s6-linux-utils.3267fe9747bb91e80ecbc74ae45688460b09ec212dae8a39e2e8aa7ebfda7570 +#+s6-rc.124d3e7a3b03971baf2e14cc88cd91357b1955f69f19fbd411476e16bfe5656d +#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+system-config-scripts.70a7cc705f2f44c94fc111ea29bd598aed790940c6a0c6ec50044753ef4877a8 +#+logincaps.39e82ec4a208d3ff8d4e75f8e10d7154b66d299db4f13978faaded7957ecfb53 +#@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config # - build script start - @@ -24,7 +24,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config' - err_notfound() { printf >&2 'Executable not found for command "%s"\n' "$1" exit 1 @@ -51,8 +50,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.59d54af1ac457e7e1ef1cdb780606e417c1e525d09b8745faca765e0eb316b19' \ - 'pthbs_path_mdevd=/versions/env.4fec31bd78d95dc626ccdde4ae5196fc6b1386e2c76d9e27207128e634f8b16e' \ + 'pthbs_path_containers=/versions/env.c195da6a7dae1e7da65d394643c0e73a30bbe60cf9aca6a970d6e8713ef079fc' \ + 'pthbs_path_mdevd=/versions/env.a45bd218cfd51dcfb7a32294c7a75318da16ea32e181145bbeb688af51416404' \ 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 @@ -1,13 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+s6.36fe526aba41d08f6f694b82efeddb9c0bc592a58803b0a6537ca9be6ba7984a -#+s6-rc.66aaa87579aa50ce2578743ac3ee5195506be35b576f465a6c76347d87508c92 -#+s6-portable-utils.fdbce5a2416da27bb7b4cfea05aba52e8c8db27b3643d90c9e406486753bb31a -#+s6-linux-init.4ee1774e532b6a3e391908597b68337079b335beddf3c489ee18e79e3ddfda03 -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 -#+system-config-rc.ce661c2888bc973e33c004c5a2066b8ef95141e883bc103f6a60719b2eb592c8 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 +#+s6-rc.124d3e7a3b03971baf2e14cc88cd91357b1955f69f19fbd411476e16bfe5656d +#+s6-portable-utils.47861b330e2c41a239fb18461fbff57c7a6913de09f7d6be8ed478bb2590ca8f +#+s6-linux-init.d63ab06d21a8cc4a5678c56a1a769094d11603171578ad8bc7cd06772189775d +#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+system-config-rc.d784be950a1be2066ef6a35be339ca12cf961b32d69f5b06159e7eb5a8393250 # - build script start - @@ -16,7 +15,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-init' - q() { # quote list of strings to be suitable for execline "s6-quote" "$@" } @@ -31,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/versions/system-config-rc.ce661c2888bc973e33c004c5a2066b8ef95141e883bc103f6a60719b2eb592c8/config/s6-rc-db +s6rcdb=/versions/system-config-rc.d784be950a1be2066ef6a35be339ca12cf961b32d69f5b06159e7eb5a8393250/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//versions" @@ -120,7 +118,6 @@ $(qx tail) -F -n +1 /run/uncaught-logs/current EOF s6-chmod 755 "${dest}/run-image/service/console-log-tail/run" exit $? - check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -145,7 +142,8 @@ BEGIN { x["./bin/init"]=1 x["./bin/halt"]=1 x["./bin/poweroff"]=1 - x["./bin/reboot"]=1} + x["./bin/reboot"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+s6-rc.66aaa87579aa50ce2578743ac3ee5195506be35b576f465a6c76347d87508c92 -#+fileset.72c6442a32acb200051d47e18fb90c4483b3ff87c308dacaed36d5b03deb4d8d -#+system-config.49df7e95861383aadc9e4c90f83d7659e6a2a3e715a0ecddbf50a0015ecd1841 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+s6-rc.124d3e7a3b03971baf2e14cc88cd91357b1955f69f19fbd411476e16bfe5656d +#+fileset.6e662c8a49937222a1575d3de8b2363309b37ed74bd51559184afb3ce0266015 +#+system-config.15492ab7d4db3b4327a62756c5d4aa965b8821bf1255d88393ef5a62587457f8 # - build script start - @@ -14,8 +13,7 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' - -src=/versions/system-config.49df7e95861383aadc9e4c90f83d7659e6a2a3e715a0ecddbf50a0015ecd1841/config/s6-rc-source +src=/versions/system-config.15492ab7d4db3b4327a62756c5d4aa965b8821bf1255d88393ef5a62587457f8/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" @@ -23,8 +21,7 @@ mv -v s6-rc-db "$dest/config/" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/system-config-scripts b/variants/root-x86_64/system-config-scripts @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae -#+pthbs-banginstall.c7a7c7334ef8d695c6f0818379ead02487e1ccfc5be3baf48e50f2a31096e82f +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 # - build script start - @@ -34,7 +34,8 @@ cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/s"]=1 - x["./command/issue-gen"]=1} + x["./command/issue-gen"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -53,6 +54,7 @@ $1!="."{exit 1} $2 == "vimfiles" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/system-config-zsh b/variants/root-x86_64/system-config-zsh @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh @@ -13,15 +12,13 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'system-config-zsh' - mkdir -p "$dest/zsh" mv -v zsh-functions "$dest/zsh/site-functions" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' -BEGIN { -} +BEGIN {} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 -#+pthbs-banginstall.c7a7c7334ef8d695c6f0818379ead02487e1ccfc5be3baf48e50f2a31096e82f +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env @@ -13,7 +12,6 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' - mkdir -p "${dest}/command" chmod +x user-env pthbs-banginstall user-env "${dest}" diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -1,40 +1,40 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+diffutils.62d3ffdcf15d24bbaf7d3d73ee411d33abbe77ae0b845cfdd4b9d172bca71a61 -#+patch.a23cc33f498c9c0b5ba9c63d0004fb1462e15747c96b2459e044429a84ec6e90 -#+flex.d4f10cfd91781b553e6f60179e60e8fb9f497b85672923cdf8e9a3088f36080c -#+bison.407016a5daabe88cf5f124d4c04f7872d4a66640d439ca6272e858134fd573e4 -#+rsync.26ddbbebe834ea917486b9446f46faf924ff7ea81f49c061da75953d5016975b -#+execline.c84bc80c6da843a4052f2c7aaf25747c85a5e586190bcc9999f109e989730ac3 -#+s6.36fe526aba41d08f6f694b82efeddb9c0bc592a58803b0a6537ca9be6ba7984a -#+s6-rc.66aaa87579aa50ce2578743ac3ee5195506be35b576f465a6c76347d87508c92 -#+s6-portable-utils.fdbce5a2416da27bb7b4cfea05aba52e8c8db27b3643d90c9e406486753bb31a -#+s6-linux-utils.e47c3dd33fb202b8a2de0f986b408c530f3945cfff893cd643ba4519f587777c -#+s6-linux-init.4ee1774e532b6a3e391908597b68337079b335beddf3c489ee18e79e3ddfda03 -#+mdevd.c3ed4a21dae1f719179cb11b59e8455147c63a5a809132e1afed36be403656af -#+s6-dns.f4a440553e5202eb84c6b57981e89d424d6c996b7ee786151b6f69a6799e3de4 -#+libressl.ec90626ce40a3a893217e9c051488e546edf2fb44b2d58e612a12582d4008e4c -#+s6-networking.33f206dd4ad7ae9b51f5c1c16b3832b9cfd598eb0fab20b5ba2fbcc53933d6ea -#+zsh.923ba75a2fead820e55f050d262250b2a81935999b947986f7ceb73272675dae -#+pthbs-banginstall.c7a7c7334ef8d695c6f0818379ead02487e1ccfc5be3baf48e50f2a31096e82f -#+aat.535c27e05e9e1e24f05939516feecc0bbb4db0ea6372dade05a7ac47c835e195 -#+confz.be654016e9afd49abb659f110a62db7cbd495c083b5d6689ff7c1a5e713dae72 -#+containers.0b94f213d89000b98b2a6bc42911c042654e85403f09c71d75009ad16019190b -#+fileset.72c6442a32acb200051d47e18fb90c4483b3ff87c308dacaed36d5b03deb4d8d -#+logincaps.dabdb625ea4cbd5e8a7efe3460f1b8704d501b1906e9546c27459bab6ff97daa -#+snaprep.3764975a1374ee421d430ecccd0b6a97abef5e15ee052c8db6567e70681013d9 -#+curl.ccce2a71e10c51e10dc86c9908ba4fef95bc3b341c879e0b404f85f4ffe9286c -#+git.1b1d47e76c279c88699fc88b3f3a1e95770b1df05cc9cb8f676c192d421c2e4f -#+xbps.996301a18f0f685e1e5f6bfd9833ab29664866c8b83af1838bd9354985304658 -#+apk-tools.5c35c6301fce2a74b60c62a831f7d24e2bdaae8fd16142febf8a7ffcf77dabd9 -#+getent.67906fa621e23cf8fb4d6be708f7610122f72ac7e59a424d52257d09801c99f5 -#+getconf.b9a6b5312af3155a527e3c5c7c8822265ebdb505ac837344f35b2f80c3322d7e -#+iconv.54bf314954e6efc997d3f21be9a97ce90367b59661ab57981b5e8a1683255787 -#+libcap.f777fc5b1d87a681e9e6137a6ddc284087ef31d2170084a50f5fd34fc7b7c3c3 -#+applyuidgid-caps.5cde852e5e330a5ef7d2f031a9b52a90d1c8ddfc02a8f35ecb8c14b0ad84b6a5 -#+ccx-utils.f716b9a6637d2462df1185d6077e39c8fefe4119148a5dcea9048c413ddfcd0c -#+user-env.2379a9aab8e35fa4e3fa646b7b9be7541bb4c4c04c9a082c7721b4176fb3605f -#+strace.103dec81af050a0759e8e0906842af006ceff0fe5bd039f839e3006fa503372a -#+mlog.c5a1b32667cda7f8b5704b8542273f4b85a634d27331ba3effdae5e614164e97- \ No newline at end of file +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+diffutils.2e5877895a6809ecb023cad32af3d596421a8f18b240885a808bdca09490de77 +#+patch.20c93b5192b6c9b1a263eaef2d7a2488b0671b071af44ee4afffc80800211024 +#+flex.66b91d058f1ced7d447d65faf4fd255bb7e8b9de5d692ddd38e529eb16282dc4 +#+bison.0874ec124e31d46bcb830839f339b9dad753f28f4a5870f76e88ed4d646766e6 +#+rsync.22db6b667e8faef094268871e4efd1c7fefd074b0db2ea9fbc88780853106ce7 +#+execline.0aa58cda7290a730c3bba87899369f9bdbf9508bc0d52e473d1b5c9d2b0c6d74 +#+s6.2625c19de8e96e0531ad378397ff0cbf7a98de9e0d5d5ec340ae8be31a7ea767 +#+s6-rc.124d3e7a3b03971baf2e14cc88cd91357b1955f69f19fbd411476e16bfe5656d +#+s6-portable-utils.47861b330e2c41a239fb18461fbff57c7a6913de09f7d6be8ed478bb2590ca8f +#+s6-linux-utils.3267fe9747bb91e80ecbc74ae45688460b09ec212dae8a39e2e8aa7ebfda7570 +#+s6-linux-init.d63ab06d21a8cc4a5678c56a1a769094d11603171578ad8bc7cd06772189775d +#+mdevd.5637f01795442cb9da5ef88ce9ef666270e00ebccbcf8b366d9a28d5e77857cd +#+s6-dns.dd0033e6e131f9ec1c449937c9b1c9c232d61b60ec82be9f47e1b1e336690889 +#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 +#+s6-networking.af9eb9d407428d2c19d9d41872a18be611287b861ff8ac347eeb6af01ca7b095 +#+zsh.90d02e23edb15c149c9fd3ab922b83dbe59da297e952f1700f13b7546ad19bc3 +#+pthbs-banginstall.328f774df097a376e365f15795f643b7d4f30bcb8774044349606d1296ac0d83 +#+aat.20dac08b162245a67e629492b741fbf0d822608098090cdf1941dc9b4ae35597 +#+confz.37863d2ec8636071b9d3cd90853d7c66d93a82ffe26af3091502a87f3d5e7b53 +#+containers.10cf2feb4247bdc7f05bdfb82c7a7f9fb553445140b9613258735e0ab610f2d1 +#+fileset.6e662c8a49937222a1575d3de8b2363309b37ed74bd51559184afb3ce0266015 +#+logincaps.39e82ec4a208d3ff8d4e75f8e10d7154b66d299db4f13978faaded7957ecfb53 +#+snaprep.4741f235c2100e3518de2e9653755c87e4cc7f6668596829e6bb1e932ddc392d +#+curl.9e29d7b583bb221800bd4071a0710a06c45681d0bed5d54817b6adf3a7dd97f6 +#+git.9e4546cf110327e853beb1562ffe0dd0710e5a962fa285ddff0d8460a8b22c2a +#+xbps.439919b3373859eccaed14cb1bdbc94948ccc1582a64025de6eb9828fd4714e5 +#+apk-tools.b6ae2978c21328aef2cd7bee77918521adf924c5e6dafa2d6c1efac0aad437c6 +#+getent.0af39b5b26c83dd63917511aae3fc97fc08751558abe6852f92707dc17a4bf40 +#+getconf.31b660df2a017fa168106122353ca5a3db7fa1f81fe3dfc44bf65b717275db6e +#+iconv.edbfaa85b49793e93a9017a1783c2bde9a66f1af89603b4af16b9e820aca754f +#+libcap.3a2674b04629180b1f8f8ee3b7d7133a3c45648fe2509a5c09f3fab249d7d814 +#+applyuidgid-caps.7a74554cf64f149cb80fdc7caa69829b497c90c1caff248a1b3a07eb1c4d3ca1 +#+ccx-utils.8a6cf2bc9e8fe5cb7eb99fcf5fb2aca24e21f1d980de28fb4054f7e196cff032 +#+user-env.a42ddd75abbe51cbd88539cf8207ae32501e6fa5430bdf797b8970a14855f4af +#+strace.9de369dc2cf328c7737dd7936efe50c4f1d50835421813d2008a575b2ce88b4e +#+mlog.0bdee80b00d4018b1e3668ef9e05e2aaa3ffd00696fb1180c570aedcd4a6a863+ \ No newline at end of file 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.b60c8bcca9f2361a50dca816d41a78dd9acb19d95c177c1d219b2ba0de5b1706- \ No newline at end of file +#+linux-qemu-guest.1f8590fb42cc4f609b1140836e71e07aa935c6d0d364e828d4da7f2f7914c083+ \ No newline at end of file diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+libarchive.de6967d9cb36a3373fc02e939af69d6e6867a748d421e728f3421e211174c730 -#+libressl.ec90626ce40a3a893217e9c051488e546edf2fb44b2d58e612a12582d4008e4c -#+pkgconf-pkg-config.91a7d8c303a14699701c81cccf9dfd946b3378c144da79ce318dfa4627757d2f +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+libarchive.a424734746ae093adadfb4066210629a77530d88fc5bbdce484ed7862488b7b3 +#+libressl.4dd5a0442931ccd09ae2db85e169991cd8cda58b97997deda0a6e90b4756ec35 +#+pkgconf-pkg-config.7db40222b94aaaf29c4fd99c560d36879f964e41d462a658a30a58542d7e30a6 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. + # - build script start - prefix=/versions/$pthbs_package @@ -34,10 +34,8 @@ find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \; --localstatedir=/var \ --enable-static - make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C include make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C lib libxbps.a - install -d "$dest/library" install -m 644 lib/libxbps.a "$dest/library" install -d "$dest/command" @@ -49,7 +47,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C data make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C data install DESTDIR="$pthbs_destdir" - check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -70,7 +67,8 @@ mv -v "$pthbs_destdir/var/db/xbps/keys" "$dest/keys/void" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { - x["./command/xbps-install.static"]=1} + x["./command/xbps-install.static"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -89,6 +87,7 @@ $1!="."{exit 1} $2 == "keys" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+m4.952a4007900f44ccf2af375b0ec77b0283630315c7faad1791f5f2ecce69e80b - -#+netbsd-curses.5b9b637d316907c00eed6baf6789694e4f52e8f798691add5a6938b688b43295 -#+libbsd.ce066f890be545b747e0224d8b56770398a4cea3a53a67b24d549aa972512cde -#@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config#@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+m4.1166cb27fdb958eb02ffcc3bec956ee283faf4d437569432a1f61bdd816dedb3 +#+netbsd-curses.f0931fe02af08cb8313d462f2c3129975f2319abc5fb7d6136c5c7cec818aab3 +#+libbsd.99cb797aa241ce57d13c56a2995ce51a0473c93e36cf1cb1c044dfd02b07552c +#@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config +#@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. # - build script start - @@ -115,6 +115,7 @@ $1!="."{exit 1} $2 == "zsh" { link($0); next } + $2 == "config" { link($0); next } $2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-findutils.168da895c0ca4974982bb5df19f39adc12b74d12a46bd62b0548a2b3b2c7fd3b - -#+musl-cross-make.395b3b6c5a75c79c8678ee8207c0e50f4f714247c97525c2386aac8646d527ae -#+gnu-make.3922a3ab9befb6ca95106c23ce41354d7ba04bb840619b6b9057a5d5359be9aa -#+busybox.6c977bc88990c4c5dd065ff30747fea1e281ab593d9afc5897352d20499f2945 -#+busybox-diffutils.4f9f9a3dfd33fe372f0f1bc3caa3b99fb77c70aa4eb56ca95d539be8e3a348da +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-findutils.3c56e027e00250f87bca32e96b6992a67729ea94875f1205df1067734a1c8fc1 +#+musl-cross-make.6454e25ad9f77166ee63c97b545eb18fab3bfa51c6a1ccf40ae3fea11b2f3d08 +#+gnu-make.820fff4d6e6e576fd6d273d0451b44aa604d22027b4eedfb0149d666fa17c999 +#+busybox.94110972ed4234b11c96cae43edcc5ba8ccf7f400dbb4b587cdaf84760a928a8 +#+busybox-diffutils.300f6727c9a9c04cfffea289a659cd079f702a3f7904d65308b07c0d1baa83f4 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. @@ -15,7 +14,6 @@ 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" @@ -32,7 +30,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) default install \ libdir="/versions/$pthbs_package/library" rm -v "$pthbs_destdir//versions/$pthbs_package/library"/*.so* - check_static() { local exe || true exe=$pthbs_destdir'/versions'/$pthbs_package/$1 @@ -52,7 +49,8 @@ cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/zstd"]=1 - x["./library/libzstd.a"]=1} + x["./library/libzstd.a"]=1 +} function r1(s) { sub("^[.]/[^/]*", ".", s)