mrrl

Minimal Reliable Reproducible Linux
git clone https://ccx.te2000.cz/git/mrrl
Log | Files | Refs | Submodules | README

commit fdcabba07237a9c968cb896df2e54a06cd8825ca
parent 71305c904dc35553d912a78964e2e1a49cbc5c61
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Thu,  9 Oct 2025 22:38:50 +0000

Regenerate packages

Diffstat:
Mcommitlist.sha1 | 2++
Mtemplates/generic | 28+++++++++++++++-------------
Mtemplates/pkg/attr | 4++--
Mtemplates/pkg/bison | 4++--
Rtemplates/pkg/busybox-modutils -> templates/pkg/busybox:modutils | 0
Mtemplates/pkg/getconf | 3+++
Mtemplates/pkg/getent | 4++--
Mtemplates/pkg/gnu-make | 4++--
Mtemplates/pkg/gnu-make:bootstrap | 4++--
Mtemplates/pkg/iconv | 3+++
Mtemplates/pkg/kernel.environment | 2+-
Mtemplates/pkg/logincaps | 2+-
Mtemplates/pkg/system-config-init | 3+--
Mtemplates/pkg/system-config-rc | 1-
Mtemplates/pkg/user-env | 3++-
Mtemplates/pkg/zsh | 2+-
Mtemplates/scriptsetup | 7+------
Mtemplates/single_static_c | 16++++++++--------
Mvariants/ccx-x86_64/aat | 36++++++++++++++++++++++++------------
Mvariants/ccx-x86_64/abduco | 66+++++++++++++++++++++++++++++++++++++++++++++---------------------
Mvariants/ccx-x86_64/acl | 77++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/ccx-x86_64/alpine-keys | 29+++++++++++++++++++----------
Mvariants/ccx-x86_64/apk-tools | 77++++++++++++++++++++++++++++++++++++++++++++---------------------------------
Mvariants/ccx-x86_64/applyuidgid-caps | 67++++++++++++++++++++++++++++++++++++++++++-------------------------
Mvariants/ccx-x86_64/argp-standalone | 75++++++++++++++++++++++++++++-----------------------------------------------
Mvariants/ccx-x86_64/attr | 75+++++++++++++++++++++++++++++++++++++++++++++------------------------------
Mvariants/ccx-x86_64/bison | 83++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/ccx-x86_64/bootstrap.environment | 8++++----
Mvariants/ccx-x86_64/busybox | 13+++++++------
Mvariants/ccx-x86_64/busybox-diffutils | 2+-
Mvariants/ccx-x86_64/busybox-findutils | 2+-
Mvariants/ccx-x86_64/busybox-kbd | 2+-
Mvariants/ccx-x86_64/busybox-login | 2+-
Dvariants/ccx-x86_64/busybox-modutils | 28----------------------------
Mvariants/ccx-x86_64/busybox:bootstrap | 11+++++------
Avariants/ccx-x86_64/busybox:modutils | 58++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mvariants/ccx-x86_64/ca-certificates-wip-donotuse | 37++++++++++++++++++++++---------------
Mvariants/ccx-x86_64/ccx-utils | 43++++++++++++++++++++++++++-----------------
Mvariants/ccx-x86_64/certdata2pem | 61++++++++++++++++++++++++++++++++++++++-----------------------
Mvariants/ccx-x86_64/confz | 36+++++++++++++++++++++++-------------
Mvariants/ccx-x86_64/container-bin-image | 20++++++++++----------
Mvariants/ccx-x86_64/containers | 76++++++++++++++++++++++++++++++++++++++++++++--------------------------------
Mvariants/ccx-x86_64/containers.environment | 36++++++++++++++++++------------------
Mvariants/ccx-x86_64/curl | 79++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
Mvariants/ccx-x86_64/default.environment | 90++++++++++++++++++++++++++++++++++++++++----------------------------------------
Mvariants/ccx-x86_64/diffutils | 77++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/ccx-x86_64/easyseccomp | 82+++++++++++++++++++++++++++++++++++++++++++------------------------------------
Mvariants/ccx-x86_64/error-standalone | 28++++++++++++++++++++++------
Mvariants/ccx-x86_64/execline | 36++++++++++++++++++++++++++----------
Mvariants/ccx-x86_64/fileset | 36+++++++++++++++++++++++-------------
Mvariants/ccx-x86_64/findutils | 68+++++++++++++++++++++++++++++++-------------------------------------
Mvariants/ccx-x86_64/flex | 80++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/ccx-x86_64/getconf | 62++++++++++++++++++++++++++++++++++++++------------------------
Mvariants/ccx-x86_64/getent | 62++++++++++++++++++++++++++++++++++++++------------------------
Mvariants/ccx-x86_64/git | 57++++++++++++++++++++++++++++++++++++---------------------
Mvariants/ccx-x86_64/gnu-make | 69+++++++++++++++++++++++++++++++++++++++++----------------------------
Mvariants/ccx-x86_64/gnu-make:bootstrap | 55++++++++++++++++++++++++-------------------------------
Mvariants/ccx-x86_64/gperf | 73+++++++++++++++++++++++++++++++++++++++++++------------------------------
Mvariants/ccx-x86_64/iconv | 62++++++++++++++++++++++++++++++++++++++------------------------
Mvariants/ccx-x86_64/kbd | 83++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/ccx-x86_64/kernel.environment | 5+++--
Mvariants/ccx-x86_64/libarchive | 78+++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/ccx-x86_64/libbsd | 76++++++++++++++++++++++++++++++++++++++++++++++------------------------------
Mvariants/ccx-x86_64/libcap | 66+++++++++++++++++++++++++++++++++++++-----------------------------
Mvariants/ccx-x86_64/libcgroup | 81+++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
Mvariants/ccx-x86_64/libelf | 31++++++++++++++++++++++---------
Mvariants/ccx-x86_64/libmd | 74+++++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mvariants/ccx-x86_64/libressl | 85++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
Mvariants/ccx-x86_64/libretls | 74+++++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mvariants/ccx-x86_64/libseccomp | 81++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/ccx-x86_64/libunwind | 74++++++++++++++++++++++++++++++++++++++++++++------------------------------
Mvariants/ccx-x86_64/linux | 61+++++++++++++++++++++++++++++++++++++++----------------------
Mvariants/ccx-x86_64/linux-qemu-guest | 61+++++++++++++++++++++++++++++++++++++++----------------------
Mvariants/ccx-x86_64/logincaps | 69++++++++++++++++++++++++++++++++++++++++++++++++---------------------
Mvariants/ccx-x86_64/m4 | 73+++++++++++++++++++++++++++++++++++++++++++------------------------------
Mvariants/ccx-x86_64/mdev-scripts | 23++++++++++++-----------
Mvariants/ccx-x86_64/mdevd | 33++++++++++++++++++++++++---------
Mvariants/ccx-x86_64/mdevd.environment | 12++++++------
Mvariants/ccx-x86_64/mlog | 55++++++++++++++++++++++++++++++++-----------------------
Mvariants/ccx-x86_64/musl-cross-make | 26++++++++++++++++++--------
Mvariants/ccx-x86_64/musl-cross-make:bootstrap-0 | 16++++++++++++++--
Mvariants/ccx-x86_64/musl-cross-make:bootstrap-1 | 21+++++++++++++++++----
Mvariants/ccx-x86_64/musl-fts | 72+++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mvariants/ccx-x86_64/netbsd-curses | 28++++++++++++++++++++++------
Mvariants/ccx-x86_64/openssl | 28+++++++++++++++++++++++-----
Mvariants/ccx-x86_64/patch | 77++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/ccx-x86_64/patchelf:bootstrap | 64++++++++++++++++++++++++++++++++++++++--------------------------
Mvariants/ccx-x86_64/pkgconf | 74++++++++++++++++++++++++++++++++++++++++++++------------------------------
Mvariants/ccx-x86_64/pkgconf-pkg-config | 4++--
Mvariants/ccx-x86_64/popt | 74+++++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mvariants/ccx-x86_64/pthbs-banginstall | 25++++++++++++++++++++-----
Mvariants/ccx-x86_64/rsync | 83+++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
Mvariants/ccx-x86_64/s6 | 34++++++++++++++++++++++++----------
Mvariants/ccx-x86_64/s6-dns | 28++++++++++++++++++++++------
Mvariants/ccx-x86_64/s6-linux-init | 32++++++++++++++++++++++++--------
Mvariants/ccx-x86_64/s6-linux-utils | 28++++++++++++++++++++++------
Mvariants/ccx-x86_64/s6-networking | 36++++++++++++++++++++++++++----------
Mvariants/ccx-x86_64/s6-portable-utils | 28++++++++++++++++++++++------
Mvariants/ccx-x86_64/s6-rc | 32++++++++++++++++++++++++--------
Mvariants/ccx-x86_64/skalibs | 26+++++++++++++++++++-------
Mvariants/ccx-x86_64/snaprep | 35+++++++++++++++++++++++------------
Mvariants/ccx-x86_64/strace | 85+++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
Mvariants/ccx-x86_64/system-config | 62+++++++++++++++++++++++++++++++++++---------------------------
Mvariants/ccx-x86_64/system-config-init | 84+++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
Mvariants/ccx-x86_64/system-config-rc | 35+++++++++++++++++++++--------------
Mvariants/ccx-x86_64/system-config-scripts | 36+++++++++++++++++++++++-------------
Mvariants/ccx-x86_64/system-config-zsh | 26+++++++++++++++-----------
Mvariants/ccx-x86_64/user-env | 27+++++++++++++++++++++------
Mvariants/ccx-x86_64/userspace.environment | 80++++++++++++++++++++++++++++++++++++++++----------------------------------------
Mvariants/ccx-x86_64/vm.environment | 4++--
Mvariants/ccx-x86_64/xbps | 102+++++++++++++++++++++++++++----------------------------------------------------
Mvariants/ccx-x86_64/zsh | 98+++++++++++++++++++++++++++++++++++++++++++------------------------------------
Mvariants/ccx-x86_64/zstd | 55+++++++++++++++++++++++++++++++++++--------------------
Mvariants/root-x86_64/aat | 36++++++++++++++++++++++++------------
Mvariants/root-x86_64/abduco | 66+++++++++++++++++++++++++++++++++++++++++++++---------------------
Mvariants/root-x86_64/acl | 77++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/root-x86_64/alpine-keys | 29+++++++++++++++++++----------
Mvariants/root-x86_64/apk-tools | 77++++++++++++++++++++++++++++++++++++++++++++---------------------------------
Mvariants/root-x86_64/applyuidgid-caps | 67++++++++++++++++++++++++++++++++++++++++++-------------------------
Mvariants/root-x86_64/argp-standalone | 75++++++++++++++++++++++++++++-----------------------------------------------
Mvariants/root-x86_64/attr | 75+++++++++++++++++++++++++++++++++++++++++++++------------------------------
Mvariants/root-x86_64/bison | 83++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/root-x86_64/bootstrap.environment | 8++++----
Mvariants/root-x86_64/busybox | 13+++++++------
Mvariants/root-x86_64/busybox-diffutils | 2+-
Mvariants/root-x86_64/busybox-findutils | 2+-
Mvariants/root-x86_64/busybox-kbd | 2+-
Mvariants/root-x86_64/busybox-login | 2+-
Dvariants/root-x86_64/busybox-modutils | 28----------------------------
Mvariants/root-x86_64/busybox:bootstrap | 11+++++------
Avariants/root-x86_64/busybox:modutils | 58++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mvariants/root-x86_64/ca-certificates-wip-donotuse | 37++++++++++++++++++++++---------------
Mvariants/root-x86_64/ccx-utils | 43++++++++++++++++++++++++++-----------------
Mvariants/root-x86_64/certdata2pem | 61++++++++++++++++++++++++++++++++++++++-----------------------
Mvariants/root-x86_64/confz | 36+++++++++++++++++++++++-------------
Mvariants/root-x86_64/container-bin-image | 20++++++++++----------
Mvariants/root-x86_64/containers | 76++++++++++++++++++++++++++++++++++++++++++++--------------------------------
Mvariants/root-x86_64/containers.environment | 36++++++++++++++++++------------------
Mvariants/root-x86_64/curl | 79++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
Mvariants/root-x86_64/default.environment | 90++++++++++++++++++++++++++++++++++++++++----------------------------------------
Mvariants/root-x86_64/diffutils | 77++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/root-x86_64/easyseccomp | 82+++++++++++++++++++++++++++++++++++++++++++------------------------------------
Mvariants/root-x86_64/error-standalone | 28++++++++++++++++++++++------
Mvariants/root-x86_64/execline | 36++++++++++++++++++++++++++----------
Mvariants/root-x86_64/fileset | 36+++++++++++++++++++++++-------------
Mvariants/root-x86_64/findutils | 68+++++++++++++++++++++++++++++++-------------------------------------
Mvariants/root-x86_64/flex | 80++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/root-x86_64/getconf | 62++++++++++++++++++++++++++++++++++++++------------------------
Mvariants/root-x86_64/getent | 62++++++++++++++++++++++++++++++++++++++------------------------
Mvariants/root-x86_64/git | 57++++++++++++++++++++++++++++++++++++---------------------
Mvariants/root-x86_64/gnu-make | 69+++++++++++++++++++++++++++++++++++++++++----------------------------
Mvariants/root-x86_64/gnu-make:bootstrap | 55++++++++++++++++++++++++-------------------------------
Mvariants/root-x86_64/gperf | 73+++++++++++++++++++++++++++++++++++++++++++------------------------------
Mvariants/root-x86_64/iconv | 62++++++++++++++++++++++++++++++++++++++------------------------
Mvariants/root-x86_64/kbd | 83++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/root-x86_64/kernel.environment | 5+++--
Mvariants/root-x86_64/libarchive | 78+++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/root-x86_64/libbsd | 76++++++++++++++++++++++++++++++++++++++++++++++------------------------------
Mvariants/root-x86_64/libcap | 66+++++++++++++++++++++++++++++++++++++-----------------------------
Mvariants/root-x86_64/libcgroup | 81+++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
Mvariants/root-x86_64/libelf | 31++++++++++++++++++++++---------
Mvariants/root-x86_64/libmd | 74+++++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mvariants/root-x86_64/libressl | 85++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
Mvariants/root-x86_64/libretls | 74+++++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mvariants/root-x86_64/libseccomp | 81++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/root-x86_64/libunwind | 74++++++++++++++++++++++++++++++++++++++++++++------------------------------
Mvariants/root-x86_64/linux | 61+++++++++++++++++++++++++++++++++++++++----------------------
Mvariants/root-x86_64/linux-qemu-guest | 61+++++++++++++++++++++++++++++++++++++++----------------------
Mvariants/root-x86_64/logincaps | 69++++++++++++++++++++++++++++++++++++++++++++++++---------------------
Mvariants/root-x86_64/m4 | 73+++++++++++++++++++++++++++++++++++++++++++------------------------------
Mvariants/root-x86_64/mdev-scripts | 23++++++++++++-----------
Mvariants/root-x86_64/mdevd | 33++++++++++++++++++++++++---------
Mvariants/root-x86_64/mdevd.environment | 12++++++------
Mvariants/root-x86_64/mlog | 55++++++++++++++++++++++++++++++++-----------------------
Mvariants/root-x86_64/musl-cross-make | 26++++++++++++++++++--------
Mvariants/root-x86_64/musl-cross-make:bootstrap-0 | 16++++++++++++++--
Mvariants/root-x86_64/musl-cross-make:bootstrap-1 | 21+++++++++++++++++----
Mvariants/root-x86_64/musl-fts | 72+++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mvariants/root-x86_64/netbsd-curses | 28++++++++++++++++++++++------
Mvariants/root-x86_64/openssl | 28+++++++++++++++++++++++-----
Mvariants/root-x86_64/patch | 77++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mvariants/root-x86_64/patchelf:bootstrap | 64++++++++++++++++++++++++++++++++++++++--------------------------
Mvariants/root-x86_64/pkgconf | 74++++++++++++++++++++++++++++++++++++++++++++------------------------------
Mvariants/root-x86_64/pkgconf-pkg-config | 4++--
Mvariants/root-x86_64/popt | 74+++++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mvariants/root-x86_64/pthbs-banginstall | 25++++++++++++++++++++-----
Mvariants/root-x86_64/rsync | 83+++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
Mvariants/root-x86_64/s6 | 34++++++++++++++++++++++++----------
Mvariants/root-x86_64/s6-dns | 28++++++++++++++++++++++------
Mvariants/root-x86_64/s6-linux-init | 32++++++++++++++++++++++++--------
Mvariants/root-x86_64/s6-linux-utils | 28++++++++++++++++++++++------
Mvariants/root-x86_64/s6-networking | 36++++++++++++++++++++++++++----------
Mvariants/root-x86_64/s6-portable-utils | 28++++++++++++++++++++++------
Mvariants/root-x86_64/s6-rc | 32++++++++++++++++++++++++--------
Mvariants/root-x86_64/skalibs | 26+++++++++++++++++++-------
Mvariants/root-x86_64/snaprep | 35+++++++++++++++++++++++------------
Mvariants/root-x86_64/strace | 85+++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
Mvariants/root-x86_64/system-config | 62+++++++++++++++++++++++++++++++++++---------------------------
Mvariants/root-x86_64/system-config-init | 84+++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
Mvariants/root-x86_64/system-config-rc | 35+++++++++++++++++++++--------------
Mvariants/root-x86_64/system-config-scripts | 36+++++++++++++++++++++++-------------
Mvariants/root-x86_64/system-config-zsh | 26+++++++++++++++-----------
Mvariants/root-x86_64/user-env | 27+++++++++++++++++++++------
Mvariants/root-x86_64/userspace.environment | 80++++++++++++++++++++++++++++++++++++++++----------------------------------------
Mvariants/root-x86_64/vm.environment | 4++--
Mvariants/root-x86_64/xbps | 102+++++++++++++++++++++++++++----------------------------------------------------
Mvariants/root-x86_64/zsh | 98+++++++++++++++++++++++++++++++++++++++++++------------------------------------
Mvariants/root-x86_64/zstd | 55+++++++++++++++++++++++++++++++++++--------------------
208 files changed, 5846 insertions(+), 3838 deletions(-)

diff --git a/commitlist.sha1 b/commitlist.sha1 @@ -199,6 +199,7 @@ ff3a1071a3188dbaf62b6e67681e46291c2fbfb9 sources/apk-tools 1ecfe811fe2f70380170ef7d820e8150054e88ca sources/busybox 1fb759908f0cc38fd0b763fb7908eef515f4af33 sources/busybox 2122888f787dad139661575f9d54813e59285177 sources/busybox +2639f3bc72ac2f03af7ccc825429ccb2fce99a16 sources/busybox 267b925bb46d53472d28e88edc7d837c5918612b sources/busybox 28dd64a0e1a9cffcde7799f2849b66c0e16bb9cc sources/busybox 2a1571bfa003233470140a17be4ae4f0239f5a24 sources/busybox @@ -348,6 +349,7 @@ e9f8b2f830bf0273d0d51f56d24da84b955e0df5 sources/busybox ed058016bf8fc98271de2e58bfb650de9e9d304d sources/busybox ef800e5441185585986f9b7aaf39010a926fbd5f sources/busybox f5234398ef3010b68468cafe3e2ea89b2bb08a17 sources/busybox +f5e1bf966b19ea1821f00a8c9ecd7774598689b4 sources/busybox f7ae2cbc036beb76ba0b121ed9b0b64598bdf125 sources/busybox f99811908419608e3ab81393d0177cc456101e4b sources/busybox fb957125d8aa83c9df6e54292327983a51ee7ffd sources/busybox diff --git a/templates/generic b/templates/generic @@ -1,16 +1,17 @@ {% extends "base" %} {%- block source_deps %} -{% if pkg_source == "git" -%} -#@git:{{submodule.current[name]}}:{{name}} +{% if pkg_source is undefined -%} +{% elif pkg_source == "git" -%} +#@git:{{submodule.current[shortname]}}:{{shortname}} {% elif pkg_source == "tar" -%} -#@untar::{{downloads[name + "-" + assertion(pkg_version) + "." + pkg_source]}}:. -{% if pkg_source == "tar.gz" -%} -#@untar:-z:{{downloads[name + "-" + assertion(pkg_version) + "." + pkg_source]}}:. +#@untar::{{downloads[shortname + "-" + assertion(pkg_version) + "." + pkg_source]}}:. +{% elif pkg_source == "tar.gz" -%} +#@untar:-z:{{downloads[shortname + "-" + assertion(pkg_version) + "." + pkg_source]}}:. {% elif pkg_source == "tar.bz2" -%} -#@untar:-j:{{downloads[name + "-" + assertion(pkg_version) + "." + pkg_source]}}:. +#@untar:-j:{{downloads[shortname + "-" + assertion(pkg_version) + "." + pkg_source]}}:. {% elif pkg_source == "tar.xz" -%} -#@untar:-J:{{downloads[name + "-" + assertion(pkg_version) + "." + pkg_source]}}:. -{% elif pkg_source -%} +#@untar:-J:{{downloads[shortname + "-" + assertion(pkg_version) + "." + pkg_source]}}:. +{% else -%} {{ value_error(pkg_source) }} {% endif -%} {%- endblock %} @@ -18,11 +19,12 @@ {%- block prepare %} prefix={{versions}}/$pthbs_package dest=${pthbs_destdir%/}${prefix} -{% if src_dir -%} -{% elif pkg_version -%} -cd '{{name}}-{{pkg_version}}' +{% if src_dir is defined -%} +cd '{{src_dir}}' +{% elif pkg_version is defined -%} +cd '{{shortname}}-{{pkg_version}}' {% else -%} -cd '{{name}}' +cd '{{shortname}}' {% endif -%} {% endblock %} @@ -42,4 +44,4 @@ make DESTDIR="$pthbs_destdir" install {% endblock %} {%- block finish %} {% endblock %} -{% endblock %} +{%- endblock %} diff --git a/templates/pkg/attr b/templates/pkg/attr @@ -1,5 +1,5 @@ -{%- pkg_version="2.5.2" -%} -{%- pkg_source="tar.gz" -%} +{%- set pkg_version="2.5.2" -%} +{%- set pkg_source="tar.gz" -%} {% extends "autotools_static" %} {% block configure %} LDFLAGS=--static diff --git a/templates/pkg/bison b/templates/pkg/bison @@ -1,5 +1,5 @@ -{%- pkg_version="3.8.2" -%} -{%- pkg_source="tar.xz" -%} +{%- set pkg_version="3.8.2" -%} +{%- set pkg_source="tar.xz" -%} {% extends "autotools_static" %} {%- block package_deps %} #+{{pkg_install_name("flex")}} diff --git a/templates/pkg/busybox-modutils b/templates/pkg/busybox:modutils diff --git a/templates/pkg/getconf b/templates/pkg/getconf @@ -1 +1,4 @@ {% extends "single_static_c" %} +{%- block source_deps %} +#@sha256:{{ 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[name + ".c"] }}:{{ name }}.c -{{ endblock }} +#@sha256:{{ downloads[shortname + ".c"] }}:{{ shortname }}.c +{% endblock %} diff --git a/templates/pkg/gnu-make b/templates/pkg/gnu-make @@ -1,14 +1,14 @@ {%- set pkg_version="4.4.1" -%} -{%- set pkg_source="tar.gz" -%} +{%- set src_dir="make-"+pkg_version -%} {% extends "autotools_static" %} {%- block template_deps %}{% endblock %} {%- 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 %} {% block configure_args %}--disable-nls{% endblock %} -{%- endblock %} {% block check %} check_static command/make diff --git a/templates/pkg/gnu-make:bootstrap b/templates/pkg/gnu-make:bootstrap @@ -1,11 +1,11 @@ {%- set pkg_version="4.4.1" -%} -{%- set pkg_source="tar.gz" -%} +{%- set src_dir="make-"+pkg_version -%} {% extends "autotools" %} {%- block template_deps %} #@pragma:nosandbox #@pragma:nopath #+{{pkg_install_name("musl-cross-make:bootstrap-1")}} -#@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. +#@untar:-z:{{downloads["make-" + assertion(pkg_version) + ".tar.gz"]}}:. {%- 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 +1,4 @@ {% extends "single_static_c" %} +{%- block source_deps %} +#@sha256:{{ downloads[shortname + ".c"] }}:{{ shortname }}.c +{% endblock %} diff --git a/templates/pkg/kernel.environment b/templates/pkg/kernel.environment @@ -1,3 +1,3 @@ {{ shebang }} #+{{pkg_install_name("linux")}} -#+{{pkg_install_name("busybox-kmod")}} +#+{{pkg_install_name("busybox:modutils")}} diff --git a/templates/pkg/logincaps b/templates/pkg/logincaps @@ -20,7 +20,7 @@ sh build_static.sh -DLOGINEXEC_PATH="\"$prefix/command/loginexec\"" cp -a login "${dest}/command/" {% endblock %} -{%- block install %} +{%- block check %} {% include "functions/check_static" %} check_static command/login {% endblock %} diff --git a/templates/pkg/system-config-init b/templates/pkg/system-config-init @@ -1,4 +1,3 @@ -{%- set pkg_source="git" -%} {% extends "genlinks" %} {%- block package_deps %} #+{{pkg_install_name("s6")}} @@ -102,7 +101,7 @@ EOF s6-chmod 755 "${dest}/run-image/service/console-log-tail/run" exit $? {% endblock %} -{%- block build_and_install %} +{%- block check %} {% include "functions/check_static" %} check_static bin/init check_static bin/halt diff --git a/templates/pkg/system-config-rc b/templates/pkg/system-config-rc @@ -1,4 +1,3 @@ -{%- set pkg_source="git" -%} {% extends "genlinks" %} {%- block package_deps %} #+{{pkg_install_name("busybox-diffutils")}} diff --git a/templates/pkg/user-env b/templates/pkg/user-env @@ -1,8 +1,9 @@ -{%- set pkg_source="git" -%} +{%- set src_dir='.' -%} {% extends "genlinks" %} {%- block package_deps %} #+{{pkg_install_name("execline")}} #+{{pkg_install_name("pthbs-banginstall")}} +#@sha256:{{ files[shortname] }}:{{ shortname }} {% endblock %} {%- block build_and_install %} mkdir -p "${dest}/command" diff --git a/templates/pkg/zsh b/templates/pkg/zsh @@ -33,7 +33,7 @@ mv -v ../zsh_config/etc "${dest}/" mv -v ../zsh_config/zsh-functions/* "${dest}/zsh/site-functions/" {% endblock %} -{%- block install -%} +{%- block check -%} check_static command/zsh {% endblock %} diff --git a/templates/scriptsetup b/templates/scriptsetup @@ -3,6 +3,7 @@ {{ super() }} #+{{pkg_install_name("zsh")}} #+{{pkg_install_name("pthbs-banginstall")}} +{% endblock %} {%- block build %} {%- endblock %} {%- block install %} @@ -22,13 +23,7 @@ if test -d zsh-functions; then mv -v zsh-functions "${dest}/zsh/site-functions" fi -{%- block extra_script %} -{%- endblock %} - {% endblock %} {% block genlinks_rules %} -{%- block extra_rules %} -{%- endblock %} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } {% endblock -%} diff --git a/templates/single_static_c b/templates/single_static_c @@ -2,31 +2,31 @@ {%- block template_deps %} {{ super() }} #+{{pkg_install_name("musl-cross-make")}} -{{ endblock }} +{% endblock %} {%- block source_deps %} -#@sha256:{{ files[name + ".c"] }}:{{ name }}.c -{{ endblock }} +#@sha256:{{ files[shortname + ".c"] }}:{{ shortname }}.c +{% endblock %} {%- block prepare %} {{ super() }} -name='{{ name }}' -{{ endblock }} +name='{{ shortname }}' +{% endblock %} {%- block build %} {% include "functions/build_env_static" %} build_env_static gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS -{{ endblock }} +{% endblock %} {%- block install %} install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" -{{ endblock }} +{% endblock %} {%- block check %} {% include "functions/check_static" %} check_static "command/$name" -{{ endblock }} +{% endblock %} {% block genlinks_begin %} x["./command/{{name}}"]=1 {%- endblock %} diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat @@ -1,30 +1,38 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 -#+pthbs-banginstall.3363a58d50b6fa5c0139b588f6a41d3be0956d9de66eee76a2814eda5a6f8361 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 +#+pthbs-banginstall.1f4d596317f992fdad03b054d4c93a6f1576b029d3de49864d7e8d3142338d8f + #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat -: ${JOBS:=1} + + + prefix=/home/ccx/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'aat' + + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi + + mv -v data.awk "$pkgdir/" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" @@ -49,8 +57,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -81,3 +92,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco @@ -1,30 +1,26 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 + #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'abduco' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } build_env_static -prefix=/home/ccx/versions/$pthbs_package cd abduco cat >config.mk <<EOF # Any changes made here will be lost if configure is re-run @@ -38,13 +34,36 @@ CFLAGS = -pipe -Os LDFLAGS = -static EOF sed 's/^/> /' config.mk -make DESTDIR="${pthbs_destdir}" install + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + + +make DESTDIR="$pthbs_destdir" install + + # the Makefile hardcodes 'bin' despite configure undersanding BINDIR -mv "${pthbs_destdir}${prefix}/bin" "${pthbs_destdir}${prefix}/command" +mv "${dest}/bin" "${dest}/command" -check_static command/abduco +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + +check_static command/abduco + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -66,6 +85,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -96,3 +119,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/acl b/variants/ccx-x86_64/acl @@ -1,17 +1,36 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 -#+attr.c900cccf3b319b3b400ce4f8b90ad1968ca4b20f9c5bd6de30c3178e337ed6d0 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd +#+attr.bf60c0bb6aca6d0ac00005807f5579934272dfd3332372de4209a04eda850206 #@untar:-z:sha256:5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -31,37 +50,28 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'acl-2.3.2' -autotools_static acl-2.3.2 -check_static command/chacl +autotools_config_static + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/chacl cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -89,6 +99,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -119,3 +133,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/alpine-keys b/variants/ccx-x86_64/alpine-keys @@ -1,16 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -def_prefix -mkdir -p "${pthbs_destdir%/}/$prefix/keys" -mv alpine-keys/keys "${pthbs_destdir%/}/$prefix/keys/alpine" + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'alpine-keys' + + + +mkdir -p "${dest}/keys" +mv alpine-keys/keys "${dest}/keys/alpine" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -36,6 +40,10 @@ $1!="."{exit 1} $2 == "keys" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -66,3 +74,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools @@ -1,44 +1,36 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+patch.1384f499bf9486b2bbf1d782976b71e8440a9b2c4640e3d64fef41573113f9e3 -#+libressl.f7550f89bb0983ebf3174cdb582653fd8c4beb5b1c510c5c153a8b1b749298e0 -#+zstd.a392f13b313906f193e77b6894f9e30ecb529e33d37b9ddf534889654d550312 -#+pkgconf-pkg-config.0684d8ff21c6f3c5694d2d92e4138a00d6e88a195dd2de5b06c160324abdf7eb -#@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+patch.a9ad91b23017b4a5b4d932a3308e7d01c7d3e2b818c3f97aec97a2e6c4d84b76 +#+libressl.ebfd6cb2c406e77dedce908fee1a4ce6d7d7d07be7adaafd5b63a959730e9cb1 +#+zstd.882f63fc1174ecc43e0027d152b877ad782b3de1a3703b4f097243bf001b41bd +#+pkgconf-pkg-config.9d3eb62889748d5b435ad8f0849b29bab5640663c9c3044ac5224fb183599175 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} +#@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools + + + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'apk-tools' + +patch -p1 <../apk-tools.patch + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} - build_env_static -def_prefix -cd apk-tools -patch -p1 <../apk-tools.patch + make -j${JOBS:-1} -l$((1+${JOBS:-1})) STATIC=y LUA=no V=1 \ CFLAGS=-O2 \ DESTDIR="$pthbs_destdir" \ @@ -51,8 +43,22 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) STATIC=y LUA=no V=1 \ PKGCONFIGDIR="$prefix/library/pkgconfig" \ install-static -check_static command/apk.static + +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} +check_static command/apk.static cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -76,6 +82,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -106,3 +116,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps @@ -1,15 +1,44 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0 -#+libcap.d01395760d734c2e0bbda7a4361145d2b3b2bd5344b9860a16e52fa14af4e6a7 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d + +#+skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6 +#+libcap.e576044e47578b58cf99a08211d6316b6e97e59021d661f688d6730d8e8b645a + #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c -name=applyuidgid-caps + + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'applyuidgid-caps' + +name='applyuidgid-caps' + +CFLAGS="-D_GNU_SOURCE" +LDFLAGS="-lskarnet -lcap" + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static() { local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -20,25 +49,8 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -build_env_static -def_prefix - -gcc -D_GNU_SOURCE -static -o $name $name.c $LDFLAGS -lskarnet -lcap -install -d "$pthbs_destdir/$prefix/command" -install -m 755 $name "$pthbs_destdir/$prefix/command" -check_static command/$name +check_static "command/$name" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -61,6 +73,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -91,3 +107,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:. #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0 -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} + + + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -31,49 +31,25 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'argp-standalone-1.5.0' -cd argp-standalone-1.5.0 -autotools_config -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -def_prefix -make libargp.a -install -d "$pthbs_destdir/$prefix/library" -install -m 644 libargp.a "$pthbs_destdir/$prefix/library" +autotools_config + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) libargp.a +install -d "${dest}/library" +install -m 644 libargp.a "${dest}/library" -install -d "$pthbs_destdir/$prefix/include" -install -m 644 argp.h "$pthbs_destdir/$prefix/include" +install -d "${dest}/include" +install -m 644 argp.h "${dest}/include" @@ -100,6 +76,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -130,3 +110,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/attr b/variants/ccx-x86_64/attr @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,36 +49,27 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'attr-2.5.2' + + LDFLAGS=--static -autotools_static attr-2.5.2 -check_static command/attr + +autotools_config_static + + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install @@ -89,6 +99,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -119,3 +133,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/bison b/variants/ccx-x86_64/bison @@ -1,17 +1,37 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 -#+flex.921ee0ec90ca6f2efbc5c7b8bc88386036a1ccf9e3bb2a0e25f933e1f9481a9b + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd +#+flex.9932a9f8ecb68402064c7e9d55016e67ad749354d5b0be8f8bf3cf61595b9f2d +#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -31,40 +51,34 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'bison-3.8.2' + + + export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" -autotools_static bison-3.8.2 --disable-nls -check_static command/bison + +autotools_config_static --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + + +make DESTDIR="$pthbs_destdir" install + + rm -vrf "$pthbs_destdir"/$prefix/lib/charset.alias rmdir -p "$pthbs_destdir"/$prefix/lib || true -cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" +check_static command/bisoncd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/bison"]=1 @@ -86,6 +100,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -116,3 +134,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.98e093a9944b8b50cd7822e1d49484b6e0fab3976e23ff2c6c7a6f9110bd9b8a -#+gnu-make.4e7ff4ad6d9b4f6633a2aed2993748d465f18ffee42cbe26d5db8eafcc30f2c7 -#+musl-cross-make.63ab1a1e9dbbb93a1295c33b1a652fb16cbe3e5f95b8b60bee3dd618991ed097- \ No newline at end of file +#+busybox.de68bdf5d1c935618a4cc67fe7609805d170d87fcd8cb021c0734348574316db +#+gnu-make.f4066c7a1fb97a10c58e8eb546afb5b31f27e5019998dee1803c70cc6d69d119 +#+musl-cross-make.a7587853f32f73ae7d1eff4ff37d6cbe50b66e80560e7062689e2dacd99426dc+ \ No newline at end of file diff --git a/variants/ccx-x86_64/busybox b/variants/ccx-x86_64/busybox @@ -1,19 +1,20 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.4e7ff4ad6d9b4f6633a2aed2993748d465f18ffee42cbe26d5db8eafcc30f2c7 -#+busybox.98e093a9944b8b50cd7822e1d49484b6e0fab3976e23ff2c6c7a6f9110bd9b8a +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.f4066c7a1fb97a10c58e8eb546afb5b31f27e5019998dee1803c70cc6d69d119 +#+busybox.de68bdf5d1c935618a4cc67fe7609805d170d87fcd8cb021c0734348574316db #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab:busybox/.config -: ${JOBS:=1} - export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" cd busybox +cat >>.config <<EOF +CONFIG_BUSYBOX_EXEC_PATH="${prefix}/command/busybox" +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 + HOSTCC="$CC -static" CC="$CC -static" HOSTCFLAGS=-D_GNU_SOURCE -j${JOBS:-1} mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package/command" cp -a busybox "$pthbs_destdir/home/ccx/versions/$pthbs_package/command/" diff --git a/variants/ccx-x86_64/busybox-diffutils b/variants/ccx-x86_64/busybox-diffutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-findutils b/variants/ccx-x86_64/busybox-findutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-kbd b/variants/ccx-x86_64/busybox-kbd @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-login b/variants/ccx-x86_64/busybox-login @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 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-modutils b/variants/ccx-x86_64/busybox-modutils @@ -1,28 +0,0 @@ -#!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#@git:887295686dbc69e5b2d530f0e6a8dbf94094ac9f:busybox -#@sha256:ea5d8b394f6e9c3a6cf03d6f4cd3a04db5d9209e7d25bc89aa4de5ac4cb0c141:busybox/.config - -: ${JOBS:=1} - -export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" -export CFLAGS="-D_GNU_SOURCE" -export LDFLAGS="-static" - -cd busybox -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 - -mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package/command" - -for exe in depmod insmod lsmod modinfo modprobe rmmod; do - mv -v $exe "$pthbs_destdir/home/ccx/versions/$pthbs_package/command/" - check_static command/$exe - printf './command/%s\t./command/%s\n' "$exe" "$exe" \ - >>"$pthbs_destdir/home/ccx/versions/$pthbs_package/.install-links.new" -done - -cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" -mv .install-links.new .install-links 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.63ab1a1e9dbbb93a1295c33b1a652fb16cbe3e5f95b8b60bee3dd618991ed097 -#+gnu-make.4e7ff4ad6d9b4f6633a2aed2993748d465f18ffee42cbe26d5db8eafcc30f2c7 +#+musl-cross-make.a7587853f32f73ae7d1eff4ff37d6cbe50b66e80560e7062689e2dacd99426dc +#+gnu-make.f4066c7a1fb97a10c58e8eb546afb5b31f27e5019998dee1803c70cc6d69d119 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config -: ${JOBS:=1} -mcm=/home/ccx/versions/musl-cross-make.63ab1a1e9dbbb93a1295c33b1a652fb16cbe3e5f95b8b60bee3dd618991ed097 -make=/home/ccx/versions/gnu-make.4e7ff4ad6d9b4f6633a2aed2993748d465f18ffee42cbe26d5db8eafcc30f2c7 +mcm=/home/ccx/versions/musl-cross-make.a7587853f32f73ae7d1eff4ff37d6cbe50b66e80560e7062689e2dacd99426dc +make=/home/ccx/versions/gnu-make.f4066c7a1fb97a10c58e8eb546afb5b31f27e5019998dee1803c70cc6d69d119 export PATH="$mcm/bin:$make/command:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" @@ -17,7 +16,7 @@ export LDFLAGS="-static" cd busybox $make/command/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 + HOSTCC="$CC -static" CC="$CC -static" HOSTCFLAGS=-D_GNU_SOURCE -j${JOBS:-1} mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package/command" cp -a busybox "$pthbs_destdir/home/ccx/versions/$pthbs_package/command/" diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils @@ -0,0 +1,58 @@ +#!/usr/bin/env pthbs-build +#+linux.cd1189534bc4c46326f4c3d53f29498d3155faf7632eeed3c22b6ffb6da0db2a +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#@sha256:ea5d8b394f6e9c3a6cf03d6f4cd3a04db5d9209e7d25bc89aa4de5ac4cb0c141:busybox/.config + +#@git:887295686dbc69e5b2d530f0e6a8dbf94094ac9f:busybox + + + + +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.cd1189534bc4c46326f4c3d53f29498d3155faf7632eeed3c22b6ffb6da0db2a" +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 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + +mkdir -p "${dest}/command" + +for exe in depmod insmod lsmod modinfo modprobe rmmod; do + mv -v $exe "${dest}/command/" + check_static command/$exe + printf './command/%s\t./command/%s\n' "$exe" "$exe" \ + >>"${dest}/.install-links.new" +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,29 +1,31 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+certdata2pem.882212f9c6a7532081a236c0f886fa4b75c75fe4683cd711b071b1b786c3b88e +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+certdata2pem.44cc60cc18de0a7516228157ff1b009d8d686a3d1e437dd580e69627383f8ed1 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -def_prefix -cd ca-certificates-20241121 + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'ca-certificates-20241121' + + touch blacklist.txt # TODO! certdata2pem -install -d "$pthbs_destdir/$prefix/config/ssl/certs" + +install -d "${dest}/config/ssl/certs" for file in ./*.crt; do - install -m 644 $file "$pthbs_destdir/$prefix/config/ssl/certs" - printf '# %s\n' $file >>"$pthbs_destdir/$prefix/config/ssl/certs/ca-certificates.crt" - cat $file >>"$pthbs_destdir/$prefix/config/ssl/certs/ca-certificates.crt" + install -m 644 $file "${dest}/config/ssl/certs" + printf '# %s\n' $file >>"${dest}/config/ssl/certs/ca-certificates.crt" + cat $file >>"${dest}/config/ssl/certs/ca-certificates.crt" done + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -47,6 +49,10 @@ $1!="."{exit 1} $2 == "config" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -77,3 +83,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils @@ -1,14 +1,24 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0 -#+s6.367e7e989067970115092f834c89fd0e8c3d65849980e38887d640c0647e615f +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6 +#+s6.522148297e5c398b07c4e0929d601a2e5c325d5bb674344189ecb3449a53fa0d + #@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils + + + +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 + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -24,17 +34,9 @@ build_env_static() { export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} build_env_static -def_prefix -./ccx-utils/link.configure $LDFLAGS -cd ccx-utils/src +./link.configure $LDFLAGS for name in \ argv0exec \ @@ -53,11 +55,13 @@ for name in \ ucspi-socksserver-access do make $name - install -d "$pthbs_destdir/$prefix/command" - install -m 755 $name "$pthbs_destdir/$prefix/command" + install -d "${dest}/command" + install -m 755 $name "${dest}/command" check_static command/$name done + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -93,6 +97,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -123,3 +131,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem @@ -1,13 +1,40 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d + #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c -name=certdata2pem + + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'certdata2pem' + +name='certdata2pem' + +CFLAGS="-D_GNU_SOURCE" + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static() { local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -18,25 +45,8 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -build_env_static -def_prefix - -gcc -D_GNU_SOURCE -static -o $name $name.c $LDFLAGS -install -d "$pthbs_destdir/$prefix/command" -install -m 755 $name "$pthbs_destdir/$prefix/command" -check_static command/$name +check_static "command/$name" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -59,6 +69,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -89,3 +103,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz @@ -1,31 +1,37 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 -#+pthbs-banginstall.3363a58d50b6fa5c0139b588f6a41d3be0956d9de66eee76a2814eda5a6f8361 -#@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz -: ${JOBS:=1} +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 +#+pthbs-banginstall.1f4d596317f992fdad03b054d4c93a6f1576b029d3de49864d7e8d3142338d8f + + + + + prefix=/home/ccx/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'confz' + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -47,8 +53,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -79,3 +88,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+busybox-login.64a8e2c7d2683df83f262b0e518ab3c6e183702c9346f9d121649db9d761ae71 -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#+s6.367e7e989067970115092f834c89fd0e8c3d65849980e38887d640c0647e615f -#+ccx-utils.3ff2c11fd963448e6622a9c6f3119797615f55e08004db819be896144217712b -#+applyuidgid-caps.3cda5159c18aa3bbfd333ed4c693cc7855a4101f483ec0d913c60d55dc84601b -#+easyseccomp.ec76999d9b46f696612607607b136ec1487db0ec4ccb3a5df1b1d57d28e3e703 -#+mlog.c721dc6fe10da70f390420f73b65f91adf9b38455794a38654ecad8926884dbf -#+abduco.af8f67f8ca3fe3e00dd56ed8968abaa478c0b652bd7b22015b50c5e8234a835f +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+busybox-login.5031dadd2432f860fce873454a02b5701c54a9059b6de5e0ba6b74592f834942 +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 +#+s6.522148297e5c398b07c4e0929d601a2e5c325d5bb674344189ecb3449a53fa0d +#+ccx-utils.1c6715cb75513a3e3289e34b95253af01a453053a6d43510969accccd249c6d8 +#+applyuidgid-caps.b99410f494c58ef6c6acfac9f60235edb3d4b018754150d7c1c2fb1ec22f2ae9 +#+easyseccomp.194823431c6d4acd2f5b62627944c5fc83c6fa92e137074bb50f99dd737810f6 +#+mlog.2f5a683eed5a6662e555d06055b266c425d1b19a3f0e893934a0bc03d51effb7 +#+abduco.32e11a8e0b1be53edec0e1908c645a4e4de2cd94d86ac5b4b867a99719ed43ae #@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,38 +1,46 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 -#+pthbs-banginstall.3363a58d50b6fa5c0139b588f6a41d3be0956d9de66eee76a2814eda5a6f8361 -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#+alpine-keys.da3acf75adc18ca1dcdbaa0d7abd244c331630a36acf23c368d74214abd9dc4c -#+apk-tools.9c7b66673cd405a3550e75818f7ae4b0337e90d80daf87b2f252969b87bb6a9e -#+xbps.52e3b5d022897b5c6b3ff66855ff231b4dab126006473d1170f2604a22bdc8ed -#+container-bin-image.5550ad4ea4701db1167fdd477396176345436d8d43434c2005b56bdd00b54794 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 +#+pthbs-banginstall.1f4d596317f992fdad03b054d4c93a6f1576b029d3de49864d7e8d3142338d8f + +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 +#+alpine-keys.6a491302c80e0e6b3196faf4470f20783851160f36ea005f2c3da2a333936ec5 +#+apk-tools.21f855af757e2d5d406d302476a11c936793f65eb91f67430ab24e0af7bb0bb5 +#+xbps.c3252991f24d0a565a7fe2726658bb328356120003dc48e5d44473fdfda2420e +#+container-bin-image.a407815d79ec23193b06a46e96dd73e68070aa8e8a31bcb7d1187d21dfce8587 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers -: ${JOBS:=1} + + + prefix=/home/ccx/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'containers' + + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi -mkdir "$pkgdir/data" -mv -v service_scripts container_template "$pkgdir/data/" -printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \ + + +mkdir "${dest}/data" +mv -v service_scripts container_template "${dest}/data/" +printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_template_dir='$prefix/data/container_template'" \ "typeset -g container_service_script_dir='$prefix/data/service_scripts'" \ "typeset -g container_ns_bin_dir='$prefix/deps/container-bin-image'" \ @@ -42,25 +50,25 @@ printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_void_keys_dir='$prefix/deps/keys/void'" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" -mkdir -p "$pkgdir/deps/command" -ln -sf '/home/ccx/versions/apk-tools.9c7b66673cd405a3550e75818f7ae4b0337e90d80daf87b2f252969b87bb6a9e/command/apk.static' "$pkgdir/deps/command/" -ln -sf '/home/ccx/versions/xbps.52e3b5d022897b5c6b3ff66855ff231b4dab126006473d1170f2604a22bdc8ed/command/xbps-install.static' "$pkgdir/deps/command/" +mkdir -p "${dest}/deps/command" +ln -sf '/home/ccx/versions/apk-tools.21f855af757e2d5d406d302476a11c936793f65eb91f67430ab24e0af7bb0bb5/command/apk.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/xbps.c3252991f24d0a565a7fe2726658bb328356120003dc48e5d44473fdfda2420e/command/xbps-install.static' "${dest}/deps/command/" -for f in '/home/ccx/versions/alpine-keys.da3acf75adc18ca1dcdbaa0d7abd244c331630a36acf23c368d74214abd9dc4c'/keys/alpine/*/*; do +for f in '/home/ccx/versions/alpine-keys.6a491302c80e0e6b3196faf4470f20783851160f36ea005f2c3da2a333936ec5'/keys/alpine/*/*; do test -f "$f" d=$(basename "${f%/*}") - mkdir -p "$pkgdir/deps/keys/alpine/$d" - ln -sf "$f" "$pkgdir/deps/keys/alpine/$d/" + mkdir -p "${dest}/deps/keys/alpine/$d" + ln -sf "$f" "${dest}/deps/keys/alpine/$d/" done -mkdir -p "$pkgdir/deps/keys/void" -for f in '/home/ccx/versions/xbps.52e3b5d022897b5c6b3ff66855ff231b4dab126006473d1170f2604a22bdc8ed'/keys/void/*; do - ln -sf "$f" "$pkgdir/deps/keys/void/" +mkdir -p "${dest}/deps/keys/void" +for f in '/home/ccx/versions/xbps.c3252991f24d0a565a7fe2726658bb328356120003dc48e5d44473fdfda2420e'/keys/void/*; do + ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.5550ad4ea4701db1167fdd477396176345436d8d43434c2005b56bdd00b54794/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.5550ad4ea4701db1167fdd477396176345436d8d43434c2005b56bdd00b54794/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.5550ad4ea4701db1167fdd477396176345436d8d43434c2005b56bdd00b54794/container-bin-image' "$pkgdir/deps/" +test -d '/home/ccx/versions/container-bin-image.a407815d79ec23193b06a46e96dd73e68070aa8e8a31bcb7d1187d21dfce8587/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.a407815d79ec23193b06a46e96dd73e68070aa8e8a31bcb7d1187d21dfce8587/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.a407815d79ec23193b06a46e96dd73e68070aa8e8a31bcb7d1187d21dfce8587/container-bin-image' "${dest}/deps/" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -88,8 +96,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -120,3 +131,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#+s6.367e7e989067970115092f834c89fd0e8c3d65849980e38887d640c0647e615f -#+s6-portable-utils.354e2614604eb3a28327e951979aee25c6548f055d8d9ac853810d662ca7fb3c -#+s6-linux-utils.908237c5b632e4c4f391cf752caa6ee1b9dc9df90d5486e2bbe113ab8e9105a7 -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 -#+confz.721425935caa67289b7a227f6a914fbdc8574255a30bcd7096c13912af02e237 -#+containers.dc7aefdff085732d8ec7a9b49968e5b30a5536a3cafc6add0bf4b0e5b2b76901 -#+xbps.52e3b5d022897b5c6b3ff66855ff231b4dab126006473d1170f2604a22bdc8ed -#+zstd.a392f13b313906f193e77b6894f9e30ecb529e33d37b9ddf534889654d550312 -#+apk-tools.9c7b66673cd405a3550e75818f7ae4b0337e90d80daf87b2f252969b87bb6a9e -#+alpine-keys.da3acf75adc18ca1dcdbaa0d7abd244c331630a36acf23c368d74214abd9dc4c -#+getent.2c4259899864ea31756a27a790671e33508b3b6f8320ff40765527626767a584 -#+fileset.23a9a61f343ebd352febcf6b00e9e60efbd2bf31293169764d1f1892e9cf2f98 -#+ccx-utils.3ff2c11fd963448e6622a9c6f3119797615f55e08004db819be896144217712b -#+easyseccomp.ec76999d9b46f696612607607b136ec1487db0ec4ccb3a5df1b1d57d28e3e703- \ No newline at end of file +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 +#+s6.522148297e5c398b07c4e0929d601a2e5c325d5bb674344189ecb3449a53fa0d +#+s6-portable-utils.169331146530c0b8731fadf95717d3f7a8908fbfad584cf2c84bee2a88296750 +#+s6-linux-utils.72ae517a132daf7c6d0f671fa0279c7311a22e17d5fb6ba32e8f34b80a3c0002 +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 +#+confz.648807f2be80fabf6ca7cdcad50bb083639f6c8ea72a473faa8a3979742bec47 +#+containers.aab12b1943f4fef1321f039a3bfc0d416b9eaea597d40db28ea7b837625271a4 +#+xbps.c3252991f24d0a565a7fe2726658bb328356120003dc48e5d44473fdfda2420e +#+zstd.882f63fc1174ecc43e0027d152b877ad782b3de1a3703b4f097243bf001b41bd +#+apk-tools.21f855af757e2d5d406d302476a11c936793f65eb91f67430ab24e0af7bb0bb5 +#+alpine-keys.6a491302c80e0e6b3196faf4470f20783851160f36ea005f2c3da2a333936ec5 +#+getent.c156858661e8d3a0cc5eef48d6c089852a668465beb5a5a521ffae495c75dd99 +#+fileset.e240e6b64ac6a7df9b2d4680fe2c590a2cb2c63757b1293070c2fac2cad52f2e +#+ccx-utils.1c6715cb75513a3e3289e34b95253af01a453053a6d43510969accccd249c6d8 +#+easyseccomp.194823431c6d4acd2f5b62627944c5fc83c6fa92e137074bb50f99dd737810f6+ \ No newline at end of file diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl @@ -1,17 +1,36 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 -#+libressl.f7550f89bb0983ebf3174cdb582653fd8c4beb5b1c510c5c153a8b1b749298e0 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd +#+libressl.ebfd6cb2c406e77dedce908fee1a4ce6d7d7d07be7adaafd5b63a959730e9cb1 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -31,36 +50,20 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'curl-8.6.0' + + + # Do not generate manpages (requires Perl) ( - cd curl-8.6.0 t=$(busybox which true) for f in scripts/cd2nroff docs/cmdline-opts/*.pl; do printf '#!%s\n' "$t" >$f @@ -68,7 +71,7 @@ check_static() { ) || exit $? export LDFLAGS="--static" -autotools_static curl-8.6.0 \ +autotools_config_static \ --with-zlib \ --enable-ipv6 \ --enable-unix-sockets \ @@ -79,12 +82,17 @@ autotools_static curl-8.6.0 \ --without-libssh2 \ --without-libpsl \ --disable-manual -check_static command/curl +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + -rm -r -v "$pthbs_destdir"'/home/ccx/versions'"/$pthbs_package/man" +make DESTDIR="$pthbs_destdir" install +rm -r -v "$pthbs_destdir"'/home/ccx/versions'"/$pthbs_package/man" + +check_static command/curl + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -108,6 +116,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -138,3 +150,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+diffutils.cacfc9d2fd98544386065c1b55a8398ad5c52a4cc0b5cc34212ad40cb287fda1 -#+patch.1384f499bf9486b2bbf1d782976b71e8440a9b2c4640e3d64fef41573113f9e3 -#+flex.921ee0ec90ca6f2efbc5c7b8bc88386036a1ccf9e3bb2a0e25f933e1f9481a9b -#+bison.2d200b9031bcf3e27296618f74d67c41a5b09134654c9b9dd0d9acd405fa1c4f -#+rsync.7d51808b49edaf9c3258d04510e8d995e4233109ac038215187ca1981dcd5854 -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#+s6.367e7e989067970115092f834c89fd0e8c3d65849980e38887d640c0647e615f -#+s6-rc.caf6c5c71b99aa4c54d9cb2055cd300f42618a9719cd32ae06118c3ca6e9cbfa -#+s6-portable-utils.354e2614604eb3a28327e951979aee25c6548f055d8d9ac853810d662ca7fb3c -#+s6-linux-utils.908237c5b632e4c4f391cf752caa6ee1b9dc9df90d5486e2bbe113ab8e9105a7 -#+s6-linux-init.4cf1980b42f22c2c084d83f258965b2ce5bb9d2b19665908ca4e9f2df857ba22 -#+mdevd.a86c15e40d3a5f339af7d693e4069aefddee6dbf5b25e049362a3afd418319ec -#+s6-dns.cf91ba83b9e1b69f1d3296166bbdc70375f1f744bc12cac066d90feba9cd70d2 -#+libressl.f7550f89bb0983ebf3174cdb582653fd8c4beb5b1c510c5c153a8b1b749298e0 -#+s6-networking.407a9744f996d75d61acbe7aeef8b0018807455aae3b456cac372efb32e80059 -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 -#+pthbs-banginstall.3363a58d50b6fa5c0139b588f6a41d3be0956d9de66eee76a2814eda5a6f8361 -#+aat.bc32d18c7f99a8ef2652c0e018e79b5e1f27f836fbaf23be8da29e067a450451 -#+confz.721425935caa67289b7a227f6a914fbdc8574255a30bcd7096c13912af02e237 -#+containers.dc7aefdff085732d8ec7a9b49968e5b30a5536a3cafc6add0bf4b0e5b2b76901 -#+fileset.23a9a61f343ebd352febcf6b00e9e60efbd2bf31293169764d1f1892e9cf2f98 -#+logincaps.4b0964e4aa4fb0c87c6bd640c97629ed423b2e58a56ca1ea2f45eae99979e60e -#+snaprep.47e04fa40316f8e014e4f54ef23c17dee768861d29ee157737b59287e5d9b860 -#+curl.1bba2eb7a53982eb6690b7aebe830652fc6a5c178c6c784cfcbfd0b822b1befc -#+git.b178f23a36a18c9172d8faacb1de683c37c2967d3ecd74f3683658630cd67f36 -#+xbps.52e3b5d022897b5c6b3ff66855ff231b4dab126006473d1170f2604a22bdc8ed -#+apk-tools.9c7b66673cd405a3550e75818f7ae4b0337e90d80daf87b2f252969b87bb6a9e -#+getent.2c4259899864ea31756a27a790671e33508b3b6f8320ff40765527626767a584 -#+getconf.6615e49af7e60dad0a5c2c636ad575dd22d332eb9f48b61f4d79db3103834c56 -#+iconv.d3d5af9b3a0aa6c0d9b8233c3e98484c033e330e0162af1f3ea49a1f097f9803 -#+libcap.d01395760d734c2e0bbda7a4361145d2b3b2bd5344b9860a16e52fa14af4e6a7 -#+applyuidgid-caps.3cda5159c18aa3bbfd333ed4c693cc7855a4101f483ec0d913c60d55dc84601b -#+ccx-utils.3ff2c11fd963448e6622a9c6f3119797615f55e08004db819be896144217712b -#+user-env.f4e3a9c94b8e365751d0476bb5640eb0d87e7a0435acf23e935c2976969e730b -#+strace.d5a210bea4ca1032ad6af8ba424603c5a34f278b1ec23c7036cbbece0c902aa1 -#+mlog.c721dc6fe10da70f390420f73b65f91adf9b38455794a38654ecad8926884dbf -#+system-config.869f5be306cf81e1750659145a70bddb3d2e4ed99ae695f25d769b71442ff480 -#+system-config-rc.4c510f8853962a801a7e0dc2d84dfa531979a24e09cf6746e91bc4351f01463f -#+system-config-scripts.12cd80d905a32c81c3e35eaa49a63c56c3194caff1645106ac42e8bb617e6c93 -#+system-config-init.8ddad15aad8ccd7a9b07f61b025ab58680aea37a987da6542467ff6f4970bbcb -#+system-config-zsh.04aa09b5210faef5e8ba51db17ca9026237ba6b89741c1e38fb6192ebf71fecb- \ No newline at end of file +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+diffutils.ba0904750433febf42fbf68ba7acad949323fc6c714f59955d3962fcc50e6e2e +#+patch.a9ad91b23017b4a5b4d932a3308e7d01c7d3e2b818c3f97aec97a2e6c4d84b76 +#+flex.9932a9f8ecb68402064c7e9d55016e67ad749354d5b0be8f8bf3cf61595b9f2d +#+bison.2c7e2de665ce478ad51444c93095daae85941d2d799a2d07cc660ed70a183570 +#+rsync.d8f0d4edd6db0f5634a556d9f446e3eaf9a3ecd75c55fe6afaf76ed32cac69d4 +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 +#+s6.522148297e5c398b07c4e0929d601a2e5c325d5bb674344189ecb3449a53fa0d +#+s6-rc.f0c682dcfd7634ca697be3bae9da99241c8b3d4fe52a3f9e1029141adfe7f93e +#+s6-portable-utils.169331146530c0b8731fadf95717d3f7a8908fbfad584cf2c84bee2a88296750 +#+s6-linux-utils.72ae517a132daf7c6d0f671fa0279c7311a22e17d5fb6ba32e8f34b80a3c0002 +#+s6-linux-init.95a8eeb024ab85fede8e322e4628b6e957dce0fd63264e173d2bfc9fefa01dec +#+mdevd.cda74f6f9629b81256c683abe7d4db038b86cea59801219a58d86ccd9018aff4 +#+s6-dns.ce0cdb49a015dde5682205748020444345a70a62e035261258e0c92074a771c8 +#+libressl.ebfd6cb2c406e77dedce908fee1a4ce6d7d7d07be7adaafd5b63a959730e9cb1 +#+s6-networking.07d1d4303ec51d659c3245222c46ee33f54229d3e07047ac917e9ee188532326 +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 +#+pthbs-banginstall.1f4d596317f992fdad03b054d4c93a6f1576b029d3de49864d7e8d3142338d8f +#+aat.597c91703d9f562fb7f394451b7cb31f815027cdb583512c1971785546fc6c28 +#+confz.648807f2be80fabf6ca7cdcad50bb083639f6c8ea72a473faa8a3979742bec47 +#+containers.aab12b1943f4fef1321f039a3bfc0d416b9eaea597d40db28ea7b837625271a4 +#+fileset.e240e6b64ac6a7df9b2d4680fe2c590a2cb2c63757b1293070c2fac2cad52f2e +#+logincaps.e0abfe709b527e5f0c5158ebad0a6eb28cad9b2dd334035d00ad6025a20ffc36 +#+snaprep.0ce7618b224e4dfa798dcc17170a15c55746c17fa99781e879c578345dae2764 +#+curl.27bc202eb9cd3f0fe0aaffc7d900de9a37691652c51b06f1eae0883af13cc106 +#+git.a9916b4bd37d467e43bca909195f586c3863997ce81ec39358fb8778653f017e +#+xbps.c3252991f24d0a565a7fe2726658bb328356120003dc48e5d44473fdfda2420e +#+apk-tools.21f855af757e2d5d406d302476a11c936793f65eb91f67430ab24e0af7bb0bb5 +#+getent.c156858661e8d3a0cc5eef48d6c089852a668465beb5a5a521ffae495c75dd99 +#+getconf.81f60393e71b4ec887d30bf2f481b6b4d5387692abba7f9ebdd169993cc10011 +#+iconv.d19e20a396f9b4da77db122178b50c3caca5421d2acdabdca0535a3cbc2aa09b +#+libcap.e576044e47578b58cf99a08211d6316b6e97e59021d661f688d6730d8e8b645a +#+applyuidgid-caps.b99410f494c58ef6c6acfac9f60235edb3d4b018754150d7c1c2fb1ec22f2ae9 +#+ccx-utils.1c6715cb75513a3e3289e34b95253af01a453053a6d43510969accccd249c6d8 +#+user-env.e563fbaa848eb6bfa6eb3fc750890045bebfca39af3afc8d6cc7bded7d875296 +#+strace.66f62a71f0dfe3d715bada1f20d4969fb76452c4f804f44991093207914377fb +#+mlog.2f5a683eed5a6662e555d06055b266c425d1b19a3f0e893934a0bc03d51effb7 +#+system-config.ae572e99b91758bc34c7c76735eadec2e1064b4269eeed97b9e748bcdbf65d36 +#+system-config-rc.9fec2190c51b2b1efd47bfe3a90a7ce6cd140d1eae1868198a060de4f5bf595e +#+system-config-scripts.9991313c03cd257aec6ba0c30b8d51ff62c70f63cd06a0dcdb80b1856684be00 +#+system-config-init.725ab8b4e3d439169cfad5754f8d214cf64239c5431b8e451dbfce6af10d396d +#+system-config-zsh.d046a827748b310e5c4b68817c837ef7cfa4d195e0300a84b3a5e8d53f9596ba+ \ No newline at end of file diff --git a/variants/ccx-x86_64/diffutils b/variants/ccx-x86_64/diffutils @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,38 +49,29 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'diffutils-3.10' -autotools_static diffutils-3.10 --disable-nls -check_static command/diff -check_static command/cmp +autotools_config_static --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/diff +check_static command/cmp cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -86,6 +96,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -116,3 +130,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp @@ -1,24 +1,26 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 -#+patch.1384f499bf9486b2bbf1d782976b71e8440a9b2c4640e3d64fef41573113f9e3 -#+flex.921ee0ec90ca6f2efbc5c7b8bc88386036a1ccf9e3bb2a0e25f933e1f9481a9b -#+bison.2d200b9031bcf3e27296618f74d67c41a5b09134654c9b9dd0d9acd405fa1c4f -#+libseccomp.715781577106c5311853d87c2ec5640f468568676c8e6edcecf86e0e32f6ebec -#+error-standalone.b52e14aea6fe8fe9a3e9df0f6aec0fd0d097f94e0c3857f874d448b4a55fe70f -#+argp-standalone.4c0990feda42c1934293007d55a1ad44af28c6f10d5450a057f2fa2c265da839 -#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd +#+patch.a9ad91b23017b4a5b4d932a3308e7d01c7d3e2b818c3f97aec97a2e6c4d84b76 +#+flex.9932a9f8ecb68402064c7e9d55016e67ad749354d5b0be8f8bf3cf61595b9f2d +#+bison.2c7e2de665ce478ad51444c93095daae85941d2d799a2d07cc660ed70a183570 +#+libseccomp.d2d7e2fcb23b67947219a6b2dbb003fa13cfab6f6aae2d3270f297ad0cf673dd +#+error-standalone.7146dc426d870f16d3a823a2689b88fd540887be7f792ca7fc7f2fe6454a6632 +#+argp-standalone.a48f71fd0e2ee25b562ca187ba637a57349a7be1de21446d3c9782e6d6fb9f60 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} +#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp + + + + + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -38,21 +40,31 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared + autotools_config "$@" --enable-static --disable-shared } + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'easyseccomp' + + +patch -p1 <../easyseccomp_fix_includes.patch +touch Makefile.in configure + +build_env_static +autotools_config --enable-seccomp + + +make -j1 V=1 DESTDIR="$pthbs_destdir" LIBS="-lseccomp -lerror -largp" install + + + + check_static() { local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -64,17 +76,8 @@ check_static() { fi } - -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 command/easyseccomp - - cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -98,6 +101,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -128,3 +135,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone @@ -1,17 +1,25 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 + #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:. + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'error-standalone-2.0' + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -prefix=/home/ccx/versions/$pthbs_package -build_env_static cd error-standalone-2.0 make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/home/ccx/versions/$pthbs_package \ DESTDIR="$pthbs_destdir" \ @@ -19,6 +27,9 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/home/ccx/versions/$pthbs_package \ LIBDIR="$prefix/library" \ install-static + + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -42,6 +53,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -72,3 +87,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline @@ -1,33 +1,44 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0 -#@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline -: ${JOBS:=1} +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6 + + + + prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 'execline' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6/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})) + + + make DESTDIR="$pthbs_destdir" install -if ! test -e "${pthbs_destdir%/}$prefix/command/eltest"; then + + +if ! test -e "${dest}/command/eltest"; then # TODO - printf '%s\n' >"${pthbs_destdir%/}$prefix/command/eltest" \ + printf '%s\n' >"${dest}/command/eltest" \ "#!$prefix/command/execlineb -S0" \ 's6-test $@' - chmod +x "${pthbs_destdir%/}$prefix/command/eltest" + chmod +x "${dest}/command/eltest" fi cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" @@ -51,6 +62,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -81,3 +96,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset @@ -1,31 +1,37 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 -#+pthbs-banginstall.3363a58d50b6fa5c0139b588f6a41d3be0956d9de66eee76a2814eda5a6f8361 -#@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset -: ${JOBS:=1} +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 +#+pthbs-banginstall.1f4d596317f992fdad03b054d4c93a6f1576b029d3de49864d7e8d3142338d8f + + + + + prefix=/home/ccx/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'fileset' + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -49,8 +55,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -81,3 +90,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/findutils b/variants/ccx-x86_64/findutils @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:. -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} + + + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,42 +30,31 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'findutils-4.10.0' + + +autotools_config --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + -autotools_static findutils-4.10.0 --disable-nls check_static command/find check_static command/xargs -check_static command/locate +# TODO: fix shebang in check_static command/locate # TODO: fix shebang in command/updatedb - - cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -96,6 +85,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -126,3 +119,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/flex b/variants/ccx-x86_64/flex @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,40 +49,34 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'flex-2.6.4' + + export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" export LDFLAGS="--static" -autotools_static flex-2.6.4 --disable-nls -check_static command/flex -check_static command/flex++ +autotools_config_static + + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/flex +check_static command/flex++ cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -89,6 +102,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -119,3 +136,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf @@ -1,13 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c -name=getconf +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d + +#@sha256:sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c + + + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'getconf' + +name='getconf' + + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static() { local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -18,25 +44,8 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -build_env_static -def_prefix - -gcc -static -o $name $name.c -install -d "$pthbs_destdir/$prefix/command" -install -m 755 $name "$pthbs_destdir/$prefix/command" -check_static command/$name +check_static "command/$name" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -59,6 +68,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -89,3 +102,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent @@ -1,13 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c -name=getent +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d + +#@sha256:sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c + + + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'getent' + +name='getent' + + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static() { local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -18,25 +44,8 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -build_env_static -def_prefix - -gcc -static -o $name $name.c -install -d "$pthbs_destdir/$prefix/command" -install -m 755 $name "$pthbs_destdir/$prefix/command" -check_static command/$name +check_static "command/$name" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -59,6 +68,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -89,3 +102,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git @@ -1,28 +1,23 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 -#+libressl.f7550f89bb0983ebf3174cdb582653fd8c4beb5b1c510c5c153a8b1b749298e0 -#+curl.1bba2eb7a53982eb6690b7aebe830652fc6a5c178c6c784cfcbfd0b822b1befc +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd +#+libressl.ebfd6cb2c406e77dedce908fee1a4ce6d7d7d07be7adaafd5b63a959730e9cb1 +#+curl.27bc202eb9cd3f0fe0aaffc7d900de9a37691652c51b06f1eae0883af13cc106 + #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} + + prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'git-2.43.2' + 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" \ @@ -41,9 +36,24 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ gitwebdir="$prefix/gitweb" \ V=1 all install -check_static command/git + +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} +check_static command/git + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -68,6 +78,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -98,3 +112,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/gnu-make b/variants/ccx-x86_64/gnu-make @@ -1,14 +1,31 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.4e7ff4ad6d9b4f6633a2aed2993748d465f18ffee42cbe26d5db8eafcc30f2c7 -#+busybox.98e093a9944b8b50cd7822e1d49484b6e0fab3976e23ff2c6c7a6f9110bd9b8a +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.f4066c7a1fb97a10c58e8eb546afb5b31f27e5019998dee1803c70cc6d69d119 +#+busybox.de68bdf5d1c935618a4cc67fe7609805d170d87fcd8cb021c0734348574316db #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -28,37 +45,28 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'make-4.4.1' -autotools_static make-4.4.1 --disable-nls -check_static command/make +autotools_config_static --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/make cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -83,6 +91,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -113,3 +125,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/gnu-make:bootstrap b/variants/ccx-x86_64/gnu-make:bootstrap @@ -1,14 +1,12 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.63ab1a1e9dbbb93a1295c33b1a652fb16cbe3e5f95b8b60bee3dd618991ed097 +#+musl-cross-make.a7587853f32f73ae7d1eff4ff37d6cbe50b66e80560e7062689e2dacd99426dc #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} + + + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -28,34 +26,17 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'make-4.4.1' -mcm=/home/ccx/versions/musl-cross-make.63ab1a1e9dbbb93a1295c33b1a652fb16cbe3e5f95b8b60bee3dd618991ed097 + +mcm=/home/ccx/versions/musl-cross-make.a7587853f32f73ae7d1eff4ff37d6cbe50b66e80560e7062689e2dacd99426dc export PATH="$mcm/bin:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" @@ -63,7 +44,14 @@ export CXX="$mcm/bin/x86_64-linux-musl-g++" export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" -autotools make-4.4.1 --enable-static --disable-shared --disable-nls +autotools_config --enable-static --disable-shared --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" @@ -89,6 +77,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -119,3 +111,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf @@ -1,17 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:. + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -31,38 +49,28 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'gperf-3.1' -autotools_static gperf-3.1 -check_static command/gperf +autotools_config_static + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + +check_static command/gperf cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -85,6 +93,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -115,3 +127,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv @@ -1,13 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c -name=iconv +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d + +#@sha256:sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c + + + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'iconv' + +name='iconv' + + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static() { local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -18,25 +44,8 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -build_env_static -def_prefix - -gcc -static -o $name $name.c -install -d "$pthbs_destdir/$prefix/command" -install -m 755 $name "$pthbs_destdir/$prefix/command" -check_static command/$name +check_static "command/$name" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -59,6 +68,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -89,3 +102,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/kbd b/variants/ccx-x86_64/kbd @@ -1,16 +1,36 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd +#@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,44 +50,38 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'kbd-2.6.4' + + -#export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" export LDFLAGS="--static" -autotools_static kbd-2.6.4 \ - --disable-nls --disable-vlock --disable-werror --disable-tests \ + +autotools_config_static --disable-nls --disable-vlock --disable-werror --disable-tests \ --datadir="$prefix/data" --datarootdir="$prefix/data" -check_static command/loadkeys + + + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + + +make DESTDIR="$pthbs_destdir" install + + cd ../destdir mv -v data ".$prefix/" +check_static command/loadkeys cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -90,6 +104,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -120,3 +138,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment @@ -1,2 +1,3 @@ #!/usr/bin/env pthbs-build -#+linux.5b074622f565adc940b0e821207d9cbba297f773eca7c8bd36177af56db710a8- \ No newline at end of file +#+linux.cd1189534bc4c46326f4c3d53f29498d3155faf7632eeed3c22b6ffb6da0db2a +#+busybox.962f117dc85b84f431f304f82633c2fb43bf17de7dff3c9ef19b30faac79bcc7+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libarchive b/variants/ccx-x86_64/libarchive @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,41 +49,33 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libarchive-3.7.2' + + export LDFLAGS=--static -autotools_static libarchive-3.7.2 --without-xml2 -check_static command/bsdtar -check_static command/bsdcpio +autotools_config_static --without-xml2 + + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + +make DESTDIR="$pthbs_destdir" install + +check_static command/bsdtar +check_static command/bsdcpio + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -88,6 +99,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -118,3 +133,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd @@ -1,17 +1,36 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 -#+libmd.5f45aa956079213e9ba1abb1f7b323eb603a1ff98ba70901bdefd6932283d025 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd +#+libmd.1d0ec1328d3b1f3607af3ce0d9c1e5113b32e708b45215a9b58e712a69fd8797 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -31,33 +50,25 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } -autotools_static libbsd-0.11.8 +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libbsd-0.11.8' + + + +autotools_config_static + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" @@ -83,6 +94,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -113,3 +128,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap @@ -1,42 +1,33 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+pkgconf-pkg-config.0684d8ff21c6f3c5694d2d92e4138a00d6e88a195dd2de5b06c160324abdf7eb +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+pkgconf-pkg-config.9d3eb62889748d5b435ad8f0849b29bab5640663c9c3044ac5224fb183599175 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} + + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libcap-2.69' + +sed -i '1 s|^#!/bin/bash|#!/bin/sh|' progs/*.sh + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -def_prefix LDFLAGS=--static build_env_static -cd libcap-2.69 -sed -i '1 s|^#!/bin/bash|#!/bin/sh|' progs/*.sh -make \ + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ DESTDIR="$pthbs_destdir" \ SHARED=no DYNAMIC=no LIBCSTATIC=yes \ prefix="$prefix" \ @@ -55,12 +46,24 @@ make \ LDFLAGS="$LDFLAGS" \ all install +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} check_static command/capsh check_static command/getcap check_static command/setcap check_static command/getpcaps - cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -87,6 +90,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -117,3 +124,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup @@ -1,19 +1,38 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 -#+flex.921ee0ec90ca6f2efbc5c7b8bc88386036a1ccf9e3bb2a0e25f933e1f9481a9b -#+bison.2d200b9031bcf3e27296618f74d67c41a5b09134654c9b9dd0d9acd405fa1c4f -#+musl-fts.db9cb6be5cc2f14e492ac2f008e0091f3e945891582e7438eedf8ea08b734002 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd +#+flex.9932a9f8ecb68402064c7e9d55016e67ad749354d5b0be8f8bf3cf61595b9f2d +#+bison.2c7e2de665ce478ad51444c93095daae85941d2d799a2d07cc660ed70a183570 +#+musl-fts.e8d1fa95ed726db506585511a935148c91865904873afbb9f987152d98bb154c #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -33,37 +52,28 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libcgroup-3.0.0' -autotools_static libcgroup-3.0.0 -check_static command/cgconfigparser +autotools_config_static + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/cgconfigparser cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -88,6 +98,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -118,3 +132,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf @@ -1,27 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+zstd.a392f13b313906f193e77b6894f9e30ecb529e33d37b9ddf534889654d550312 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+zstd.882f63fc1174ecc43e0027d152b877ad782b3de1a3703b4f097243bf001b41bd #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libelf' + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -prefix=/home/ccx/versions/$pthbs_package build_env_static -cd libelf make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX="$prefix" \ DESTDIR="$pthbs_destdir" \ INCDIR="$prefix/include" \ LIBDIR="$prefix/library" \ install-static -mkdir -p "$pthbs_destdir/${prefix#/}/library/pkgconfig" -printf '%s\n' > "$pthbs_destdir/${prefix#/}/library/pkgconfig/libelf.pc" \ +mkdir -p "${dest}/library/pkgconfig" +printf '%s\n' > "${dest}/library/pkgconfig/libelf.pc" \ "prefix=/home/ccx/versions/$pthbs_package" \ 'exec_prefix=${prefix}' \ 'includedir=${prefix}/include' \ @@ -62,6 +70,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -92,3 +104,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/libmd b/variants/ccx-x86_64/libmd @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,33 +49,25 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } -autotools_static libmd-1.1.0 +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libmd-1.1.0' + + + +autotools_config_static + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" @@ -83,6 +94,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -113,3 +128,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl @@ -1,18 +1,37 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 -#+ca-certificates-wip-donotuse.8040c45204912c5271ca1bfcf52f6767f3d958a510c4d9e0b1171189c4e05dc3 -#@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd +#+ca-certificates-wip-donotuse.ab554fa24ac80dfb7d21ea7e1878c2209fa5be86527f73a895a9e72fc7e4eb87 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c +#@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -32,42 +51,30 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } - prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libressl-3.8.2' + + + export LDFLAGS="--static" -autotools_static libressl-3.8.2 --with-openssldir="$prefix/config/ssl" -check_static command/openssl -check_static command/ocspcheck + +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.8040c45204912c5271ca1bfcf52f6767f3d958a510c4d9e0b1171189c4e05dc3/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.ab554fa24ac80dfb7d21ea7e1878c2209fa5be86527f73a895a9e72fc7e4eb87/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 @@ -83,7 +90,12 @@ printf >env/SSL_CERT_DIR '%s\n' "$prefix/config/ssl/certs" printf >env/GIT_SSL_CAPATH '%s\n' "$prefix/config/ssl/certs" +make DESTDIR="$pthbs_destdir" install + + +check_static command/openssl +check_static command/ocspcheck cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -114,6 +126,8 @@ $1!="."{exit 1} $2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } $2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -145,3 +159,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/libretls b/variants/ccx-x86_64/libretls @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-z:sha256:3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,35 +49,27 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libretls-3.8.1' + + export LDFLAGS="--static" -autotools_static libretls-3.8.1 + +autotools_config_static + + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install @@ -87,6 +98,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -117,3 +132,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp @@ -1,19 +1,38 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 -#+pkgconf-pkg-config.0684d8ff21c6f3c5694d2d92e4138a00d6e88a195dd2de5b06c160324abdf7eb -#+gperf.14bb7a56ab28e3aeb369e98f7a8568a2ab4e9e99a2d4abe2687a45710296c753 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd +#+pkgconf-pkg-config.9d3eb62889748d5b435ad8f0849b29bab5640663c9c3044ac5224fb183599175 +#+gperf.241a24e0a6899536391c015743941c6f51a56b7232e481cba5f86b3fe0846b90 + #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:. + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -33,38 +52,31 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libseccomp-2.6.0' + + export LDFLAGS="--static" -autotools_static libseccomp-2.6.0 -check_static command/scmp_sys_resolver + +autotools_config_static + + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) +make DESTDIR="$pthbs_destdir" install + + + +check_static command/scmp_sys_resolver cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -89,6 +101,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -119,3 +135,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,35 +49,18 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libunwind-1.8.1' + + -autotools_static libunwind-1.8.1 \ - --enable-cxx-exceptions \ +autotools_config_static --enable-cxx-exceptions \ --enable-coredump \ --enable-ptrace \ --enable-setjmp \ @@ -66,6 +68,13 @@ autotools_static libunwind-1.8.1 \ +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -90,6 +99,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -120,3 +133,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux @@ -1,48 +1,60 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+findutils.897355f114d1bc18593cf20b174eb4d0545b66e14a59e14f2343180e05c6cd98 -#+diffutils.cacfc9d2fd98544386065c1b55a8398ad5c52a4cc0b5cc34212ad40cb287fda1 -#+patch.1384f499bf9486b2bbf1d782976b71e8440a9b2c4640e3d64fef41573113f9e3 -#+flex.921ee0ec90ca6f2efbc5c7b8bc88386036a1ccf9e3bb2a0e25f933e1f9481a9b -#+bison.2d200b9031bcf3e27296618f74d67c41a5b09134654c9b9dd0d9acd405fa1c4f -#+rsync.7d51808b49edaf9c3258d04510e8d995e4233109ac038215187ca1981dcd5854 -#+zstd.a392f13b313906f193e77b6894f9e30ecb529e33d37b9ddf534889654d550312 -#+libelf.587f1673e48b91ebcb0176a982911a218dcf407871d5af683ce25711fc7e82cc -#+pkgconf-pkg-config.0684d8ff21c6f3c5694d2d92e4138a00d6e88a195dd2de5b06c160324abdf7eb +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+findutils.5d4e975a488046e490cfe600fc1241d9c67ab89e1d4b5608f3773144306fc13e +#+diffutils.ba0904750433febf42fbf68ba7acad949323fc6c714f59955d3962fcc50e6e2e +#+patch.a9ad91b23017b4a5b4d932a3308e7d01c7d3e2b818c3f97aec97a2e6c4d84b76 +#+flex.9932a9f8ecb68402064c7e9d55016e67ad749354d5b0be8f8bf3cf61595b9f2d +#+bison.2c7e2de665ce478ad51444c93095daae85941d2d799a2d07cc660ed70a183570 +#+rsync.d8f0d4edd6db0f5634a556d9f446e3eaf9a3ecd75c55fe6afaf76ed32cac69d4 +#+zstd.882f63fc1174ecc43e0027d152b877ad782b3de1a3703b4f097243bf001b41bd +#+libelf.0562054205027a6824bf3b5727e81efb7862bfb36da2d907ef64b0665ecf42f9 +#+pkgconf-pkg-config.9d3eb62889748d5b435ad8f0849b29bab5640663c9c3044ac5224fb183599175 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch -#printf '%s\n' "TODO: fix paths"; exit 1 -export CPATH="$pthbs_build_environment/include" + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 'linux-6.1' + unxz -c < '../patch-6.1.34.xz' | patch -p1 -N patch -p1 -N <../noobjtool.patch + +export CPATH="$pthbs_build_environment/include" + cp -v ../linux.config .config make olddefconfig diff -u ../linux.config .config || true + + make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ V=1 \ HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \ HOSTCFLAGS="-L$pthbs_build_environment/library" -installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package" -mkdir -p "$installdir/doc/linux" "$installdir/boot" -cp -v .config "$installdir/config" -mv Documentation/* "$installdir/doc/linux" + +mkdir -p "${dest}/doc/linux" "${dest}/boot" +cp -v .config "${dest}/config" +mv Documentation/* "${dest}/doc/linux" make modules_install install \ - INSTALL_MOD_PATH="$installdir/kernel" \ + INSTALL_MOD_PATH="${dest}/kernel" \ INSTALL_MOD_STRIP=1 \ - INSTALL_PATH="$installdir/boot" \ - INSTALL_DTBS_PATH="$installdir/boot/dtbs" + INSTALL_PATH="${dest}/boot" \ + INSTALL_DTBS_PATH="${dest}/boot/dtbs" + # remove dangling symlinks -module_dir="$installdir/kernel/lib/6.1.34" +module_dir="${dest}/kernel/lib/6.1.34" rm -f "$module_dir/build" "$module_dir/source" + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -79,6 +91,10 @@ 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 } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -109,3 +125,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest @@ -1,46 +1,58 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+findutils.897355f114d1bc18593cf20b174eb4d0545b66e14a59e14f2343180e05c6cd98 -#+diffutils.cacfc9d2fd98544386065c1b55a8398ad5c52a4cc0b5cc34212ad40cb287fda1 -#+patch.1384f499bf9486b2bbf1d782976b71e8440a9b2c4640e3d64fef41573113f9e3 -#+flex.921ee0ec90ca6f2efbc5c7b8bc88386036a1ccf9e3bb2a0e25f933e1f9481a9b -#+bison.2d200b9031bcf3e27296618f74d67c41a5b09134654c9b9dd0d9acd405fa1c4f -#+rsync.7d51808b49edaf9c3258d04510e8d995e4233109ac038215187ca1981dcd5854 -#+zstd.a392f13b313906f193e77b6894f9e30ecb529e33d37b9ddf534889654d550312 -#+libelf.587f1673e48b91ebcb0176a982911a218dcf407871d5af683ce25711fc7e82cc -#+pkgconf-pkg-config.0684d8ff21c6f3c5694d2d92e4138a00d6e88a195dd2de5b06c160324abdf7eb +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+findutils.5d4e975a488046e490cfe600fc1241d9c67ab89e1d4b5608f3773144306fc13e +#+diffutils.ba0904750433febf42fbf68ba7acad949323fc6c714f59955d3962fcc50e6e2e +#+patch.a9ad91b23017b4a5b4d932a3308e7d01c7d3e2b818c3f97aec97a2e6c4d84b76 +#+flex.9932a9f8ecb68402064c7e9d55016e67ad749354d5b0be8f8bf3cf61595b9f2d +#+bison.2c7e2de665ce478ad51444c93095daae85941d2d799a2d07cc660ed70a183570 +#+rsync.d8f0d4edd6db0f5634a556d9f446e3eaf9a3ecd75c55fe6afaf76ed32cac69d4 +#+zstd.882f63fc1174ecc43e0027d152b877ad782b3de1a3703b4f097243bf001b41bd +#+libelf.0562054205027a6824bf3b5727e81efb7862bfb36da2d907ef64b0665ecf42f9 +#+pkgconf-pkg-config.9d3eb62889748d5b435ad8f0849b29bab5640663c9c3044ac5224fb183599175 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch -#printf '%s\n' "TODO: fix paths"; exit 1 -export CPATH="$pthbs_build_environment/include" + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 'linux-6.15' + patch -p1 -N <../noobjtool.patch + +export CPATH="$pthbs_build_environment/include" + cp -v ../linux.config .config make olddefconfig diff -u ../linux.config .config || true + + make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ V=1 \ HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \ HOSTCFLAGS="-L$pthbs_build_environment/library" -installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package" -mkdir -p "$installdir/doc/linux" "$installdir/boot" -cp -v .config "$installdir/config" -mv Documentation/* "$installdir/doc/linux" + +mkdir -p "${dest}/doc/linux" "${dest}/boot" +cp -v .config "${dest}/config" +mv Documentation/* "${dest}/doc/linux" make modules_install install \ - INSTALL_MOD_PATH="$installdir/kernel" \ + INSTALL_MOD_PATH="${dest}/kernel" \ INSTALL_MOD_STRIP=1 \ - INSTALL_PATH="$installdir/boot" \ - INSTALL_DTBS_PATH="$installdir/boot/dtbs" + INSTALL_PATH="${dest}/boot" \ + INSTALL_DTBS_PATH="${dest}/boot/dtbs" + # remove dangling symlinks -module_dir="$installdir/kernel/lib/6.15.0" +module_dir="${dest}/kernel/lib/6.15.0" rm -f "$module_dir/build" "$module_dir/source" + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -77,6 +89,10 @@ 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 } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -107,3 +123,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -1,46 +1,69 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 -#+pthbs-banginstall.3363a58d50b6fa5c0139b588f6a41d3be0956d9de66eee76a2814eda5a6f8361 -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+ccx-utils.3ff2c11fd963448e6622a9c6f3119797615f55e08004db819be896144217712b -#@git:52261504e78293b651e73a518834c5c75d0b3bf6:logincaps - -: ${JOBS:=1} + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 +#+pthbs-banginstall.1f4d596317f992fdad03b054d4c93a6f1576b029d3de49864d7e8d3142338d8f + +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+ccx-utils.1c6715cb75513a3e3289e34b95253af01a453053a6d43510969accccd249c6d8 + + + + prefix=/home/ccx/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'logincaps' + + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi -pthbs-banginstall etc/loginexec "$pkgdir" -cat >"$pkgdir/command/login-keepenv" <<EOF + +pthbs-banginstall etc/loginexec "${dest}" + +cat >"${dest}/command/login-keepenv" <<EOF #!$(which execlineb) -S0 $prefix/command/login -p \$@ EOF -chmod +x "$pkgdir/command/login-keepenv" +chmod +x "${dest}/command/login-keepenv" cd login sh build_static.sh -DLOGINEXEC_PATH="\"$prefix/command/loginexec\"" -cp -a login "$pkgdir/command/" +cp -a login "${dest}/command/" + + +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} +check_static command/login cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -67,8 +90,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -99,3 +125,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/m4 b/variants/ccx-x86_64/m4 @@ -1,16 +1,33 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+busybox-findutils.22d843ffd957ad9d836a5c7650f77a894cc06c6a073e8a1aef58273fde9ca7d8 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,37 +47,28 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'm4-1.4.19' -autotools_static m4-1.4.19 --disable-nls -check_static command/m4 +autotools_config_static --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/m4 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -84,6 +92,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -114,3 +126,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts @@ -1,19 +1,15 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 -#+pthbs-banginstall.3363a58d50b6fa5c0139b588f6a41d3be0956d9de66eee76a2814eda5a6f8361 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 +#+pthbs-banginstall.1f4d596317f992fdad03b054d4c93a6f1576b029d3de49864d7e8d3142338d8f #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -def_prefix -def_dest +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 @@ -42,6 +38,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -72,3 +72,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd @@ -1,29 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0 -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd - -: ${JOBS:=1} + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6 +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 + + + + prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 'mdevd' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -45,6 +55,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -75,3 +89,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#+s6.367e7e989067970115092f834c89fd0e8c3d65849980e38887d640c0647e615f -#+mdev-scripts.3be91ad39cb9d0c38d4e6cb6e7a5fd5e027bba45849f5a26cb76eefcfca011d4 -#+mdevd.a86c15e40d3a5f339af7d693e4069aefddee6dbf5b25e049362a3afd418319ec- \ No newline at end of file +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 +#+s6.522148297e5c398b07c4e0929d601a2e5c325d5bb674344189ecb3449a53fa0d +#+mdev-scripts.6ae56adbf64416009146d19f03e262794e187bebb7decdd783a1e5fefaf0b520 +#+mdevd.cda74f6f9629b81256c683abe7d4db038b86cea59801219a58d86ccd9018aff4+ \ No newline at end of file diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog @@ -1,13 +1,36 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'mlog' + + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static name=mlog +make "$name" + + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static() { local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -18,25 +41,6 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -build_env_static -def_prefix - -cd mlog -make "$name" - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" check_static "command/$name" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" @@ -60,6 +64,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -90,3 +98,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.63ab1a1e9dbbb93a1295c33b1a652fb16cbe3e5f95b8b60bee3dd618991ed097 -#+gnu-make.4e7ff4ad6d9b4f6633a2aed2993748d465f18ffee42cbe26d5db8eafcc30f2c7 -#+busybox.98e093a9944b8b50cd7822e1d49484b6e0fab3976e23ff2c6c7a6f9110bd9b8a -#@git:6f3701d08137496d5aac479e3a3977b5ae993c1f:musl-cross-make +#+musl-cross-make.a7587853f32f73ae7d1eff4ff37d6cbe50b66e80560e7062689e2dacd99426dc +#+gnu-make.f4066c7a1fb97a10c58e8eb546afb5b31f27e5019998dee1803c70cc6d69d119 +#+busybox.de68bdf5d1c935618a4cc67fe7609805d170d87fcd8cb021c0734348574316db #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -14,7 +13,14 @@ #@sha256:4213e75809588e3f32ae0fde8fb11df2dfd6e0e013762ff5ee951c3aadb7ffc0:musl-cross-make/patches/linux-6.5.4/0001-no-rsync-headers.diff #@sha256:68140a82582ede938159630bca0fb13a93b4bf1cb2e85b08943c26242cf8f3a6:zpipe.c -: ${JOBS:=1} +#@git:6f3701d08137496d5aac479e3a3977b5ae993c1f:musl-cross-make + + + + +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 @@ -34,11 +40,10 @@ 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 - - make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make || exit $? make -C musl-cross-make install || exit $? @@ -77,13 +82,13 @@ printf '%s\n' > "$dd/library/pkgconfig/zlib.pc" \ 'Libs: -L${libdir} -lz' \ 'Cflags: -I${includedir}' + # validate zlib "$dd"'/bin/x86_64-linux-musl-gcc' -I"$dd/include" -L"$dd/lib" -static -o zpipe zpipe.c -lz ./zpipe <true.c >true.c.gz ./zpipe -d <true.c.gz >true.c.2 cmp -s true.c true.c.2 - cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -120,6 +125,10 @@ $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 } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -150,3 +159,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/musl-cross-make:bootstrap-0 b/variants/ccx-x86_64/musl-cross-make:bootstrap-0 @@ -1,7 +1,6 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#@git:6f3701d08137496d5aac479e3a3977b5ae993c1f:musl-cross-make #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:c95da32f440378d7751dd95533186f7fc05ceb4fb65eb5b85234e6299eb9838e:musl-cross-make/sources/gcc-9.4.0.tar.xz @@ -11,7 +10,14 @@ #@sha256:c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc:musl-cross-make/sources/mpfr-4.0.2.tar.bz2 #@sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:musl-cross-make/sources/musl-1.2.5.tar.gz -: ${JOBS:=1} +#@git:6f3701d08137496d5aac479e3a3977b5ae993c1f:musl-cross-make + + + + +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 @@ -24,6 +30,7 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* + # Patch linker path for dynamic executables make -C musl-cross-make gcc-9.4.0 sed -i -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-9.4.0/gcc/config/*/linux*.h @@ -67,6 +74,10 @@ $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 } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -97,3 +108,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.9ad89a87d4770e3d4d212ffcf8acae6196dd65f2f00aab0662724d931f3a20e3 -#@git:6f3701d08137496d5aac479e3a3977b5ae993c1f:musl-cross-make +#+musl-cross-make.7240e0c4d86e9ddcf6ff42cd29fa606962675c33f500ef4c9869225a4030f6fe #@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 @@ -12,8 +11,16 @@ #@sha256:c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc:musl-cross-make/sources/mpfr-4.0.2.tar.bz2 #@sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:musl-cross-make/sources/musl-1.2.5.tar.gz -: ${JOBS:=1} -bootstrap=/home/ccx/versions/musl-cross-make.9ad89a87d4770e3d4d212ffcf8acae6196dd65f2f00aab0662724d931f3a20e3 +#@git:6f3701d08137496d5aac479e3a3977b5ae993c1f:musl-cross-make + + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' + +bootstrap=/home/ccx/versions/musl-cross-make.7240e0c4d86e9ddcf6ff42cd29fa606962675c33f500ef4c9869225a4030f6fe "$bootstrap/bin/x86_64-linux-musl-gcc" --version # For validating the compiler @@ -31,6 +38,7 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* + # Patch linker path for dynamic executables make -C musl-cross-make gcc-11.2.0 sed -i -e 's|/lib/ld-musl-|/home/ccx/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h @@ -75,6 +83,10 @@ $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 } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -105,3 +117,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,34 +49,24 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'musl-fts-1.2.7' + + + +autotools_config_static -autotools_static musl-fts-1.2.7 + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install @@ -84,6 +93,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -114,3 +127,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/netbsd-curses b/variants/ccx-x86_64/netbsd-curses @@ -1,17 +1,27 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#@git:51d179dad861640caeb76674b5908ccd79f04fae:curses +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d + +#@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses + + + + +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" export CPATH="$pthbs_build_environment/include" -cd curses -prefix=/home/ccx/versions/$pthbs_package + make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + cat << EOF > config.mak PREFIX=$prefix PREFIX="$prefix" @@ -25,6 +35,7 @@ EOF make -j${JOBS:-1} -l$((1+${JOBS:-1})) make install-static + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -47,6 +58,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -77,3 +92,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/openssl b/variants/ccx-x86_64/openssl @@ -1,9 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d #@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. + + + +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" @@ -12,11 +20,16 @@ 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})) install +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + check_static command/openssl check_static command/ocspcheck - cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -43,6 +56,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -73,3 +90,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/patch b/variants/ccx-x86_64/patch @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,42 +49,33 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'patch-2.7.6' -autotools_static patch-2.7.6 --disable-nls -check_static command/patch +autotools_config_static --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/patch cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { -} + x["./command/patch"]=1} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -83,6 +93,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -113,3 +127,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/patchelf:bootstrap b/variants/ccx-x86_64/patchelf:bootstrap @@ -3,11 +3,28 @@ #@pragma:nopath #@git:523f401584d9584e76c9c77004e7abeb9e6c4551:patchelf + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -27,38 +44,28 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } -cd patchelf +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'patchelf' + + + ./bootstrap.sh -autotools_static . --disable-nls -check_static command/patchelf +autotools_config_static . --disable-nls + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) +make DESTDIR="$pthbs_destdir" install + + + +check_static command/patchelf cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -82,6 +89,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -112,3 +123,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,39 +49,29 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'pkgconf-2.1.1' + + export LDFLAGS=--static -autotools_static pkgconf-2.1.1 --with-pkg-config-dir= +autotools_config_static --with-pkg-config-dir= -check_static command/pkgconf + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) +make DESTDIR="$pthbs_destdir" install + + + +check_static command/pkgconf cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -85,6 +94,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -115,3 +128,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/pkgconf-pkg-config b/variants/ccx-x86_64/pkgconf-pkg-config @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+pkgconf.7e97d0518b45eb8d6bc150e27aa21dcc0aae76f5a3a5a44170228ef5182973d3 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+pkgconf.ecb418d26553780952ecae4817aee97e78124ccc9f0fb18abfa7eaf5eb91f445 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,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -30,33 +49,25 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } -autotools_static popt-1.19 --disable-nls +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'popt-1.19' + + + +autotools_config_static --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" @@ -82,6 +93,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -112,3 +127,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/pthbs-banginstall b/variants/ccx-x86_64/pthbs-banginstall @@ -1,12 +1,22 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall -installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package" -mkdir -p "$installdir/command" + + + + +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 "$installdir" +zsh -x pthbs-banginstall pthbs-banginstall "${dest}" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -30,6 +40,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -60,3 +74,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync @@ -1,19 +1,38 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 -#+popt.78b253f756cb92d99a26ed8e8b346555b5b7aa0300dd6fbc1cb5b54c74f8fed4 -#+libressl.f7550f89bb0983ebf3174cdb582653fd8c4beb5b1c510c5c153a8b1b749298e0 -#+zstd.a392f13b313906f193e77b6894f9e30ecb529e33d37b9ddf534889654d550312 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd +#+popt.fc8ebc51efe1aba4e7c09de9eaf7b13492cf27d8ffd7d8c89a8e1faa17da8019 +#+libressl.ebfd6cb2c406e77dedce908fee1a4ce6d7d7d07be7adaafd5b63a959730e9cb1 +#+zstd.882f63fc1174ecc43e0027d152b877ad782b3de1a3703b4f097243bf001b41bd #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -33,43 +52,34 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'rsync-3.2.7' + -autotools_static rsync-3.2.7 \ - --without-included-popt \ + +autotools_config_static --without-included-popt \ --enable-openssl \ --enable-zstd \ --disable-xxhash \ --disable-lz4 -check_static command/rsync +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/rsync + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -93,6 +103,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -123,3 +137,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6 @@ -1,31 +1,40 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+patch.1384f499bf9486b2bbf1d782976b71e8440a9b2c4640e3d64fef41573113f9e3 -#+skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0 -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6 +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 + #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 -: ${JOBS:=1} + + prefix=/home/ccx/versions/$pthbs_package -cd s6 -./configure \ +dest=${pthbs_destdir%/}${prefix} +cd 's6' + +./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6/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 + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -47,6 +56,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -77,3 +90,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/s6-dns b/variants/ccx-x86_64/s6-dns @@ -1,28 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns -: ${JOBS:=1} + + + prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 's6-dns' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -44,6 +55,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -74,3 +89,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/s6-linux-init b/variants/ccx-x86_64/s6-linux-init @@ -1,30 +1,41 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0 -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#+s6.367e7e989067970115092f834c89fd0e8c3d65849980e38887d640c0647e615f + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6 +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 +#+s6.522148297e5c398b07c4e0929d601a2e5c325d5bb674344189ecb3449a53fa0d #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init -: ${JOBS:=1} + + + prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 's6-linux-init' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -46,6 +57,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -76,3 +91,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/s6-linux-utils b/variants/ccx-x86_64/s6-linux-utils @@ -1,28 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils -: ${JOBS:=1} + + + prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 's6-linux-utils' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -44,6 +55,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -74,3 +89,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking @@ -1,32 +1,43 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0 -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#+s6.367e7e989067970115092f834c89fd0e8c3d65849980e38887d640c0647e615f -#+s6-dns.cf91ba83b9e1b69f1d3296166bbdc70375f1f744bc12cac066d90feba9cd70d2 -#+libressl.f7550f89bb0983ebf3174cdb582653fd8c4beb5b1c510c5c153a8b1b749298e0 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6 +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 +#+s6.522148297e5c398b07c4e0929d601a2e5c325d5bb674344189ecb3449a53fa0d +#+s6-dns.ce0cdb49a015dde5682205748020444345a70a62e035261258e0c92074a771c8 +#+libressl.ebfd6cb2c406e77dedce908fee1a4ce6d7d7d07be7adaafd5b63a959730e9cb1 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking -: ${JOBS:=1} + + + prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 's6-networking' + ./configure --enable-ssl=libtls \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -52,6 +63,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -82,3 +97,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/s6-portable-utils b/variants/ccx-x86_64/s6-portable-utils @@ -1,28 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils -: ${JOBS:=1} + + + prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 's6-portable-utils' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -44,6 +55,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -74,3 +89,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/s6-rc b/variants/ccx-x86_64/s6-rc @@ -1,30 +1,41 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0 -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#+s6.367e7e989067970115092f834c89fd0e8c3d65849980e38887d640c0647e615f + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6 +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 +#+s6.522148297e5c398b07c4e0929d601a2e5c325d5bb674344189ecb3449a53fa0d #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc -: ${JOBS:=1} + + + prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 's6-rc' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.0875ac922c99627f1ac3080bf1edd8471b03272afaf5d7ace9b1ba4ca71a83e0/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.067d50b57b69120c762d28c3a8b414e4b35518df254379b341b58905036088c6/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -46,6 +57,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -76,3 +91,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/skalibs b/variants/ccx-x86_64/skalibs @@ -1,20 +1,23 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs -: ${JOBS:=1} + + + +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" export AR="$pthbs_build_environment/command/x86_64-linux-musl-ar" - export CFLAGS="-O2 -ggdb" -prefix=/home/ccx/versions/$pthbs_package -cd skalibs ./configure \ --prefix="$prefix" \ --sysdepdir="${prefix}/sysdeps" \ @@ -26,8 +29,12 @@ cd skalibs --disable-shared --enable-static make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -49,6 +56,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -79,3 +90,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep @@ -1,31 +1,38 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 -#+pthbs-banginstall.3363a58d50b6fa5c0139b588f6a41d3be0956d9de66eee76a2814eda5a6f8361 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 +#+pthbs-banginstall.1f4d596317f992fdad03b054d4c93a6f1576b029d3de49864d7e8d3142338d8f + #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep -: ${JOBS:=1} + + + prefix=/home/ccx/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'snaprep' + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -48,8 +55,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -80,3 +90,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace @@ -1,19 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 -#+patch.1384f499bf9486b2bbf1d782976b71e8440a9b2c4640e3d64fef41573113f9e3 -#+libunwind.a3d44fe5b66d385a2323d15f56a3382ebca1b9514753852be41a00d20687ae31 -#@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd +#+patch.a9ad91b23017b4a5b4d932a3308e7d01c7d3e2b818c3f97aec97a2e6c4d84b76 +#+libunwind.99db1b5f60b59630661a9348630dc4fb8dcfd19bd629d9ca09848d1c105d3a1a #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch +#@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. + + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -33,39 +53,31 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'strace-6.13' + + -cd strace-6.13 patch -p1 <../strace-6.5-static.patch -autotools_static . --with-unwind --without-libdw --enable-mpers=check -check_static command/strace +autotools_config_static --with-unwind --without-libdw --enable-mpers=check + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/strace cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -92,6 +104,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -122,3 +138,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -1,29 +1,30 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+diffutils.cacfc9d2fd98544386065c1b55a8398ad5c52a4cc0b5cc34212ad40cb287fda1 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+aat.bc32d18c7f99a8ef2652c0e018e79b5e1f27f836fbaf23be8da29e067a450451 -#+fileset.23a9a61f343ebd352febcf6b00e9e60efbd2bf31293169764d1f1892e9cf2f98 -#+rsync.7d51808b49edaf9c3258d04510e8d995e4233109ac038215187ca1981dcd5854 -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#+kbd.efb626cba49b915fd083f7ce2c3224ad67ba5343247839cbf2286c816ca00208 -#+mdevd.a86c15e40d3a5f339af7d693e4069aefddee6dbf5b25e049362a3afd418319ec -#+s6-linux-utils.908237c5b632e4c4f391cf752caa6ee1b9dc9df90d5486e2bbe113ab8e9105a7 -#+s6-rc.caf6c5c71b99aa4c54d9cb2055cd300f42618a9719cd32ae06118c3ca6e9cbfa -#+s6.367e7e989067970115092f834c89fd0e8c3d65849980e38887d640c0647e615f -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 -#+system-config-scripts.12cd80d905a32c81c3e35eaa49a63c56c3194caff1645106ac42e8bb617e6c93 -#+logincaps.4b0964e4aa4fb0c87c6bd640c97629ed423b2e58a56ca1ea2f45eae99979e60e +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+diffutils.ba0904750433febf42fbf68ba7acad949323fc6c714f59955d3962fcc50e6e2e +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+aat.597c91703d9f562fb7f394451b7cb31f815027cdb583512c1971785546fc6c28 +#+fileset.e240e6b64ac6a7df9b2d4680fe2c590a2cb2c63757b1293070c2fac2cad52f2e +#+rsync.d8f0d4edd6db0f5634a556d9f446e3eaf9a3ecd75c55fe6afaf76ed32cac69d4 +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 +#+kbd.6df32d65dc68080fd1086ab997083c61165d277ee9abc898f572d40ab502524d +#+mdevd.cda74f6f9629b81256c683abe7d4db038b86cea59801219a58d86ccd9018aff4 +#+s6-linux-utils.72ae517a132daf7c6d0f671fa0279c7311a22e17d5fb6ba32e8f34b80a3c0002 +#+s6-rc.f0c682dcfd7634ca697be3bae9da99241c8b3d4fe52a3f9e1029141adfe7f93e +#+s6.522148297e5c398b07c4e0929d601a2e5c325d5bb674344189ecb3449a53fa0d +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 +#+system-config-scripts.9991313c03cd257aec6ba0c30b8d51ff62c70f63cd06a0dcdb80b1856684be00 +#+logincaps.e0abfe709b527e5f0c5158ebad0a6eb28cad9b2dd334035d00ad6025a20ffc36 #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -def_prefix -def_dest + + + +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 @@ -39,8 +40,6 @@ linkdep() { ln -sf $exe "$dest/deps/command/$name" } -cd 'system-config' - printf '%s\n' >config/etc/motd \ "Welcome to $(cat ./config/hostname)!" \ 'Current running configuration was generated from system-config:cdeb78362ceacd8087b1d04ef26573cb115b7844' \ @@ -52,8 +51,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.5388b5d568ff1717654de4cfdec4e4065a72549631ae313632387468c621bb5e' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.834cbb185c1ca7a68353b96bd1a00fd79b949b9ecdcc3d016e30fef91cad9304' \ + 'pthbs_path_containers=/home/ccx/versions/env.27766d19bdea34153358e14a6f2e7cf20c9dd58c4cde20a1316674f64a47398d' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.b7f3d67936c9eaeb13a01d44fb986f107bd100f94c2eae2492f763610a9d6156' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do @@ -78,6 +77,12 @@ mv -v keys "$dest/" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { + x["./command/install-as-current-environment.postinstall"]=1 + x["./config/etc/fstab"]=1 + x["./config/etc/motd"]=1 + x["./config/etc/skel/loginexec"]=1 + x["./config/hostname"]=1 + x["./keys/ssh/root"]=1 } function r1(s) { @@ -98,6 +103,8 @@ $1!="."{exit 1} $2 == "config" { link($0); next } $2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -128,3 +135,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -1,32 +1,39 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+s6.367e7e989067970115092f834c89fd0e8c3d65849980e38887d640c0647e615f -#+s6-rc.caf6c5c71b99aa4c54d9cb2055cd300f42618a9719cd32ae06118c3ca6e9cbfa -#+s6-portable-utils.354e2614604eb3a28327e951979aee25c6548f055d8d9ac853810d662ca7fb3c -#+s6-linux-init.4cf1980b42f22c2c084d83f258965b2ce5bb9d2b19665908ca4e9f2df857ba22 -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#+system-config-rc.4c510f8853962a801a7e0dc2d84dfa531979a24e09cf6746e91bc4351f01463f - -s6rcdb=/home/ccx/versions/system-config-rc.4c510f8853962a801a7e0dc2d84dfa531979a24e09cf6746e91bc4351f01463f/config/s6-rc-db +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+s6.522148297e5c398b07c4e0929d601a2e5c325d5bb674344189ecb3449a53fa0d +#+s6-rc.f0c682dcfd7634ca697be3bae9da99241c8b3d4fe52a3f9e1029141adfe7f93e +#+s6-portable-utils.169331146530c0b8731fadf95717d3f7a8908fbfad584cf2c84bee2a88296750 +#+s6-linux-init.95a8eeb024ab85fede8e322e4628b6e957dce0fd63264e173d2bfc9fefa01dec +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 +#+system-config-rc.9fec2190c51b2b1efd47bfe3a90a7ce6cd140d1eae1868198a060de4f5bf595e + + + + + prefix=/home/ccx/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" +dest=${pthbs_destdir%/}${prefix} +cd 'system-config-init' + -q() { +q() { # quote list of strings to be suitable for execline "s6-quote" "$@" } - -qx() { +qx() { # register executable as dependency and quote full path to be suitable for execline exe=$(realpath "$(which "$1")") name=$(basename "$1") if ! test -x "$exe"; then printf 'Error: executable not found: %s\n' "$1" fi - mkdir -p "$pkgdir/deps/command" - ln -sf $exe "$pkgdir/deps/command/$name" + mkdir -p "${dest}/deps/command" + ln -sf $exe "${dest}/deps/command/$name" "s6-quote" "$prefix/deps/command/$name" } -# Generate init ($pkgdir must not exist but parent dir does) +s6rcdb=/home/ccx/versions/system-config-rc.9fec2190c51b2b1efd47bfe3a90a7ce6cd140d1eae1868198a060de4f5bf595e/config/s6-rc-db + +# Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//home/ccx/versions" s6-linux-init-maker \ -p "/run/current/command:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ @@ -34,7 +41,7 @@ s6-linux-init-maker \ -t 1 \ -N \ -c "$prefix" \ - "$pkgdir" + "${dest}" # Link deps that are passed to s6-l-i-m @@ -46,17 +53,17 @@ qx execlineb el=$prefix/deps/command/$name # Rewrite bin/init as it fails finding it's own s6-linux-init -s6-cat >"$pkgdir/bin/init.new" <<EOF || exit $? +s6-cat >"${dest}/bin/init.new" <<EOF || exit $? #!$el -S0 $(qx pthbs-enter) $(qx s6-envdir) -I /run/current/env EOF -s6-cat >>"$pkgdir/bin/init.new" <"$pkgdir/bin/init" -chmod +x "$pkgdir/bin/init.new" -mv -v "$pkgdir/bin/init.new" "$pkgdir/bin/init" +s6-cat >>"${dest}/bin/init.new" <"${dest}/bin/init" +chmod +x "${dest}/bin/init.new" +mv -v "${dest}/bin/init.new" "${dest}/bin/init" # Rewrite dynamically generated scripts -s6-cat >"$pkgdir/scripts/rc.init" <<EOF || exit $? +s6-cat >"${dest}/scripts/rc.init" <<EOF || exit $? #!$el -S1 $(qx export) TERM "linux" $(qx foreground) { $(qx s6-echo) "* Starting s6-rc from "$(q "$s6rcdb") } @@ -64,7 +71,7 @@ $(qx if) { $(qx s6-rc-init) -d -c $(q "$s6rcdb") /run/service } $prefix/scripts/runlevel \$1 EOF -s6-cat >"$pkgdir/scripts/rc.shutdown" <<EOF || exit $? +s6-cat >"${dest}/scripts/rc.shutdown" <<EOF || exit $? #!$el -P ### Things to do before hardware halt/reboot/poweroff. @@ -76,7 +83,7 @@ $(qx redirfd) -w 2 /dev/console $(qx s6-rc) -v2 -bDa change EOF -s6-cat >"$pkgdir/scripts/runlevel" <<EOF || exit $? +s6-cat >"${dest}/scripts/runlevel" <<EOF || exit $? #!$el -S1 export TERM "linux" @@ -103,16 +110,34 @@ $(qx foreground) { $(qx s6-svc) -d /run/service/console-log-tail } $(qx s6-rc) -v 2 -t 600000 -- change ok-all EOF -s6-mkdir "$pkgdir/run-image/service/console-log-tail" || exit $? -s6-cat >"$pkgdir/run-image/service/console-log-tail/run" <<EOF || exit $? +s6-mkdir "${dest}/run-image/service/console-log-tail" || exit $? +s6-cat >"${dest}/run-image/service/console-log-tail/run" <<EOF || exit $? #!$el -P $(qx redirfd) -w 1 /dev/console $(qx fdmove) -c 2 1 $(qx pipeline) -w { $(qx s6-tai64nlocal) } $(qx tail) -F -n +1 /run/uncaught-logs/current EOF -s6-chmod 755 "$pkgdir/run-image/service/console-log-tail/run" exit $? +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 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} +check_static bin/init +check_static bin/halt +check_static bin/poweroff +check_static bin/reboot cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -138,6 +163,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -168,3 +197,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc @@ -1,23 +1,26 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+s6-rc.caf6c5c71b99aa4c54d9cb2055cd300f42618a9719cd32ae06118c3ca6e9cbfa -#+fileset.23a9a61f343ebd352febcf6b00e9e60efbd2bf31293169764d1f1892e9cf2f98 -#+system-config.869f5be306cf81e1750659145a70bddb3d2e4ed99ae695f25d769b71442ff480 - -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -def_dest +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+s6-rc.f0c682dcfd7634ca697be3bae9da99241c8b3d4fe52a3f9e1029141adfe7f93e +#+fileset.e240e6b64ac6a7df9b2d4680fe2c590a2cb2c63757b1293070c2fac2cad52f2e +#+system-config.ae572e99b91758bc34c7c76735eadec2e1064b4269eeed97b9e748bcdbf65d36 + + + -src=/home/ccx/versions/system-config.869f5be306cf81e1750659145a70bddb3d2e4ed99ae695f25d769b71442ff480/config/s6-rc-source + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'system-config-rc' + + +src=/home/ccx/versions/system-config.ae572e99b91758bc34c7c76735eadec2e1064b4269eeed97b9e748bcdbf65d36/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -40,6 +43,9 @@ $1!="."{exit 1} $2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -70,3 +76,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/system-config-scripts b/variants/ccx-x86_64/system-config-scripts @@ -1,31 +1,37 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 -#+pthbs-banginstall.3363a58d50b6fa5c0139b588f6a41d3be0956d9de66eee76a2814eda5a6f8361 -#@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts -: ${JOBS:=1} +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 +#+pthbs-banginstall.1f4d596317f992fdad03b054d4c93a6f1576b029d3de49864d7e8d3142338d8f + + + + + prefix=/home/ccx/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'system-config-scripts' + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi + + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -48,8 +54,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -80,3 +89,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/system-config-zsh b/variants/ccx-x86_64/system-config-zsh @@ -1,22 +1,23 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 + #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package -} -def_prefix -def_dest + + +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 { @@ -38,8 +39,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } -$2 == "vimfiles" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -70,3 +73,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env @@ -1,13 +1,23 @@ #!/usr/bin/env pthbs-build -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#+pthbs-banginstall.3363a58d50b6fa5c0139b588f6a41d3be0956d9de66eee76a2814eda5a6f8361 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 +#+pthbs-banginstall.1f4d596317f992fdad03b054d4c93a6f1576b029d3de49864d7e8d3142338d8f #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env -installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package" -mkdir -p "$installdir/command" + + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' + + +mkdir -p "${dest}/command" chmod +x user-env -pthbs-banginstall user-env "$installdir" +pthbs-banginstall user-env "${dest}" + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -31,6 +41,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -61,3 +75,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+diffutils.cacfc9d2fd98544386065c1b55a8398ad5c52a4cc0b5cc34212ad40cb287fda1 -#+patch.1384f499bf9486b2bbf1d782976b71e8440a9b2c4640e3d64fef41573113f9e3 -#+flex.921ee0ec90ca6f2efbc5c7b8bc88386036a1ccf9e3bb2a0e25f933e1f9481a9b -#+bison.2d200b9031bcf3e27296618f74d67c41a5b09134654c9b9dd0d9acd405fa1c4f -#+rsync.7d51808b49edaf9c3258d04510e8d995e4233109ac038215187ca1981dcd5854 -#+execline.906c74789cdfe5bb06bc8c9b7806fd9ccef7071d59756cafc455d9c773585ac8 -#+s6.367e7e989067970115092f834c89fd0e8c3d65849980e38887d640c0647e615f -#+s6-rc.caf6c5c71b99aa4c54d9cb2055cd300f42618a9719cd32ae06118c3ca6e9cbfa -#+s6-portable-utils.354e2614604eb3a28327e951979aee25c6548f055d8d9ac853810d662ca7fb3c -#+s6-linux-utils.908237c5b632e4c4f391cf752caa6ee1b9dc9df90d5486e2bbe113ab8e9105a7 -#+s6-linux-init.4cf1980b42f22c2c084d83f258965b2ce5bb9d2b19665908ca4e9f2df857ba22 -#+mdevd.a86c15e40d3a5f339af7d693e4069aefddee6dbf5b25e049362a3afd418319ec -#+s6-dns.cf91ba83b9e1b69f1d3296166bbdc70375f1f744bc12cac066d90feba9cd70d2 -#+libressl.f7550f89bb0983ebf3174cdb582653fd8c4beb5b1c510c5c153a8b1b749298e0 -#+s6-networking.407a9744f996d75d61acbe7aeef8b0018807455aae3b456cac372efb32e80059 -#+zsh.5b9847dd8eba587c859ee318d14b126fd0022f28524ca69a31c005a8523c3b69 -#+pthbs-banginstall.3363a58d50b6fa5c0139b588f6a41d3be0956d9de66eee76a2814eda5a6f8361 -#+aat.bc32d18c7f99a8ef2652c0e018e79b5e1f27f836fbaf23be8da29e067a450451 -#+confz.721425935caa67289b7a227f6a914fbdc8574255a30bcd7096c13912af02e237 -#+containers.dc7aefdff085732d8ec7a9b49968e5b30a5536a3cafc6add0bf4b0e5b2b76901 -#+fileset.23a9a61f343ebd352febcf6b00e9e60efbd2bf31293169764d1f1892e9cf2f98 -#+logincaps.4b0964e4aa4fb0c87c6bd640c97629ed423b2e58a56ca1ea2f45eae99979e60e -#+snaprep.47e04fa40316f8e014e4f54ef23c17dee768861d29ee157737b59287e5d9b860 -#+curl.1bba2eb7a53982eb6690b7aebe830652fc6a5c178c6c784cfcbfd0b822b1befc -#+git.b178f23a36a18c9172d8faacb1de683c37c2967d3ecd74f3683658630cd67f36 -#+xbps.52e3b5d022897b5c6b3ff66855ff231b4dab126006473d1170f2604a22bdc8ed -#+apk-tools.9c7b66673cd405a3550e75818f7ae4b0337e90d80daf87b2f252969b87bb6a9e -#+getent.2c4259899864ea31756a27a790671e33508b3b6f8320ff40765527626767a584 -#+getconf.6615e49af7e60dad0a5c2c636ad575dd22d332eb9f48b61f4d79db3103834c56 -#+iconv.d3d5af9b3a0aa6c0d9b8233c3e98484c033e330e0162af1f3ea49a1f097f9803 -#+libcap.d01395760d734c2e0bbda7a4361145d2b3b2bd5344b9860a16e52fa14af4e6a7 -#+applyuidgid-caps.3cda5159c18aa3bbfd333ed4c693cc7855a4101f483ec0d913c60d55dc84601b -#+ccx-utils.3ff2c11fd963448e6622a9c6f3119797615f55e08004db819be896144217712b -#+user-env.f4e3a9c94b8e365751d0476bb5640eb0d87e7a0435acf23e935c2976969e730b -#+strace.d5a210bea4ca1032ad6af8ba424603c5a34f278b1ec23c7036cbbece0c902aa1 -#+mlog.c721dc6fe10da70f390420f73b65f91adf9b38455794a38654ecad8926884dbf- \ No newline at end of file +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+diffutils.ba0904750433febf42fbf68ba7acad949323fc6c714f59955d3962fcc50e6e2e +#+patch.a9ad91b23017b4a5b4d932a3308e7d01c7d3e2b818c3f97aec97a2e6c4d84b76 +#+flex.9932a9f8ecb68402064c7e9d55016e67ad749354d5b0be8f8bf3cf61595b9f2d +#+bison.2c7e2de665ce478ad51444c93095daae85941d2d799a2d07cc660ed70a183570 +#+rsync.d8f0d4edd6db0f5634a556d9f446e3eaf9a3ecd75c55fe6afaf76ed32cac69d4 +#+execline.74a6dcbb8cbbf5d8c7e3e43d965442627da7519882db84d4f965d87eaec06908 +#+s6.522148297e5c398b07c4e0929d601a2e5c325d5bb674344189ecb3449a53fa0d +#+s6-rc.f0c682dcfd7634ca697be3bae9da99241c8b3d4fe52a3f9e1029141adfe7f93e +#+s6-portable-utils.169331146530c0b8731fadf95717d3f7a8908fbfad584cf2c84bee2a88296750 +#+s6-linux-utils.72ae517a132daf7c6d0f671fa0279c7311a22e17d5fb6ba32e8f34b80a3c0002 +#+s6-linux-init.95a8eeb024ab85fede8e322e4628b6e957dce0fd63264e173d2bfc9fefa01dec +#+mdevd.cda74f6f9629b81256c683abe7d4db038b86cea59801219a58d86ccd9018aff4 +#+s6-dns.ce0cdb49a015dde5682205748020444345a70a62e035261258e0c92074a771c8 +#+libressl.ebfd6cb2c406e77dedce908fee1a4ce6d7d7d07be7adaafd5b63a959730e9cb1 +#+s6-networking.07d1d4303ec51d659c3245222c46ee33f54229d3e07047ac917e9ee188532326 +#+zsh.bf093117b013c3ebd5d60f21fc82938a388fe35509c1ffbe1f067417864e05b2 +#+pthbs-banginstall.1f4d596317f992fdad03b054d4c93a6f1576b029d3de49864d7e8d3142338d8f +#+aat.597c91703d9f562fb7f394451b7cb31f815027cdb583512c1971785546fc6c28 +#+confz.648807f2be80fabf6ca7cdcad50bb083639f6c8ea72a473faa8a3979742bec47 +#+containers.aab12b1943f4fef1321f039a3bfc0d416b9eaea597d40db28ea7b837625271a4 +#+fileset.e240e6b64ac6a7df9b2d4680fe2c590a2cb2c63757b1293070c2fac2cad52f2e +#+logincaps.e0abfe709b527e5f0c5158ebad0a6eb28cad9b2dd334035d00ad6025a20ffc36 +#+snaprep.0ce7618b224e4dfa798dcc17170a15c55746c17fa99781e879c578345dae2764 +#+curl.27bc202eb9cd3f0fe0aaffc7d900de9a37691652c51b06f1eae0883af13cc106 +#+git.a9916b4bd37d467e43bca909195f586c3863997ce81ec39358fb8778653f017e +#+xbps.c3252991f24d0a565a7fe2726658bb328356120003dc48e5d44473fdfda2420e +#+apk-tools.21f855af757e2d5d406d302476a11c936793f65eb91f67430ab24e0af7bb0bb5 +#+getent.c156858661e8d3a0cc5eef48d6c089852a668465beb5a5a521ffae495c75dd99 +#+getconf.81f60393e71b4ec887d30bf2f481b6b4d5387692abba7f9ebdd169993cc10011 +#+iconv.d19e20a396f9b4da77db122178b50c3caca5421d2acdabdca0535a3cbc2aa09b +#+libcap.e576044e47578b58cf99a08211d6316b6e97e59021d661f688d6730d8e8b645a +#+applyuidgid-caps.b99410f494c58ef6c6acfac9f60235edb3d4b018754150d7c1c2fb1ec22f2ae9 +#+ccx-utils.1c6715cb75513a3e3289e34b95253af01a453053a6d43510969accccd249c6d8 +#+user-env.e563fbaa848eb6bfa6eb3fc750890045bebfca39af3afc8d6cc7bded7d875296 +#+strace.66f62a71f0dfe3d715bada1f20d4969fb76452c4f804f44991093207914377fb +#+mlog.2f5a683eed5a6662e555d06055b266c425d1b19a3f0e893934a0bc03d51effb7+ \ 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.a8853b99b3c98c1fc2df7bb4156a505ff6a0826514b180ae1adbf9f4b91cb9ce- \ No newline at end of file +#+linux-qemu-guest.a3dda2970b393102af37397f0e0c29d28c2d8ebe09fcb5fdae00dce7d13e26e9+ \ No newline at end of file diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps @@ -1,80 +1,28 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 -#+libarchive.81959fa037d3cfcaad01b984142c70a65e8255a036ee18446cb59df274807e85 -#+libressl.f7550f89bb0983ebf3174cdb582653fd8c4beb5b1c510c5c153a8b1b749298e0 -#+pkgconf-pkg-config.0684d8ff21c6f3c5694d2d92e4138a00d6e88a195dd2de5b06c160324abdf7eb +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+libarchive.a2e42a03e995e35b33eb2f5ffcb81d6904c9f9694b6ae73fcf0cb4a063b13ac6 +#+libressl.ebfd6cb2c406e77dedce908fee1a4ce6d7d7d07be7adaafd5b63a959730e9cb1 +#+pkgconf-pkg-config.9d3eb62889748d5b435ad8f0849b29bab5640663c9c3044ac5224fb183599175 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -autotools_config() { - prefix=/home/ccx/versions/$pthbs_package - ./configure -C \ - --prefix="$prefix" \ - --build="$(${CC:-gcc} -dumpmachine)" \ - --bindir="$prefix/command" \ - --sbindir="$prefix/command" \ - --infodir="$prefix/info" \ - --localedir="$prefix/locale" \ - --mandir="$prefix/man" \ - --libdir="$prefix/library" \ - --docdir="$prefix/doc/xbps" \ - --datadir="$prefix/data" \ - --datarootdir="$prefix/data" \ - --localstatedir='/var/pthbs' \ - "$@" -} -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} -autotools_static() { - build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'xbps-0.59.2' -def_prefix() { - prefix=/home/ccx/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//home/ccx/versions/$pthbs_package +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } - -export LDFLAGS=--static -export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" build_env_static -def_dest -def_prefix -cd xbps-0.59.2 find lib bin -name '*.c' -exec sed -iEe '/^[\t ]*#[\t ]*define[\t ]+_GNU_SOURCE/d' '{}' \; find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \; + ./configure --verbose \ --prefix="$prefix" \ --build="$(${CC:-gcc} -dumpmachine)" \ @@ -86,8 +34,10 @@ 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" @@ -98,12 +48,25 @@ done 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 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} check_static command/xbps-install.static mkdir -p "$dest/keys" mv -v "$pthbs_destdir/var/db/xbps/keys" "$dest/keys/void" - - cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -126,6 +89,10 @@ $1!="."{exit 1} $2 == "keys" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -156,3 +123,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh @@ -1,19 +1,38 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 -#+m4.2c9d1360555dca95842217b4d94fad7bba339047a74864f8356b0989c89acb33 -#+netbsd-curses.dee367eda0b22afe6a51dfeec3da7d62435c68d539a3d38ad57d8e23e54ebdd4 -#+libbsd.e3ab4892b0b1f90c439a93393a013a06bd0ce136debf9d93c601c46841101111 + +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+m4.d8e8817d1baab25af826cb2f102c1b6c38c358d1f3fc7a16ed3772e808ad35cd +#+netbsd-curses.7c05ffbcfe98099c635d926a9e511716e41f6aea1f5a482de736dd318ec2949a +#+libbsd.c03f1991cba634d9e056173ed7a552b3467a7d2e399c0b32d53670f0e97516d5 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/home/ccx/versions/$pthbs_package ./configure -C \ @@ -33,60 +52,44 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } -build_env_static -cd zsh-5.9 -autotools_config \ - --enable-static --disable-shared \ +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'zsh-5.9' + + + +autotools_config_static --enable-static --disable-shared \ --enable-libc-musl --disable-locale \ --enable-cap \ --enable-maildir-support \ - --enable-datadir="/home/ccx/versions/$pthbs_package" \ - --enable-datarootdir="/home/ccx/versions/$pthbs_package" \ - --enable-etcdir="/home/ccx/versions/$pthbs_package/etc" \ - --enable-scriptdir="/home/ccx/versions/$pthbs_package/zsh/scripts" \ - --enable-site-scriptdir="/home/ccx/versions/$pthbs_package/zsh/site-scripts" \ - --enable-fndir="/home/ccx/versions/$pthbs_package/zsh/functions" \ - --enable-site-fndir="/home/ccx/versions/$pthbs_package/zsh/site-functions" \ - --enable-runhelpdir="/home/ccx/versions/$pthbs_package/zsh/help" + --enable-datadir="${prefix}" \ + --enable-datarootdir="${prefix}" \ + --enable-etcdir="${prefix}/etc" \ + --enable-scriptdir="${prefix}/zsh/scripts" \ + --enable-site-scriptdir="${prefix}/zsh/site-scripts" \ + --enable-fndir="${prefix}/zsh/functions" \ + --enable-site-fndir="${prefix}/zsh/site-functions" \ + --enable-runhelpdir="${prefix}/zsh/help" + sed -Ee '/name=zsh\/(files|stat|system|zselect|zutil|regex|net\/socket|net\/tcp) /s/link=[^ ]+/link=static/' -i config.modules cat config.modules + make -j${JOBS:-1} -l$((1+${JOBS:-1})) cat Src/zshpaths.h make DESTDIR="$pthbs_destdir" install -mv -v ../zsh_config/etc "$pthbs_destdir//home/ccx/versions/$pthbs_package/" -mv -v ../zsh_config/zsh-functions/* "$pthbs_destdir//home/ccx/versions/$pthbs_package/zsh/site-functions/" -check_static command/zsh +mv -v ../zsh_config/etc "${dest}/" +mv -v ../zsh_config/zsh-functions/* "${dest}/zsh/site-functions/" +check_static command/zsh cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -113,6 +116,10 @@ $1!="."{exit 1} $2 == "zsh" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -143,3 +150,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd @@ -1,23 +1,21 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 -#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b -#+busybox.35c4597e8db27cf1067099aed6e1187b745019d051d93e1ab28ced0fe834ab8d -#+busybox-diffutils.6789da0646209f2b54dfaee1d117ed0f741fd8ebb6b0e3d342957314fc176615 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-findutils.8b4a746e69fc45009149b46262c4568acf163e91e680db58bfd76eeb28dee8f3 +#+musl-cross-make.9ddce24e114ba6db6b3f00c8db542ba3c56421a375aa768329ace1a74b56951d +#+gnu-make.71d70d47d7e77240a9d0551b645faa752d1406891930231863f31e656cd45c01 +#+busybox.5d90101b525c9f1e8cb2ad2461e2896c93ee6d1075e326ff18cce68bc47a30d2 +#+busybox-diffutils.a2179b98ee4483ae799665d1e5b7bc7c6b21ee0a021c76602cd74681b7bc0f27 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. -check_static() { - local exe || true - exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} + + + + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'zstd-1.5.5' + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -25,7 +23,6 @@ build_env_static() { } build_env_static -cd zstd-1.5.5 make -j${JOBS:-1} -l$((1+${JOBS:-1})) default install \ V=1 \ DESTDIR="$pthbs_destdir" \ @@ -33,11 +30,24 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) default install \ datarootdir="/home/ccx/versions/$pthbs_package" \ bindir="/home/ccx/versions/$pthbs_package/command" \ libdir="/home/ccx/versions/$pthbs_package/library" - -check_static command/zstd 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 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} +check_static command/zstd + cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -60,6 +70,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -90,3 +104,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat @@ -1,30 +1,38 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 -#+pthbs-banginstall.249673e1473eb7766c7d20ad2d155f9ad35c828714679cf3bc831c7fb9b3ae90 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c +#+pthbs-banginstall.e83271751060d45b4e26c9d63dd28f0f8859de39cd86a2ba6124a4f15a864878 + #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat -: ${JOBS:=1} + + + prefix=/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'aat' + + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi + + mv -v data.awk "$pkgdir/" cd "$pthbs_destdir/versions/$pthbs_package" @@ -49,8 +57,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -81,3 +92,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco @@ -1,30 +1,26 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 + #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'abduco' + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } build_env_static -prefix=/versions/$pthbs_package cd abduco cat >config.mk <<EOF # Any changes made here will be lost if configure is re-run @@ -38,13 +34,36 @@ CFLAGS = -pipe -Os LDFLAGS = -static EOF sed 's/^/> /' config.mk -make DESTDIR="${pthbs_destdir}" install + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + + +make DESTDIR="$pthbs_destdir" install + + # the Makefile hardcodes 'bin' despite configure undersanding BINDIR -mv "${pthbs_destdir}${prefix}/bin" "${pthbs_destdir}${prefix}/command" +mv "${dest}/bin" "${dest}/command" -check_static command/abduco +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + +check_static command/abduco + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -66,6 +85,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -96,3 +119,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/acl b/variants/root-x86_64/acl @@ -1,17 +1,36 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 -#+attr.eb2702144b4dfefc759ff8290d637f258b5e786d63f66cb5d850089116c68605 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 +#+attr.a559d2012f830afbe59fabad535d9c9302558c51664c4b2e723e1620316feabd #@untar:-z:sha256:5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -31,37 +50,28 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'acl-2.3.2' -autotools_static acl-2.3.2 -check_static command/chacl +autotools_config_static + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/chacl cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -89,6 +99,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -119,3 +133,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/alpine-keys b/variants/root-x86_64/alpine-keys @@ -1,16 +1,20 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -def_prefix -mkdir -p "${pthbs_destdir%/}/$prefix/keys" -mv alpine-keys/keys "${pthbs_destdir%/}/$prefix/keys/alpine" + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'alpine-keys' + + + +mkdir -p "${dest}/keys" +mv alpine-keys/keys "${dest}/keys/alpine" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -36,6 +40,10 @@ $1!="."{exit 1} $2 == "keys" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -66,3 +74,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools @@ -1,44 +1,36 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+patch.a9e8e529731f8eaff01ff7c4b676a2ddea81fce80572b7dba3470d1973b8442d -#+libressl.5ec790cada590f86c500896e3f05eebb81b83875e3c6ea3abd07aba8c4e6ab1a -#+zstd.a54071cb5a8775df64351daee92b4b19aa24c8634d5421a8b0932998bcd030b3 -#+pkgconf-pkg-config.e76c8de275dbcbbf67bca23e0f573d4a1765438a9fd3bc14c76d45e6b7552c39 -#@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+patch.5132407860a7fc2f4779eb741673451dd0e13b07c8b25952db946081d8e563de +#+libressl.1720258e6fb73d0594767b0e418dd6d13b3f8569a8b8d7519ecfd92ddabd9747 +#+zstd.74ecaa8ffa6d09d551f190a6b228032e141cc5f9ef1fd844ed952ab3fd6f5563 +#+pkgconf-pkg-config.2776bc621d98e6a8a53db55f903d855e8636000d2afd2eddf67d6b14eea746f3 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} +#@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools + + + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'apk-tools' + +patch -p1 <../apk-tools.patch + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} - build_env_static -def_prefix -cd apk-tools -patch -p1 <../apk-tools.patch + make -j${JOBS:-1} -l$((1+${JOBS:-1})) STATIC=y LUA=no V=1 \ CFLAGS=-O2 \ DESTDIR="$pthbs_destdir" \ @@ -51,8 +43,22 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) STATIC=y LUA=no V=1 \ PKGCONFIGDIR="$prefix/library/pkgconfig" \ install-static -check_static command/apk.static + +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} +check_static command/apk.static cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -76,6 +82,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -106,3 +116,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps @@ -1,15 +1,44 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad -#+libcap.69d5804a91c4e95e1ee9eb62a94b16f49316541e48dedea5608820765f223fce + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b + +#+skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25 +#+libcap.ba8f9ed96fd176a0826e5ea4c3ca63a6b2528955350469bc8335ae81d5033766 + #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c -name=applyuidgid-caps + + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'applyuidgid-caps' + +name='applyuidgid-caps' + +CFLAGS="-D_GNU_SOURCE" +LDFLAGS="-lskarnet -lcap" + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static() { local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -20,25 +49,8 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -build_env_static -def_prefix - -gcc -D_GNU_SOURCE -static -o $name $name.c $LDFLAGS -lskarnet -lcap -install -d "$pthbs_destdir/$prefix/command" -install -m 755 $name "$pthbs_destdir/$prefix/command" -check_static command/$name +check_static "command/$name" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -61,6 +73,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -91,3 +107,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/argp-standalone b/variants/root-x86_64/argp-standalone @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:. #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0 -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} + + + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -31,49 +31,25 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'argp-standalone-1.5.0' -cd argp-standalone-1.5.0 -autotools_config -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -def_prefix -make libargp.a -install -d "$pthbs_destdir/$prefix/library" -install -m 644 libargp.a "$pthbs_destdir/$prefix/library" +autotools_config + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) libargp.a +install -d "${dest}/library" +install -m 644 libargp.a "${dest}/library" -install -d "$pthbs_destdir/$prefix/include" -install -m 644 argp.h "$pthbs_destdir/$prefix/include" +install -d "${dest}/include" +install -m 644 argp.h "${dest}/include" @@ -100,6 +76,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -130,3 +110,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/attr b/variants/root-x86_64/attr @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,36 +49,27 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'attr-2.5.2' + + LDFLAGS=--static -autotools_static attr-2.5.2 -check_static command/attr + +autotools_config_static + + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install @@ -89,6 +99,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -119,3 +133,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/bison b/variants/root-x86_64/bison @@ -1,17 +1,37 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 -#+flex.00222eb0858c9942b9eb0c93af6bc9438c5a189a54cc78d636183509bb910361 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 +#+flex.f013b317e1dbbc2c60f41ba89f5e2d1fd85648d293790b8d02dcf389a69236fa +#@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -31,40 +51,34 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'bison-3.8.2' + + + export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" -autotools_static bison-3.8.2 --disable-nls -check_static command/bison + +autotools_config_static --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + + +make DESTDIR="$pthbs_destdir" install + + rm -vrf "$pthbs_destdir"/$prefix/lib/charset.alias rmdir -p "$pthbs_destdir"/$prefix/lib || true -cd "$pthbs_destdir/versions/$pthbs_package" +check_static command/bisoncd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/bison"]=1 @@ -86,6 +100,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -116,3 +134,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.40c4c01bd9c0817673dceb9645c01c31733d950119f972c2549f4727292ec6a5 -#+gnu-make.4a32aa4cdf63aaa58ea27e250f18ee034174cbe12838b6d49e01734d296a50e0 -#+musl-cross-make.87153c0d352ab6464c7cf36689811ac4736e07f9f81e050e2af17504cbbec794- \ No newline at end of file +#+busybox.978c0474c5319c07ab707b2ab108015f6503f99902cbef83b5d8ca4acdf054d9 +#+gnu-make.c123d209e698fd149d0a469846e47603b2a0323a426d3eb15caabfe8dfbfe922 +#+musl-cross-make.fb12dc271ed4d653b83ee47b8d92435b376b5174977d150a0292368f9fea0994+ \ No newline at end of file diff --git a/variants/root-x86_64/busybox b/variants/root-x86_64/busybox @@ -1,19 +1,20 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.4a32aa4cdf63aaa58ea27e250f18ee034174cbe12838b6d49e01734d296a50e0 -#+busybox.40c4c01bd9c0817673dceb9645c01c31733d950119f972c2549f4727292ec6a5 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.c123d209e698fd149d0a469846e47603b2a0323a426d3eb15caabfe8dfbfe922 +#+busybox.978c0474c5319c07ab707b2ab108015f6503f99902cbef83b5d8ca4acdf054d9 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab:busybox/.config -: ${JOBS:=1} - export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" cd busybox +cat >>.config <<EOF +CONFIG_BUSYBOX_EXEC_PATH="${prefix}/command/busybox" +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 + HOSTCC="$CC -static" CC="$CC -static" HOSTCFLAGS=-D_GNU_SOURCE -j${JOBS:-1} mkdir -p "$pthbs_destdir/versions/$pthbs_package/command" cp -a busybox "$pthbs_destdir/versions/$pthbs_package/command/" diff --git a/variants/root-x86_64/busybox-diffutils b/variants/root-x86_64/busybox-diffutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-findutils b/variants/root-x86_64/busybox-findutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-kbd b/variants/root-x86_64/busybox-kbd @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-login b/variants/root-x86_64/busybox-login @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-modutils b/variants/root-x86_64/busybox-modutils @@ -1,28 +0,0 @@ -#!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#@git:887295686dbc69e5b2d530f0e6a8dbf94094ac9f:busybox -#@sha256:ea5d8b394f6e9c3a6cf03d6f4cd3a04db5d9209e7d25bc89aa4de5ac4cb0c141:busybox/.config - -: ${JOBS:=1} - -export CC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" -export CFLAGS="-D_GNU_SOURCE" -export LDFLAGS="-static" - -cd busybox -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 - -mkdir -p "$pthbs_destdir/versions/$pthbs_package/command" - -for exe in depmod insmod lsmod modinfo modprobe rmmod; do - mv -v $exe "$pthbs_destdir/versions/$pthbs_package/command/" - check_static command/$exe - printf './command/%s\t./command/%s\n' "$exe" "$exe" \ - >>"$pthbs_destdir/versions/$pthbs_package/.install-links.new" -done - -cd "$pthbs_destdir/versions/$pthbs_package" -mv .install-links.new .install-links 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.87153c0d352ab6464c7cf36689811ac4736e07f9f81e050e2af17504cbbec794 -#+gnu-make.4a32aa4cdf63aaa58ea27e250f18ee034174cbe12838b6d49e01734d296a50e0 +#+musl-cross-make.fb12dc271ed4d653b83ee47b8d92435b376b5174977d150a0292368f9fea0994 +#+gnu-make.c123d209e698fd149d0a469846e47603b2a0323a426d3eb15caabfe8dfbfe922 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config -: ${JOBS:=1} -mcm=/versions/musl-cross-make.87153c0d352ab6464c7cf36689811ac4736e07f9f81e050e2af17504cbbec794 -make=/versions/gnu-make.4a32aa4cdf63aaa58ea27e250f18ee034174cbe12838b6d49e01734d296a50e0 +mcm=/versions/musl-cross-make.fb12dc271ed4d653b83ee47b8d92435b376b5174977d150a0292368f9fea0994 +make=/versions/gnu-make.c123d209e698fd149d0a469846e47603b2a0323a426d3eb15caabfe8dfbfe922 export PATH="$mcm/bin:$make/command:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" @@ -17,7 +16,7 @@ export LDFLAGS="-static" cd busybox $make/command/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 + HOSTCC="$CC -static" CC="$CC -static" HOSTCFLAGS=-D_GNU_SOURCE -j${JOBS:-1} mkdir -p "$pthbs_destdir/versions/$pthbs_package/command" cp -a busybox "$pthbs_destdir/versions/$pthbs_package/command/" diff --git a/variants/root-x86_64/busybox:modutils b/variants/root-x86_64/busybox:modutils @@ -0,0 +1,58 @@ +#!/usr/bin/env pthbs-build +#+linux.4cf084b60d22064bb560e5fa3ba4bffab50896fb09dbeeac55ebf57bc1efa273 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#@sha256:ea5d8b394f6e9c3a6cf03d6f4cd3a04db5d9209e7d25bc89aa4de5ac4cb0c141:busybox/.config + +#@git:887295686dbc69e5b2d530f0e6a8dbf94094ac9f:busybox + + + + +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.4cf084b60d22064bb560e5fa3ba4bffab50896fb09dbeeac55ebf57bc1efa273" +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 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + +mkdir -p "${dest}/command" + +for exe in depmod insmod lsmod modinfo modprobe rmmod; do + mv -v $exe "${dest}/command/" + check_static command/$exe + printf './command/%s\t./command/%s\n' "$exe" "$exe" \ + >>"${dest}/.install-links.new" +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,29 +1,31 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+certdata2pem.f749bf7eb171dfda18138c58062f3dac702cd37a6ab108122750b9843cf41f8e +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+certdata2pem.e981c6c96f82167a804966229d7c4e6b752dbd067834b3216b2504575883800a #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -def_prefix -cd ca-certificates-20241121 + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'ca-certificates-20241121' + + touch blacklist.txt # TODO! certdata2pem -install -d "$pthbs_destdir/$prefix/config/ssl/certs" + +install -d "${dest}/config/ssl/certs" for file in ./*.crt; do - install -m 644 $file "$pthbs_destdir/$prefix/config/ssl/certs" - printf '# %s\n' $file >>"$pthbs_destdir/$prefix/config/ssl/certs/ca-certificates.crt" - cat $file >>"$pthbs_destdir/$prefix/config/ssl/certs/ca-certificates.crt" + install -m 644 $file "${dest}/config/ssl/certs" + printf '# %s\n' $file >>"${dest}/config/ssl/certs/ca-certificates.crt" + cat $file >>"${dest}/config/ssl/certs/ca-certificates.crt" done + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -47,6 +49,10 @@ $1!="."{exit 1} $2 == "config" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -77,3 +83,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils @@ -1,14 +1,24 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad -#+s6.d8628fde93f1f7ba3e253353002c5008cd72c4657179a1726af3153a25bc9c58 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25 +#+s6.4f0c07fe475108c8688ea9e2d80f9f06e60b6b7e28b75436046cbec4605f906d + #@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'ccx-utils' + + check_static() { local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -24,17 +34,9 @@ build_env_static() { export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} build_env_static -def_prefix -./ccx-utils/link.configure $LDFLAGS -cd ccx-utils/src +./link.configure $LDFLAGS for name in \ argv0exec \ @@ -53,11 +55,13 @@ for name in \ ucspi-socksserver-access do make $name - install -d "$pthbs_destdir/$prefix/command" - install -m 755 $name "$pthbs_destdir/$prefix/command" + install -d "${dest}/command" + install -m 755 $name "${dest}/command" check_static command/$name done + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -93,6 +97,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -123,3 +131,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem @@ -1,13 +1,40 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b + #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c -name=certdata2pem + + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'certdata2pem' + +name='certdata2pem' + +CFLAGS="-D_GNU_SOURCE" + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static() { local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -18,25 +45,8 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -build_env_static -def_prefix - -gcc -D_GNU_SOURCE -static -o $name $name.c $LDFLAGS -install -d "$pthbs_destdir/$prefix/command" -install -m 755 $name "$pthbs_destdir/$prefix/command" -check_static command/$name +check_static "command/$name" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -59,6 +69,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -89,3 +103,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz @@ -1,31 +1,37 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 -#+pthbs-banginstall.249673e1473eb7766c7d20ad2d155f9ad35c828714679cf3bc831c7fb9b3ae90 -#@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz -: ${JOBS:=1} +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c +#+pthbs-banginstall.e83271751060d45b4e26c9d63dd28f0f8859de39cd86a2ba6124a4f15a864878 + + + + + prefix=/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'confz' + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -47,8 +53,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -79,3 +88,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+busybox-login.f696e1c7761e2f84eaa6f23960da0c96fe54f3bc6c809c9d197dfdf5ba40ca27 -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#+s6.d8628fde93f1f7ba3e253353002c5008cd72c4657179a1726af3153a25bc9c58 -#+ccx-utils.2af8c3da1c223ad03338868c6e3546cd68cdf5b762d08a2474138d9724d2b6a8 -#+applyuidgid-caps.c07358d37a56467f8d610cb5ceb76365fc48cbd66ec14c5bda22d1042633279a -#+easyseccomp.69ee407b457d0810bccf7a71fce3d77b9aa9277b4ea43dc18ae74d9649b2f87a -#+mlog.3d5b9f0177235a25d319603779cebd52df8324a892ef68b375c47498189292a6 -#+abduco.51af553558f8754a99803f90d4b4d0c7b9dbde02c86fcd711c82f5414ff91d97 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+busybox-login.95786d1a0cdd5a9b322918a2494f567d5149fa8b1f957c14f14b663c2f16349f +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf +#+s6.4f0c07fe475108c8688ea9e2d80f9f06e60b6b7e28b75436046cbec4605f906d +#+ccx-utils.062bf67bbee69235561c8badf805e2af00da42519b37a159d06d437b8c13baa5 +#+applyuidgid-caps.0ea7dceea2b85f3b0f35e918de3da6ca1a9a8ab71aa718800e86b6d320c8de5d +#+easyseccomp.69c7a2196a476cb7de2bd3831d29138d5a23bb162169dbcb174d1587fe666027 +#+mlog.6473f7f1c8420fc18d1112ef997d9ea78c45351596529dcf1a6baa8edaf6f5fc +#+abduco.7262e00aa212c50bd18fbc3961d1d18ed8e7a606d185cb0d3a0beb6f06859107 #@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,38 +1,46 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 -#+pthbs-banginstall.249673e1473eb7766c7d20ad2d155f9ad35c828714679cf3bc831c7fb9b3ae90 -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#+alpine-keys.78d5cf0aabedaafe8aa1bf3283dc12a234afb42b97a30bb39c5c318a52c4503c -#+apk-tools.be0f3867fc9008f2dfe2730e727f7436bc29efbcef0fdbf931fd3813add1a438 -#+xbps.a41ba365036b82076650b66c8db5549d62967bd531f67f6de96070505126e5f9 -#+container-bin-image.d55158bcd58114611c49ada224246dff54409d76125d20dad1aa05624785fe26 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c +#+pthbs-banginstall.e83271751060d45b4e26c9d63dd28f0f8859de39cd86a2ba6124a4f15a864878 + +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf +#+alpine-keys.1ec94556e89a27f388e370f7a89bc4bc81e7443612df33c94847806ea1d99d4a +#+apk-tools.17f2b71de2861d2d3a3e847793edb35fe84f827217aa8fe22e418dd97886ca95 +#+xbps.038c67f679398d5d66a024f53db44722fb6709a2ecc562888d28288d18311150 +#+container-bin-image.8f220609148f2a104352e99b692fa2658203e482c07bfaac38bd9f7276b43ef2 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers -: ${JOBS:=1} + + + prefix=/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'containers' + + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi -mkdir "$pkgdir/data" -mv -v service_scripts container_template "$pkgdir/data/" -printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \ + + +mkdir "${dest}/data" +mv -v service_scripts container_template "${dest}/data/" +printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_template_dir='$prefix/data/container_template'" \ "typeset -g container_service_script_dir='$prefix/data/service_scripts'" \ "typeset -g container_ns_bin_dir='$prefix/deps/container-bin-image'" \ @@ -42,25 +50,25 @@ printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_void_keys_dir='$prefix/deps/keys/void'" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" -mkdir -p "$pkgdir/deps/command" -ln -sf '/versions/apk-tools.be0f3867fc9008f2dfe2730e727f7436bc29efbcef0fdbf931fd3813add1a438/command/apk.static' "$pkgdir/deps/command/" -ln -sf '/versions/xbps.a41ba365036b82076650b66c8db5549d62967bd531f67f6de96070505126e5f9/command/xbps-install.static' "$pkgdir/deps/command/" +mkdir -p "${dest}/deps/command" +ln -sf '/versions/apk-tools.17f2b71de2861d2d3a3e847793edb35fe84f827217aa8fe22e418dd97886ca95/command/apk.static' "${dest}/deps/command/" +ln -sf '/versions/xbps.038c67f679398d5d66a024f53db44722fb6709a2ecc562888d28288d18311150/command/xbps-install.static' "${dest}/deps/command/" -for f in '/versions/alpine-keys.78d5cf0aabedaafe8aa1bf3283dc12a234afb42b97a30bb39c5c318a52c4503c'/keys/alpine/*/*; do +for f in '/versions/alpine-keys.1ec94556e89a27f388e370f7a89bc4bc81e7443612df33c94847806ea1d99d4a'/keys/alpine/*/*; do test -f "$f" d=$(basename "${f%/*}") - mkdir -p "$pkgdir/deps/keys/alpine/$d" - ln -sf "$f" "$pkgdir/deps/keys/alpine/$d/" + mkdir -p "${dest}/deps/keys/alpine/$d" + ln -sf "$f" "${dest}/deps/keys/alpine/$d/" done -mkdir -p "$pkgdir/deps/keys/void" -for f in '/versions/xbps.a41ba365036b82076650b66c8db5549d62967bd531f67f6de96070505126e5f9'/keys/void/*; do - ln -sf "$f" "$pkgdir/deps/keys/void/" +mkdir -p "${dest}/deps/keys/void" +for f in '/versions/xbps.038c67f679398d5d66a024f53db44722fb6709a2ecc562888d28288d18311150'/keys/void/*; do + ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.d55158bcd58114611c49ada224246dff54409d76125d20dad1aa05624785fe26/container-bin-image' -test -f '/versions/container-bin-image.d55158bcd58114611c49ada224246dff54409d76125d20dad1aa05624785fe26/container-bin-image/if' -ln -sf '/versions/container-bin-image.d55158bcd58114611c49ada224246dff54409d76125d20dad1aa05624785fe26/container-bin-image' "$pkgdir/deps/" +test -d '/versions/container-bin-image.8f220609148f2a104352e99b692fa2658203e482c07bfaac38bd9f7276b43ef2/container-bin-image' +test -f '/versions/container-bin-image.8f220609148f2a104352e99b692fa2658203e482c07bfaac38bd9f7276b43ef2/container-bin-image/if' +ln -sf '/versions/container-bin-image.8f220609148f2a104352e99b692fa2658203e482c07bfaac38bd9f7276b43ef2/container-bin-image' "${dest}/deps/" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -88,8 +96,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -120,3 +131,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#+s6.d8628fde93f1f7ba3e253353002c5008cd72c4657179a1726af3153a25bc9c58 -#+s6-portable-utils.b925df30b752d1d21d57accda2aad7c0f6e59ec97da2497725f1bf2f93f14600 -#+s6-linux-utils.b83ea8d93a559e8327905d871cb048d1a3006b67dfb31855abcfc732d81ddcbe -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 -#+confz.0c5fee3168fd8b2dc26f87e64f2c3aebb2061578d371a1993e84c228308cf946 -#+containers.783e24447786fe667c602e806b06f43e31021ca1b60ecda1bc1faa83c1777c30 -#+xbps.a41ba365036b82076650b66c8db5549d62967bd531f67f6de96070505126e5f9 -#+zstd.a54071cb5a8775df64351daee92b4b19aa24c8634d5421a8b0932998bcd030b3 -#+apk-tools.be0f3867fc9008f2dfe2730e727f7436bc29efbcef0fdbf931fd3813add1a438 -#+alpine-keys.78d5cf0aabedaafe8aa1bf3283dc12a234afb42b97a30bb39c5c318a52c4503c -#+getent.c0de0dd3375e5c67b9a3c1385091bac35da92c383e8b4aa7485deea738fe972c -#+fileset.434ce1cc2ef456cfc04182f4e2c6c537de8a78a81ea0e5a63258d4421765c850 -#+ccx-utils.2af8c3da1c223ad03338868c6e3546cd68cdf5b762d08a2474138d9724d2b6a8 -#+easyseccomp.69ee407b457d0810bccf7a71fce3d77b9aa9277b4ea43dc18ae74d9649b2f87a- \ No newline at end of file +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf +#+s6.4f0c07fe475108c8688ea9e2d80f9f06e60b6b7e28b75436046cbec4605f906d +#+s6-portable-utils.a51f66f4409b325395b0122f379df9075e9cdf289229b4edec61f4ceaf4cdf93 +#+s6-linux-utils.e2984fedee63eb7deba90060fc4e6437f8c384809791ddac001f4026b7eeb40f +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c +#+confz.585454eeb01deb79c027829dcea4e3388317cc85badfc0f3108e20e4b4d876a3 +#+containers.0e20aded403593557507f61e15d06a30c5eb7876fdc6703f32192349f8207d54 +#+xbps.038c67f679398d5d66a024f53db44722fb6709a2ecc562888d28288d18311150 +#+zstd.74ecaa8ffa6d09d551f190a6b228032e141cc5f9ef1fd844ed952ab3fd6f5563 +#+apk-tools.17f2b71de2861d2d3a3e847793edb35fe84f827217aa8fe22e418dd97886ca95 +#+alpine-keys.1ec94556e89a27f388e370f7a89bc4bc81e7443612df33c94847806ea1d99d4a +#+getent.68c8d23deb2b5ae2227c182a446de42e6367b6dcee27175a7a41949e6135785d +#+fileset.852e377bffeb781a1c35711906400eca95c92d5272b8019541ff6d0fd9013c70 +#+ccx-utils.062bf67bbee69235561c8badf805e2af00da42519b37a159d06d437b8c13baa5 +#+easyseccomp.69c7a2196a476cb7de2bd3831d29138d5a23bb162169dbcb174d1587fe666027+ \ No newline at end of file diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl @@ -1,17 +1,36 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 -#+libressl.5ec790cada590f86c500896e3f05eebb81b83875e3c6ea3abd07aba8c4e6ab1a + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 +#+libressl.1720258e6fb73d0594767b0e418dd6d13b3f8569a8b8d7519ecfd92ddabd9747 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -31,36 +50,20 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'curl-8.6.0' + + + # Do not generate manpages (requires Perl) ( - cd curl-8.6.0 t=$(busybox which true) for f in scripts/cd2nroff docs/cmdline-opts/*.pl; do printf '#!%s\n' "$t" >$f @@ -68,7 +71,7 @@ check_static() { ) || exit $? export LDFLAGS="--static" -autotools_static curl-8.6.0 \ +autotools_config_static \ --with-zlib \ --enable-ipv6 \ --enable-unix-sockets \ @@ -79,12 +82,17 @@ autotools_static curl-8.6.0 \ --without-libssh2 \ --without-libpsl \ --disable-manual -check_static command/curl +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + -rm -r -v "$pthbs_destdir"'/versions'"/$pthbs_package/man" +make DESTDIR="$pthbs_destdir" install +rm -r -v "$pthbs_destdir"'/versions'"/$pthbs_package/man" + +check_static command/curl + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -108,6 +116,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -138,3 +150,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+diffutils.4138993fdd1a0766d266e33a52f5e964f2b58bd9f16cfb639bba05e8dfb62e4e -#+patch.a9e8e529731f8eaff01ff7c4b676a2ddea81fce80572b7dba3470d1973b8442d -#+flex.00222eb0858c9942b9eb0c93af6bc9438c5a189a54cc78d636183509bb910361 -#+bison.896621605c03a9080b8234a1e66281b7a9894bc65c6ef4a3c4f99c595c955404 -#+rsync.239d21280f5ab1d304e39de610a91177fe5bf2cb7815e28be018629ce7330892 -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#+s6.d8628fde93f1f7ba3e253353002c5008cd72c4657179a1726af3153a25bc9c58 -#+s6-rc.2cbb9de798ca3a70edcafb668f78b6b190471c5d8325bb1fb8f9a02c060e1c70 -#+s6-portable-utils.b925df30b752d1d21d57accda2aad7c0f6e59ec97da2497725f1bf2f93f14600 -#+s6-linux-utils.b83ea8d93a559e8327905d871cb048d1a3006b67dfb31855abcfc732d81ddcbe -#+s6-linux-init.596f266b3f1959fdfcc2cf72c66131beeb21a31dfab00b9a553bef308384c976 -#+mdevd.f6f5f2ee7309d863ffd72a1dc4ff53a977fa6d17851df8f879ff2b818c1e7779 -#+s6-dns.46a069527b08ef4b28e7cbf3d4cec842889ebfb463d73ad9243144a9acda989a -#+libressl.5ec790cada590f86c500896e3f05eebb81b83875e3c6ea3abd07aba8c4e6ab1a -#+s6-networking.8357c47f2723fdc19dc1d56a9fde206114127cd640b8324357679539bc7956de -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 -#+pthbs-banginstall.249673e1473eb7766c7d20ad2d155f9ad35c828714679cf3bc831c7fb9b3ae90 -#+aat.205b40d55ba0a6ecceb3664b007574080104d6a57fd71ffd03c135f8ac40635b -#+confz.0c5fee3168fd8b2dc26f87e64f2c3aebb2061578d371a1993e84c228308cf946 -#+containers.783e24447786fe667c602e806b06f43e31021ca1b60ecda1bc1faa83c1777c30 -#+fileset.434ce1cc2ef456cfc04182f4e2c6c537de8a78a81ea0e5a63258d4421765c850 -#+logincaps.0be057f3ed01ee93c37d668645f61a712bde44c8351282e8ec2806721ac0a1cc -#+snaprep.663d9aba62f16d75162b7026b338fa2ecc0536dc4feb9ea65b5422a5b116ea3f -#+curl.138cde93b5815de702799b406e50847db41875455c2d03f8c367866031ad32c5 -#+git.6ccd4b83e0b065e1af42c14f7f31eae8d44420d9ab54b4c62418ace02d5fa9f1 -#+xbps.a41ba365036b82076650b66c8db5549d62967bd531f67f6de96070505126e5f9 -#+apk-tools.be0f3867fc9008f2dfe2730e727f7436bc29efbcef0fdbf931fd3813add1a438 -#+getent.c0de0dd3375e5c67b9a3c1385091bac35da92c383e8b4aa7485deea738fe972c -#+getconf.b3fb9ea316934b57944c5e21bfe59f8d2f30393100bf360fa72cb0329b97704e -#+iconv.cccaea09de4fb7223e9733a18f6b1cde643e7b46ef606979ef830e860e1798e6 -#+libcap.69d5804a91c4e95e1ee9eb62a94b16f49316541e48dedea5608820765f223fce -#+applyuidgid-caps.c07358d37a56467f8d610cb5ceb76365fc48cbd66ec14c5bda22d1042633279a -#+ccx-utils.2af8c3da1c223ad03338868c6e3546cd68cdf5b762d08a2474138d9724d2b6a8 -#+user-env.70b104400966765a8b3818d455ec35ab73fc59cd575c654ba08a7c7917009161 -#+strace.e807758f985eeb720c04ba093a712b97023887228d7eda81e56792075369499e -#+mlog.3d5b9f0177235a25d319603779cebd52df8324a892ef68b375c47498189292a6 -#+system-config.484e760e51c9a6db1f86b3036d4cbd5dc668637c4e17c48677e88a26ffd6a3c1 -#+system-config-rc.fbf11ec8d4754993f9f927a2c7514cf7e958f5e872ee441909bbb2748b4ec16e -#+system-config-scripts.9ea14c0baa0d03226a30f31e9eea3a41ebb3ae04abae4a280f5825d35ff466da -#+system-config-init.b41c01d39533803e93d3dfba8326458a0905a0c13492ef00050a079e6b1a57a7 -#+system-config-zsh.6c33728877ff7f66bb9e32618135efc8c8d44d8211608b156ef25fb423b473be- \ No newline at end of file +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+diffutils.04c5fa54e9b88def5daf2f9c4dfb4822daf5e2482f5c4ca8d0a84baf11c037ee +#+patch.5132407860a7fc2f4779eb741673451dd0e13b07c8b25952db946081d8e563de +#+flex.f013b317e1dbbc2c60f41ba89f5e2d1fd85648d293790b8d02dcf389a69236fa +#+bison.a8e2eb9101bcac70fa3f14d6a362b1038b83bc4ed81c3392a90c4d1288bfd4ae +#+rsync.9ec64da524cadb6fe8883b19c5d9812384c588b33dfa5eea62f72db256efe029 +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf +#+s6.4f0c07fe475108c8688ea9e2d80f9f06e60b6b7e28b75436046cbec4605f906d +#+s6-rc.cd759df9bbf788cfadb2fa05cb502da9dd5214f9fca863f7f28d91d7a759ef54 +#+s6-portable-utils.a51f66f4409b325395b0122f379df9075e9cdf289229b4edec61f4ceaf4cdf93 +#+s6-linux-utils.e2984fedee63eb7deba90060fc4e6437f8c384809791ddac001f4026b7eeb40f +#+s6-linux-init.cb53f1b9e5c4b48137e097ae48bf9f5b0e1868bf3fb20d69cff570e45d19103d +#+mdevd.cf9adaa5f866ec158bfcfc26dba2beb58d9bf2b2dc20c3378cb321dc4a5dffb1 +#+s6-dns.877a566667ebde543fcd0abe99159cf10e2017fe85c90a071f59d0c15b20de4d +#+libressl.1720258e6fb73d0594767b0e418dd6d13b3f8569a8b8d7519ecfd92ddabd9747 +#+s6-networking.8e3c15a357e077a455be1f1eafde9b7a052eb6acaf791526afc55c7487ab1e61 +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c +#+pthbs-banginstall.e83271751060d45b4e26c9d63dd28f0f8859de39cd86a2ba6124a4f15a864878 +#+aat.3a4791a496db78a9d1b2cddd6c67399326760fd1a380e1f6f7b34d41048066db +#+confz.585454eeb01deb79c027829dcea4e3388317cc85badfc0f3108e20e4b4d876a3 +#+containers.0e20aded403593557507f61e15d06a30c5eb7876fdc6703f32192349f8207d54 +#+fileset.852e377bffeb781a1c35711906400eca95c92d5272b8019541ff6d0fd9013c70 +#+logincaps.5576282225839a1d2324dcb0d2dd5d591fd32943936c7a5e72e6aface58c23d6 +#+snaprep.4be57f45c3bb52a54a74c3dff4276543bcdb98b7966c2cdee12254bff4828509 +#+curl.b5d10267a5714adcd48a51d4be0249ee9b28f91c46bd14cc4aacbc58e6009a58 +#+git.eb757d0b7226e74bad0eff9941f640c284f11a3ec6479aa8820ce8607994e9f9 +#+xbps.038c67f679398d5d66a024f53db44722fb6709a2ecc562888d28288d18311150 +#+apk-tools.17f2b71de2861d2d3a3e847793edb35fe84f827217aa8fe22e418dd97886ca95 +#+getent.68c8d23deb2b5ae2227c182a446de42e6367b6dcee27175a7a41949e6135785d +#+getconf.0e7409ad78f78cb39c4f4b781743277aebf70f124c1084d6c882e1ed7e8e5c4c +#+iconv.9fff939da21dbf81ec0f7038d9b0e96b56e4590e6a0a9a7383796b64c0d5459a +#+libcap.ba8f9ed96fd176a0826e5ea4c3ca63a6b2528955350469bc8335ae81d5033766 +#+applyuidgid-caps.0ea7dceea2b85f3b0f35e918de3da6ca1a9a8ab71aa718800e86b6d320c8de5d +#+ccx-utils.062bf67bbee69235561c8badf805e2af00da42519b37a159d06d437b8c13baa5 +#+user-env.085c0e79091d11490d102eb98e116195226910bde321ccf95b9cf3d0c7a80158 +#+strace.4302766c2d60b86f4f69fc34088ecf2b781aff42bb82bc847699c7b27b7086d3 +#+mlog.6473f7f1c8420fc18d1112ef997d9ea78c45351596529dcf1a6baa8edaf6f5fc +#+system-config.fbf7bf229ee2929068555c461a8469fe443640b2b27de84c3e950f3a918bdbc9 +#+system-config-rc.f199d73a4af5f41c801b9cda75e13a49a14862580cdc8a9f5f85a452e8e04230 +#+system-config-scripts.433598d380031fac19b3f00da20ebd279356d74ab33d670ce26f3de9bd4ce246 +#+system-config-init.c7713e986d6e5d215e60ddd212b43e8ce778113be34e32fc9b4464fcc8894e7b +#+system-config-zsh.8794ac2d2ce94d75d3fa119a0c92c6ee606c70dc6d869ec54634a8ce87b5cc49+ \ No newline at end of file diff --git a/variants/root-x86_64/diffutils b/variants/root-x86_64/diffutils @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,38 +49,29 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'diffutils-3.10' -autotools_static diffutils-3.10 --disable-nls -check_static command/diff -check_static command/cmp +autotools_config_static --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/diff +check_static command/cmp cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -86,6 +96,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -116,3 +130,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp @@ -1,24 +1,26 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 -#+patch.a9e8e529731f8eaff01ff7c4b676a2ddea81fce80572b7dba3470d1973b8442d -#+flex.00222eb0858c9942b9eb0c93af6bc9438c5a189a54cc78d636183509bb910361 -#+bison.896621605c03a9080b8234a1e66281b7a9894bc65c6ef4a3c4f99c595c955404 -#+libseccomp.d5336ba877edf1cae10c2ddbdbd746f93d70ee2c3f93a40ce20407feb0e76f93 -#+error-standalone.88bb79f6b89acb7f1e051995a67176bfca7c60abcb33f0b8392c1621339d548e -#+argp-standalone.38543e5e75e7391060c50f0b7785c3708c6d92ecf22b8706bc2b523ffe14bc0e -#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 +#+patch.5132407860a7fc2f4779eb741673451dd0e13b07c8b25952db946081d8e563de +#+flex.f013b317e1dbbc2c60f41ba89f5e2d1fd85648d293790b8d02dcf389a69236fa +#+bison.a8e2eb9101bcac70fa3f14d6a362b1038b83bc4ed81c3392a90c4d1288bfd4ae +#+libseccomp.bf890dd3705885dd284c07da6ed2e74dc49564467a080266a087fc805b28d1fa +#+error-standalone.262d8463c0e11b6af55e1e64ad24f47b71013d652546f4a5ec2cdf54b89a610a +#+argp-standalone.d0f52651a3199e1ee71a20220d49481c9c9982eada53ebe5b74873c1075c3357 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} +#@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp + + + + + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -38,21 +40,31 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared + autotools_config "$@" --enable-static --disable-shared } + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'easyseccomp' + + +patch -p1 <../easyseccomp_fix_includes.patch +touch Makefile.in configure + +build_env_static +autotools_config --enable-seccomp + + +make -j1 V=1 DESTDIR="$pthbs_destdir" LIBS="-lseccomp -lerror -largp" install + + + + check_static() { local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -64,17 +76,8 @@ check_static() { fi } - -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 command/easyseccomp - - cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -98,6 +101,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -128,3 +135,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone @@ -1,17 +1,25 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 + #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:. + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'error-standalone-2.0' + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -prefix=/versions/$pthbs_package -build_env_static cd error-standalone-2.0 make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/versions/$pthbs_package \ DESTDIR="$pthbs_destdir" \ @@ -19,6 +27,9 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/versions/$pthbs_package \ LIBDIR="$prefix/library" \ install-static + + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -42,6 +53,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -72,3 +87,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline @@ -1,33 +1,44 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad -#@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline -: ${JOBS:=1} +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25 + + + + prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 'execline' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad/sysdeps' \ + --with-sysdeps='/versions/skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25/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})) + + + make DESTDIR="$pthbs_destdir" install -if ! test -e "${pthbs_destdir%/}$prefix/command/eltest"; then + + +if ! test -e "${dest}/command/eltest"; then # TODO - printf '%s\n' >"${pthbs_destdir%/}$prefix/command/eltest" \ + printf '%s\n' >"${dest}/command/eltest" \ "#!$prefix/command/execlineb -S0" \ 's6-test $@' - chmod +x "${pthbs_destdir%/}$prefix/command/eltest" + chmod +x "${dest}/command/eltest" fi cd "$pthbs_destdir/versions/$pthbs_package" @@ -51,6 +62,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -81,3 +96,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset @@ -1,31 +1,37 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 -#+pthbs-banginstall.249673e1473eb7766c7d20ad2d155f9ad35c828714679cf3bc831c7fb9b3ae90 -#@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset -: ${JOBS:=1} +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c +#+pthbs-banginstall.e83271751060d45b4e26c9d63dd28f0f8859de39cd86a2ba6124a4f15a864878 + + + + + prefix=/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'fileset' + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -49,8 +55,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -81,3 +90,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/findutils b/variants/root-x86_64/findutils @@ -1,16 +1,16 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:. -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} + + + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,42 +30,31 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'findutils-4.10.0' + + +autotools_config --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + -autotools_static findutils-4.10.0 --disable-nls check_static command/find check_static command/xargs -check_static command/locate +# TODO: fix shebang in check_static command/locate # TODO: fix shebang in command/updatedb - - cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -96,6 +85,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -126,3 +119,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/flex b/variants/root-x86_64/flex @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,40 +49,34 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'flex-2.6.4' + + export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" export LDFLAGS="--static" -autotools_static flex-2.6.4 --disable-nls -check_static command/flex -check_static command/flex++ +autotools_config_static + + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/flex +check_static command/flex++ cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -89,6 +102,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -119,3 +136,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf @@ -1,13 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c -name=getconf +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b + +#@sha256:sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c + + + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'getconf' + +name='getconf' + + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static() { local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -18,25 +44,8 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -build_env_static -def_prefix - -gcc -static -o $name $name.c -install -d "$pthbs_destdir/$prefix/command" -install -m 755 $name "$pthbs_destdir/$prefix/command" -check_static command/$name +check_static "command/$name" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -59,6 +68,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -89,3 +102,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent @@ -1,13 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c -name=getent +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b + +#@sha256:sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c + + + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'getent' + +name='getent' + + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static() { local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -18,25 +44,8 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -build_env_static -def_prefix - -gcc -static -o $name $name.c -install -d "$pthbs_destdir/$prefix/command" -install -m 755 $name "$pthbs_destdir/$prefix/command" -check_static command/$name +check_static "command/$name" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -59,6 +68,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -89,3 +102,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git @@ -1,28 +1,23 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 -#+libressl.5ec790cada590f86c500896e3f05eebb81b83875e3c6ea3abd07aba8c4e6ab1a -#+curl.138cde93b5815de702799b406e50847db41875455c2d03f8c367866031ad32c5 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 +#+libressl.1720258e6fb73d0594767b0e418dd6d13b3f8569a8b8d7519ecfd92ddabd9747 +#+curl.b5d10267a5714adcd48a51d4be0249ee9b28f91c46bd14cc4aacbc58e6009a58 + #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} + + prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'git-2.43.2' + 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" \ @@ -41,9 +36,24 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C ./git-2.43.2 \ gitwebdir="$prefix/gitweb" \ V=1 all install -check_static command/git + +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} +check_static command/git + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -68,6 +78,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -98,3 +112,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/gnu-make b/variants/root-x86_64/gnu-make @@ -1,14 +1,31 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.4a32aa4cdf63aaa58ea27e250f18ee034174cbe12838b6d49e01734d296a50e0 -#+busybox.40c4c01bd9c0817673dceb9645c01c31733d950119f972c2549f4727292ec6a5 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.c123d209e698fd149d0a469846e47603b2a0323a426d3eb15caabfe8dfbfe922 +#+busybox.978c0474c5319c07ab707b2ab108015f6503f99902cbef83b5d8ca4acdf054d9 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -28,37 +45,28 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'make-4.4.1' -autotools_static make-4.4.1 --disable-nls -check_static command/make +autotools_config_static --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/make cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -83,6 +91,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -113,3 +125,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/gnu-make:bootstrap b/variants/root-x86_64/gnu-make:bootstrap @@ -1,14 +1,12 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.87153c0d352ab6464c7cf36689811ac4736e07f9f81e050e2af17504cbbec794 +#+musl-cross-make.fb12dc271ed4d653b83ee47b8d92435b376b5174977d150a0292368f9fea0994 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} + + + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -28,34 +26,17 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'make-4.4.1' -mcm=/versions/musl-cross-make.87153c0d352ab6464c7cf36689811ac4736e07f9f81e050e2af17504cbbec794 + +mcm=/versions/musl-cross-make.fb12dc271ed4d653b83ee47b8d92435b376b5174977d150a0292368f9fea0994 export PATH="$mcm/bin:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" @@ -63,7 +44,14 @@ export CXX="$mcm/bin/x86_64-linux-musl-g++" export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" -autotools make-4.4.1 --enable-static --disable-shared --disable-nls +autotools_config --enable-static --disable-shared --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" @@ -89,6 +77,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -119,3 +111,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf @@ -1,17 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:. + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -31,38 +49,28 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'gperf-3.1' -autotools_static gperf-3.1 -check_static command/gperf +autotools_config_static + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + +check_static command/gperf cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -85,6 +93,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -115,3 +127,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv @@ -1,13 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c -name=iconv +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b + +#@sha256:sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c + + + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'iconv' + +name='iconv' + + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static +gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS + + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static() { local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -18,25 +44,8 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -build_env_static -def_prefix - -gcc -static -o $name $name.c -install -d "$pthbs_destdir/$prefix/command" -install -m 755 $name "$pthbs_destdir/$prefix/command" -check_static command/$name +check_static "command/$name" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -59,6 +68,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -89,3 +102,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/kbd b/variants/root-x86_64/kbd @@ -1,16 +1,36 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 +#@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,44 +50,38 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'kbd-2.6.4' + + -#export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" export LDFLAGS="--static" -autotools_static kbd-2.6.4 \ - --disable-nls --disable-vlock --disable-werror --disable-tests \ + +autotools_config_static --disable-nls --disable-vlock --disable-werror --disable-tests \ --datadir="$prefix/data" --datarootdir="$prefix/data" -check_static command/loadkeys + + + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + + +make DESTDIR="$pthbs_destdir" install + + cd ../destdir mv -v data ".$prefix/" +check_static command/loadkeys cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -90,6 +104,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -120,3 +138,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/kernel.environment b/variants/root-x86_64/kernel.environment @@ -1,2 +1,3 @@ #!/usr/bin/env pthbs-build -#+linux.f6cd189f4240abea66a736972c5e489d2ef5c6c14b64247be7a54c01e5c2a26b- \ No newline at end of file +#+linux.4cf084b60d22064bb560e5fa3ba4bffab50896fb09dbeeac55ebf57bc1efa273 +#+busybox.fe0bc580216951e560be49b10372eee1b04038339c2c34a3e0d1ea87846cb170+ \ No newline at end of file diff --git a/variants/root-x86_64/libarchive b/variants/root-x86_64/libarchive @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,41 +49,33 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libarchive-3.7.2' + + export LDFLAGS=--static -autotools_static libarchive-3.7.2 --without-xml2 -check_static command/bsdtar -check_static command/bsdcpio +autotools_config_static --without-xml2 + + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + +make DESTDIR="$pthbs_destdir" install + +check_static command/bsdtar +check_static command/bsdcpio + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -88,6 +99,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -118,3 +133,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd @@ -1,17 +1,36 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 -#+libmd.2d507ecd37c79faf2a47a3939594e89e77496aa73ceed41aaabd3282540d02f5 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 +#+libmd.1814365ff65a4d06621ee0b175110b90eba512907c8691fc52d4c59945f39f29 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -31,33 +50,25 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } -autotools_static libbsd-0.11.8 +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libbsd-0.11.8' + + + +autotools_config_static + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" @@ -83,6 +94,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -113,3 +128,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap @@ -1,42 +1,33 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+pkgconf-pkg-config.e76c8de275dbcbbf67bca23e0f573d4a1765438a9fd3bc14c76d45e6b7552c39 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+pkgconf-pkg-config.2776bc621d98e6a8a53db55f903d855e8636000d2afd2eddf67d6b14eea746f3 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} + + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libcap-2.69' + +sed -i '1 s|^#!/bin/bash|#!/bin/sh|' progs/*.sh + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -def_prefix LDFLAGS=--static build_env_static -cd libcap-2.69 -sed -i '1 s|^#!/bin/bash|#!/bin/sh|' progs/*.sh -make \ + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ DESTDIR="$pthbs_destdir" \ SHARED=no DYNAMIC=no LIBCSTATIC=yes \ prefix="$prefix" \ @@ -55,12 +46,24 @@ make \ LDFLAGS="$LDFLAGS" \ all install +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} check_static command/capsh check_static command/getcap check_static command/setcap check_static command/getpcaps - cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -87,6 +90,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -117,3 +124,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup @@ -1,19 +1,38 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 -#+flex.00222eb0858c9942b9eb0c93af6bc9438c5a189a54cc78d636183509bb910361 -#+bison.896621605c03a9080b8234a1e66281b7a9894bc65c6ef4a3c4f99c595c955404 -#+musl-fts.812a37fd545aa0bee56eba921480f31fc63cf59f0c4a8643b7553f9cd25d9b13 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 +#+flex.f013b317e1dbbc2c60f41ba89f5e2d1fd85648d293790b8d02dcf389a69236fa +#+bison.a8e2eb9101bcac70fa3f14d6a362b1038b83bc4ed81c3392a90c4d1288bfd4ae +#+musl-fts.0671541123f6690295450aa42c597f81477ed68c9efcd0fe32be1ee7ccbf410c #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -33,37 +52,28 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libcgroup-3.0.0' -autotools_static libcgroup-3.0.0 -check_static command/cgconfigparser +autotools_config_static + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/cgconfigparser cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -88,6 +98,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -118,3 +132,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf @@ -1,27 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+zstd.a54071cb5a8775df64351daee92b4b19aa24c8634d5421a8b0932998bcd030b3 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+zstd.74ecaa8ffa6d09d551f190a6b228032e141cc5f9ef1fd844ed952ab3fd6f5563 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libelf' + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -prefix=/versions/$pthbs_package build_env_static -cd libelf make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX="$prefix" \ DESTDIR="$pthbs_destdir" \ INCDIR="$prefix/include" \ LIBDIR="$prefix/library" \ install-static -mkdir -p "$pthbs_destdir/${prefix#/}/library/pkgconfig" -printf '%s\n' > "$pthbs_destdir/${prefix#/}/library/pkgconfig/libelf.pc" \ +mkdir -p "${dest}/library/pkgconfig" +printf '%s\n' > "${dest}/library/pkgconfig/libelf.pc" \ "prefix=/versions/$pthbs_package" \ 'exec_prefix=${prefix}' \ 'includedir=${prefix}/include' \ @@ -62,6 +70,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -92,3 +104,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/libmd b/variants/root-x86_64/libmd @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,33 +49,25 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } -autotools_static libmd-1.1.0 +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libmd-1.1.0' + + + +autotools_config_static + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" @@ -83,6 +94,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -113,3 +128,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl @@ -1,18 +1,37 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 -#+ca-certificates-wip-donotuse.af2f5478643f7f8173268d5a8d6c4c5f057010136fdd7e0990b82bcd25aa8f63 -#@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 +#+ca-certificates-wip-donotuse.1cec85c616342bb860ec9507f2bad3eba9cf7a4615f556c314a3a93e64177a42 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c +#@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -32,42 +51,30 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } - prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libressl-3.8.2' + + + export LDFLAGS="--static" -autotools_static libressl-3.8.2 --with-openssldir="$prefix/config/ssl" -check_static command/openssl -check_static command/ocspcheck + +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.af2f5478643f7f8173268d5a8d6c4c5f057010136fdd7e0990b82bcd25aa8f63/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/versions/ca-certificates-wip-donotuse.1cec85c616342bb860ec9507f2bad3eba9cf7a4615f556c314a3a93e64177a42/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 @@ -83,7 +90,12 @@ printf >env/SSL_CERT_DIR '%s\n' "$prefix/config/ssl/certs" printf >env/GIT_SSL_CAPATH '%s\n' "$prefix/config/ssl/certs" +make DESTDIR="$pthbs_destdir" install + + +check_static command/openssl +check_static command/ocspcheck cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -114,6 +126,8 @@ $1!="."{exit 1} $2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } $2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -145,3 +159,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/libretls b/variants/root-x86_64/libretls @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-z:sha256:3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,35 +49,27 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libretls-3.8.1' + + export LDFLAGS="--static" -autotools_static libretls-3.8.1 + +autotools_config_static + + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install @@ -87,6 +98,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -117,3 +132,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp @@ -1,19 +1,38 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 -#+pkgconf-pkg-config.e76c8de275dbcbbf67bca23e0f573d4a1765438a9fd3bc14c76d45e6b7552c39 -#+gperf.306744f2d947207b3556424aea9ec7a5142dc2011cd44d765a108ed7ee38e607 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 +#+pkgconf-pkg-config.2776bc621d98e6a8a53db55f903d855e8636000d2afd2eddf67d6b14eea746f3 +#+gperf.f3abd9020ab2fb7d8d07f77a5a18460a5fbef3aa1ffc4cbdc0a7f8322db2bba1 + #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:. + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -33,38 +52,31 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libseccomp-2.6.0' + + export LDFLAGS="--static" -autotools_static libseccomp-2.6.0 -check_static command/scmp_sys_resolver + +autotools_config_static + + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) +make DESTDIR="$pthbs_destdir" install + + + +check_static command/scmp_sys_resolver cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -89,6 +101,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -119,3 +135,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,35 +49,18 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'libunwind-1.8.1' + + -autotools_static libunwind-1.8.1 \ - --enable-cxx-exceptions \ +autotools_config_static --enable-cxx-exceptions \ --enable-coredump \ --enable-ptrace \ --enable-setjmp \ @@ -66,6 +68,13 @@ autotools_static libunwind-1.8.1 \ +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -90,6 +99,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -120,3 +133,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux @@ -1,48 +1,60 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+findutils.e6fdd9aaa998ae5a38949437362c2b7aa9cb2f3078fbbd9307940f5b696ca354 -#+diffutils.4138993fdd1a0766d266e33a52f5e964f2b58bd9f16cfb639bba05e8dfb62e4e -#+patch.a9e8e529731f8eaff01ff7c4b676a2ddea81fce80572b7dba3470d1973b8442d -#+flex.00222eb0858c9942b9eb0c93af6bc9438c5a189a54cc78d636183509bb910361 -#+bison.896621605c03a9080b8234a1e66281b7a9894bc65c6ef4a3c4f99c595c955404 -#+rsync.239d21280f5ab1d304e39de610a91177fe5bf2cb7815e28be018629ce7330892 -#+zstd.a54071cb5a8775df64351daee92b4b19aa24c8634d5421a8b0932998bcd030b3 -#+libelf.7809f56fb87a9a272ca475b7f6203072a170977821d05cd4910641ebc16e35bd -#+pkgconf-pkg-config.e76c8de275dbcbbf67bca23e0f573d4a1765438a9fd3bc14c76d45e6b7552c39 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+findutils.7a75851170a0a55cdc81d244a563ba6ca5b4b9a090609c01cfc0e0f865af956c +#+diffutils.04c5fa54e9b88def5daf2f9c4dfb4822daf5e2482f5c4ca8d0a84baf11c037ee +#+patch.5132407860a7fc2f4779eb741673451dd0e13b07c8b25952db946081d8e563de +#+flex.f013b317e1dbbc2c60f41ba89f5e2d1fd85648d293790b8d02dcf389a69236fa +#+bison.a8e2eb9101bcac70fa3f14d6a362b1038b83bc4ed81c3392a90c4d1288bfd4ae +#+rsync.9ec64da524cadb6fe8883b19c5d9812384c588b33dfa5eea62f72db256efe029 +#+zstd.74ecaa8ffa6d09d551f190a6b228032e141cc5f9ef1fd844ed952ab3fd6f5563 +#+libelf.80af7388d20ea79e703027afa890800601e9e479f623dd1dc00b73b7f2d4fa0d +#+pkgconf-pkg-config.2776bc621d98e6a8a53db55f903d855e8636000d2afd2eddf67d6b14eea746f3 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch -#printf '%s\n' "TODO: fix paths"; exit 1 -export CPATH="$pthbs_build_environment/include" + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 'linux-6.1' + unxz -c < '../patch-6.1.34.xz' | patch -p1 -N patch -p1 -N <../noobjtool.patch + +export CPATH="$pthbs_build_environment/include" + cp -v ../linux.config .config make olddefconfig diff -u ../linux.config .config || true + + make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ V=1 \ HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \ HOSTCFLAGS="-L$pthbs_build_environment/library" -installdir="$pthbs_destdir//versions/$pthbs_package" -mkdir -p "$installdir/doc/linux" "$installdir/boot" -cp -v .config "$installdir/config" -mv Documentation/* "$installdir/doc/linux" + +mkdir -p "${dest}/doc/linux" "${dest}/boot" +cp -v .config "${dest}/config" +mv Documentation/* "${dest}/doc/linux" make modules_install install \ - INSTALL_MOD_PATH="$installdir/kernel" \ + INSTALL_MOD_PATH="${dest}/kernel" \ INSTALL_MOD_STRIP=1 \ - INSTALL_PATH="$installdir/boot" \ - INSTALL_DTBS_PATH="$installdir/boot/dtbs" + INSTALL_PATH="${dest}/boot" \ + INSTALL_DTBS_PATH="${dest}/boot/dtbs" + # remove dangling symlinks -module_dir="$installdir/kernel/lib/6.1.34" +module_dir="${dest}/kernel/lib/6.1.34" rm -f "$module_dir/build" "$module_dir/source" + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -79,6 +91,10 @@ 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 } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -109,3 +125,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest @@ -1,46 +1,58 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+findutils.e6fdd9aaa998ae5a38949437362c2b7aa9cb2f3078fbbd9307940f5b696ca354 -#+diffutils.4138993fdd1a0766d266e33a52f5e964f2b58bd9f16cfb639bba05e8dfb62e4e -#+patch.a9e8e529731f8eaff01ff7c4b676a2ddea81fce80572b7dba3470d1973b8442d -#+flex.00222eb0858c9942b9eb0c93af6bc9438c5a189a54cc78d636183509bb910361 -#+bison.896621605c03a9080b8234a1e66281b7a9894bc65c6ef4a3c4f99c595c955404 -#+rsync.239d21280f5ab1d304e39de610a91177fe5bf2cb7815e28be018629ce7330892 -#+zstd.a54071cb5a8775df64351daee92b4b19aa24c8634d5421a8b0932998bcd030b3 -#+libelf.7809f56fb87a9a272ca475b7f6203072a170977821d05cd4910641ebc16e35bd -#+pkgconf-pkg-config.e76c8de275dbcbbf67bca23e0f573d4a1765438a9fd3bc14c76d45e6b7552c39 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+findutils.7a75851170a0a55cdc81d244a563ba6ca5b4b9a090609c01cfc0e0f865af956c +#+diffutils.04c5fa54e9b88def5daf2f9c4dfb4822daf5e2482f5c4ca8d0a84baf11c037ee +#+patch.5132407860a7fc2f4779eb741673451dd0e13b07c8b25952db946081d8e563de +#+flex.f013b317e1dbbc2c60f41ba89f5e2d1fd85648d293790b8d02dcf389a69236fa +#+bison.a8e2eb9101bcac70fa3f14d6a362b1038b83bc4ed81c3392a90c4d1288bfd4ae +#+rsync.9ec64da524cadb6fe8883b19c5d9812384c588b33dfa5eea62f72db256efe029 +#+zstd.74ecaa8ffa6d09d551f190a6b228032e141cc5f9ef1fd844ed952ab3fd6f5563 +#+libelf.80af7388d20ea79e703027afa890800601e9e479f623dd1dc00b73b7f2d4fa0d +#+pkgconf-pkg-config.2776bc621d98e6a8a53db55f903d855e8636000d2afd2eddf67d6b14eea746f3 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch -#printf '%s\n' "TODO: fix paths"; exit 1 -export CPATH="$pthbs_build_environment/include" + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 'linux-6.15' + patch -p1 -N <../noobjtool.patch + +export CPATH="$pthbs_build_environment/include" + cp -v ../linux.config .config make olddefconfig diff -u ../linux.config .config || true + + make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ V=1 \ HOSTLDFLAGS="-static -L$pthbs_build_environment/library" \ HOSTCFLAGS="-L$pthbs_build_environment/library" -installdir="$pthbs_destdir//versions/$pthbs_package" -mkdir -p "$installdir/doc/linux" "$installdir/boot" -cp -v .config "$installdir/config" -mv Documentation/* "$installdir/doc/linux" + +mkdir -p "${dest}/doc/linux" "${dest}/boot" +cp -v .config "${dest}/config" +mv Documentation/* "${dest}/doc/linux" make modules_install install \ - INSTALL_MOD_PATH="$installdir/kernel" \ + INSTALL_MOD_PATH="${dest}/kernel" \ INSTALL_MOD_STRIP=1 \ - INSTALL_PATH="$installdir/boot" \ - INSTALL_DTBS_PATH="$installdir/boot/dtbs" + INSTALL_PATH="${dest}/boot" \ + INSTALL_DTBS_PATH="${dest}/boot/dtbs" + # remove dangling symlinks -module_dir="$installdir/kernel/lib/6.15.0" +module_dir="${dest}/kernel/lib/6.15.0" rm -f "$module_dir/build" "$module_dir/source" + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -77,6 +89,10 @@ 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 } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -107,3 +123,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -1,46 +1,69 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 -#+pthbs-banginstall.249673e1473eb7766c7d20ad2d155f9ad35c828714679cf3bc831c7fb9b3ae90 -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+ccx-utils.2af8c3da1c223ad03338868c6e3546cd68cdf5b762d08a2474138d9724d2b6a8 -#@git:52261504e78293b651e73a518834c5c75d0b3bf6:logincaps - -: ${JOBS:=1} + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c +#+pthbs-banginstall.e83271751060d45b4e26c9d63dd28f0f8859de39cd86a2ba6124a4f15a864878 + +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+ccx-utils.062bf67bbee69235561c8badf805e2af00da42519b37a159d06d437b8c13baa5 + + + + prefix=/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'logincaps' + + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi -pthbs-banginstall etc/loginexec "$pkgdir" -cat >"$pkgdir/command/login-keepenv" <<EOF + +pthbs-banginstall etc/loginexec "${dest}" + +cat >"${dest}/command/login-keepenv" <<EOF #!$(which execlineb) -S0 $prefix/command/login -p \$@ EOF -chmod +x "$pkgdir/command/login-keepenv" +chmod +x "${dest}/command/login-keepenv" cd login sh build_static.sh -DLOGINEXEC_PATH="\"$prefix/command/loginexec\"" -cp -a login "$pkgdir/command/" +cp -a login "${dest}/command/" + + +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} +check_static command/login cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -67,8 +90,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -99,3 +125,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/m4 b/variants/root-x86_64/m4 @@ -1,16 +1,33 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+busybox-findutils.f915b319ca7364e1faaff0e070c33a93adce3ff3113fd609b4bd8b9ad775eb72 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,37 +47,28 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'm4-1.4.19' -autotools_static m4-1.4.19 --disable-nls -check_static command/m4 +autotools_config_static --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/m4 cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -84,6 +92,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -114,3 +126,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts @@ -1,19 +1,15 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 -#+pthbs-banginstall.249673e1473eb7766c7d20ad2d155f9ad35c828714679cf3bc831c7fb9b3ae90 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c +#+pthbs-banginstall.e83271751060d45b4e26c9d63dd28f0f8859de39cd86a2ba6124a4f15a864878 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -def_prefix -def_dest +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 @@ -42,6 +38,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -72,3 +72,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd @@ -1,29 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd - -: ${JOBS:=1} + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25 +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf + + + + prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 'mdevd' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad/sysdeps' \ + --with-sysdeps='/versions/skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -45,6 +55,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -75,3 +89,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#+s6.d8628fde93f1f7ba3e253353002c5008cd72c4657179a1726af3153a25bc9c58 -#+mdev-scripts.389387f78d401e616b1e93d78aacc9a813d7b10ad105f01b0adcd501c161a3be -#+mdevd.f6f5f2ee7309d863ffd72a1dc4ff53a977fa6d17851df8f879ff2b818c1e7779- \ No newline at end of file +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf +#+s6.4f0c07fe475108c8688ea9e2d80f9f06e60b6b7e28b75436046cbec4605f906d +#+mdev-scripts.3b5e112c6418b45dbb69ec33247c10aeda668bb3abe43abe72a043df215159f2 +#+mdevd.cf9adaa5f866ec158bfcfc26dba2beb58d9bf2b2dc20c3378cb321dc4a5dffb1+ \ No newline at end of file diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog @@ -1,13 +1,36 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'mlog' + + +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" +} +build_env_static name=mlog +make "$name" + + +install -d "$pthbs_destdir/$prefix/command" +install -m 755 "$name" "$pthbs_destdir/$prefix/command" + + + check_static() { local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 if ! test -f $exe; then printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 @@ -18,25 +41,6 @@ check_static() { exit 1 fi } -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -build_env_static -def_prefix - -cd mlog -make "$name" - -install -d "$pthbs_destdir/$prefix/command" -install -m 755 "$name" "$pthbs_destdir/$prefix/command" check_static "command/$name" cd "$pthbs_destdir/versions/$pthbs_package" @@ -60,6 +64,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -90,3 +98,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.87153c0d352ab6464c7cf36689811ac4736e07f9f81e050e2af17504cbbec794 -#+gnu-make.4a32aa4cdf63aaa58ea27e250f18ee034174cbe12838b6d49e01734d296a50e0 -#+busybox.40c4c01bd9c0817673dceb9645c01c31733d950119f972c2549f4727292ec6a5 -#@git:6f3701d08137496d5aac479e3a3977b5ae993c1f:musl-cross-make +#+musl-cross-make.fb12dc271ed4d653b83ee47b8d92435b376b5174977d150a0292368f9fea0994 +#+gnu-make.c123d209e698fd149d0a469846e47603b2a0323a426d3eb15caabfe8dfbfe922 +#+busybox.978c0474c5319c07ab707b2ab108015f6503f99902cbef83b5d8ca4acdf054d9 #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -14,7 +13,14 @@ #@sha256:4213e75809588e3f32ae0fde8fb11df2dfd6e0e013762ff5ee951c3aadb7ffc0:musl-cross-make/patches/linux-6.5.4/0001-no-rsync-headers.diff #@sha256:68140a82582ede938159630bca0fb13a93b4bf1cb2e85b08943c26242cf8f3a6:zpipe.c -: ${JOBS:=1} +#@git:6f3701d08137496d5aac479e3a3977b5ae993c1f:musl-cross-make + + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' # For validating the compiler printf '%s\n' 'int main(void) { return 0; }' >true.c @@ -34,11 +40,10 @@ 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 - - make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make || exit $? make -C musl-cross-make install || exit $? @@ -77,13 +82,13 @@ printf '%s\n' > "$dd/library/pkgconfig/zlib.pc" \ 'Libs: -L${libdir} -lz' \ 'Cflags: -I${includedir}' + # validate zlib "$dd"'/bin/x86_64-linux-musl-gcc' -I"$dd/include" -L"$dd/lib" -static -o zpipe zpipe.c -lz ./zpipe <true.c >true.c.gz ./zpipe -d <true.c.gz >true.c.2 cmp -s true.c true.c.2 - cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -120,6 +125,10 @@ $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 } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -150,3 +159,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/musl-cross-make:bootstrap-0 b/variants/root-x86_64/musl-cross-make:bootstrap-0 @@ -1,7 +1,6 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#@git:6f3701d08137496d5aac479e3a3977b5ae993c1f:musl-cross-make #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:c95da32f440378d7751dd95533186f7fc05ceb4fb65eb5b85234e6299eb9838e:musl-cross-make/sources/gcc-9.4.0.tar.xz @@ -11,7 +10,14 @@ #@sha256:c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc:musl-cross-make/sources/mpfr-4.0.2.tar.bz2 #@sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:musl-cross-make/sources/musl-1.2.5.tar.gz -: ${JOBS:=1} +#@git:6f3701d08137496d5aac479e3a3977b5ae993c1f:musl-cross-make + + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' # For validating the compiler printf '%s\n' 'int main(void) { return 0; }' >true.c @@ -24,6 +30,7 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* + # Patch linker path for dynamic executables make -C musl-cross-make gcc-9.4.0 sed -i -e 's|/lib/ld-musl-|/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-9.4.0/gcc/config/*/linux*.h @@ -67,6 +74,10 @@ $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 } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -97,3 +108,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.3a19d5517d40b9e991619202addb81be350111ec96e4dd5d2093f2c8d5f5860d -#@git:6f3701d08137496d5aac479e3a3977b5ae993c1f:musl-cross-make +#+musl-cross-make.cfa30daa9ef0247d824225e9cfd081bfc306d658cdcb6890dc3bf20fe81eb183 #@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 @@ -12,8 +11,16 @@ #@sha256:c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc:musl-cross-make/sources/mpfr-4.0.2.tar.bz2 #@sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:musl-cross-make/sources/musl-1.2.5.tar.gz -: ${JOBS:=1} -bootstrap=/versions/musl-cross-make.3a19d5517d40b9e991619202addb81be350111ec96e4dd5d2093f2c8d5f5860d +#@git:6f3701d08137496d5aac479e3a3977b5ae993c1f:musl-cross-make + + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' + +bootstrap=/versions/musl-cross-make.cfa30daa9ef0247d824225e9cfd081bfc306d658cdcb6890dc3bf20fe81eb183 "$bootstrap/bin/x86_64-linux-musl-gcc" --version # For validating the compiler @@ -31,6 +38,7 @@ printf '%s\n' >musl-cross-make/config.mak \ touch musl-cross-make/sources/* + # Patch linker path for dynamic executables make -C musl-cross-make gcc-11.2.0 sed -i -e 's|/lib/ld-musl-|/versions/'"$pthbs_package"'/x86_64-linux-musl/lib/ld-musl-|' musl-cross-make/gcc-11.2.0/gcc/config/*/linux*.h @@ -75,6 +83,10 @@ $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 } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -105,3 +117,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,34 +49,24 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'musl-fts-1.2.7' + + + +autotools_config_static -autotools_static musl-fts-1.2.7 + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install @@ -84,6 +93,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -114,3 +127,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/netbsd-curses b/variants/root-x86_64/netbsd-curses @@ -1,17 +1,27 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#@git:51d179dad861640caeb76674b5908ccd79f04fae:curses +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b + +#@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses + + + + +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" export CPATH="$pthbs_build_environment/include" -cd curses -prefix=/versions/$pthbs_package + make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + cat << EOF > config.mak PREFIX=$prefix PREFIX="$prefix" @@ -25,6 +35,7 @@ EOF make -j${JOBS:-1} -l$((1+${JOBS:-1})) make install-static + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -47,6 +58,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -77,3 +92,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/openssl b/variants/root-x86_64/openssl @@ -1,9 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b #@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. + + + +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" @@ -12,11 +20,16 @@ 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})) install +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + check_static command/openssl check_static command/ocspcheck - cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -43,6 +56,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -73,3 +90,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/patch b/variants/root-x86_64/patch @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,42 +49,33 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'patch-2.7.6' -autotools_static patch-2.7.6 --disable-nls -check_static command/patch +autotools_config_static --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/patch cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { -} + x["./command/patch"]=1} function r1(s) { sub("^[.]/[^/]*", ".", s) @@ -83,6 +93,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -113,3 +127,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/patchelf:bootstrap b/variants/root-x86_64/patchelf:bootstrap @@ -3,11 +3,28 @@ #@pragma:nopath #@git:523f401584d9584e76c9c77004e7abeb9e6c4551:patchelf + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -27,38 +44,28 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } -cd patchelf +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'patchelf' + + + ./bootstrap.sh -autotools_static . --disable-nls -check_static command/patchelf +autotools_config_static . --disable-nls + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) +make DESTDIR="$pthbs_destdir" install + + + +check_static command/patchelf cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -82,6 +89,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -112,3 +123,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf @@ -1,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,39 +49,29 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'pkgconf-2.1.1' + + export LDFLAGS=--static -autotools_static pkgconf-2.1.1 --with-pkg-config-dir= +autotools_config_static --with-pkg-config-dir= -check_static command/pkgconf + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) +make DESTDIR="$pthbs_destdir" install + + + +check_static command/pkgconf cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -85,6 +94,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -115,3 +128,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/pkgconf-pkg-config b/variants/root-x86_64/pkgconf-pkg-config @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+pkgconf.006781987ed05efdeafe80154a0b98303ba01102d3f31815621c342f93a0d615 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+pkgconf.124311589b0eaffceb80faf56696a517ff02d4000fb871437f1dc4d5cd5e525b 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,16 +1,35 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -30,33 +49,25 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } -autotools_static popt-1.19 --disable-nls +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'popt-1.19' + + + +autotools_config_static --disable-nls + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + cd "$pthbs_destdir/versions/$pthbs_package" @@ -82,6 +93,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -112,3 +127,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/pthbs-banginstall b/variants/root-x86_64/pthbs-banginstall @@ -1,12 +1,22 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall -installdir="$pthbs_destdir//versions/$pthbs_package" -mkdir -p "$installdir/command" + + + + +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 "$installdir" +zsh -x pthbs-banginstall pthbs-banginstall "${dest}" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -30,6 +40,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -60,3 +74,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync @@ -1,19 +1,38 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 -#+popt.da08834b7ca78162c5c9c16da70e977557eeef1878a6b5ed467c70b22201c013 -#+libressl.5ec790cada590f86c500896e3f05eebb81b83875e3c6ea3abd07aba8c4e6ab1a -#+zstd.a54071cb5a8775df64351daee92b4b19aa24c8634d5421a8b0932998bcd030b3 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 +#+popt.5c010809c7ca9ef730190917d5850b1dbb9625d6282444ff80f2de4b70ddeae8 +#+libressl.1720258e6fb73d0594767b0e418dd6d13b3f8569a8b8d7519ecfd92ddabd9747 +#+zstd.74ecaa8ffa6d09d551f190a6b228032e141cc5f9ef1fd844ed952ab3fd6f5563 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -33,43 +52,34 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'rsync-3.2.7' + -autotools_static rsync-3.2.7 \ - --without-included-popt \ + +autotools_config_static --without-included-popt \ --enable-openssl \ --enable-zstd \ --disable-xxhash \ --disable-lz4 -check_static command/rsync +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/rsync + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -93,6 +103,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -123,3 +137,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6 @@ -1,31 +1,40 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+patch.a9e8e529731f8eaff01ff7c4b676a2ddea81fce80572b7dba3470d1973b8442d -#+skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25 +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf + #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 -: ${JOBS:=1} + + prefix=/versions/$pthbs_package -cd s6 -./configure \ +dest=${pthbs_destdir%/}${prefix} +cd 's6' + +./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad/sysdeps' \ + --with-sysdeps='/versions/skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25/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 + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -47,6 +56,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -77,3 +90,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/s6-dns b/variants/root-x86_64/s6-dns @@ -1,28 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns -: ${JOBS:=1} + + + prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 's6-dns' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad/sysdeps' \ + --with-sysdeps='/versions/skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -44,6 +55,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -74,3 +89,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/s6-linux-init b/variants/root-x86_64/s6-linux-init @@ -1,30 +1,41 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#+s6.d8628fde93f1f7ba3e253353002c5008cd72c4657179a1726af3153a25bc9c58 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25 +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf +#+s6.4f0c07fe475108c8688ea9e2d80f9f06e60b6b7e28b75436046cbec4605f906d #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init -: ${JOBS:=1} + + + prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 's6-linux-init' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad/sysdeps' \ + --with-sysdeps='/versions/skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -46,6 +57,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -76,3 +91,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/s6-linux-utils b/variants/root-x86_64/s6-linux-utils @@ -1,28 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils -: ${JOBS:=1} + + + prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 's6-linux-utils' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad/sysdeps' \ + --with-sysdeps='/versions/skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -44,6 +55,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -74,3 +89,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking @@ -1,32 +1,43 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#+s6.d8628fde93f1f7ba3e253353002c5008cd72c4657179a1726af3153a25bc9c58 -#+s6-dns.46a069527b08ef4b28e7cbf3d4cec842889ebfb463d73ad9243144a9acda989a -#+libressl.5ec790cada590f86c500896e3f05eebb81b83875e3c6ea3abd07aba8c4e6ab1a + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25 +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf +#+s6.4f0c07fe475108c8688ea9e2d80f9f06e60b6b7e28b75436046cbec4605f906d +#+s6-dns.877a566667ebde543fcd0abe99159cf10e2017fe85c90a071f59d0c15b20de4d +#+libressl.1720258e6fb73d0594767b0e418dd6d13b3f8569a8b8d7519ecfd92ddabd9747 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking -: ${JOBS:=1} + + + prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 's6-networking' + ./configure --enable-ssl=libtls \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad/sysdeps' \ + --with-sysdeps='/versions/skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -52,6 +63,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -82,3 +97,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/s6-portable-utils b/variants/root-x86_64/s6-portable-utils @@ -1,28 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils -: ${JOBS:=1} + + + prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 's6-portable-utils' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad/sysdeps' \ + --with-sysdeps='/versions/skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -44,6 +55,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -74,3 +89,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/s6-rc b/variants/root-x86_64/s6-rc @@ -1,30 +1,41 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#+s6.d8628fde93f1f7ba3e253353002c5008cd72c4657179a1726af3153a25bc9c58 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25 +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf +#+s6.4f0c07fe475108c8688ea9e2d80f9f06e60b6b7e28b75436046cbec4605f906d #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc -: ${JOBS:=1} + + + prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} cd 's6-rc' + ./configure \ --prefix="$prefix" \ --dynlibdir="${prefix}/library.so" \ --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.5c0c9d65be9fab0dc7331d90336c4c9fbbc19ba0681a2c56a007347fd8baddad/sysdeps' \ + --with-sysdeps='/versions/skalibs.d635818650df437ce669ed9d01fa4be16a2f13d9df5bed81bfd3131dc8a5cc25/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})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -46,6 +57,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -76,3 +91,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/skalibs b/variants/root-x86_64/skalibs @@ -1,20 +1,23 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs -: ${JOBS:=1} + + + +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" export AR="$pthbs_build_environment/command/x86_64-linux-musl-ar" - export CFLAGS="-O2 -ggdb" -prefix=/versions/$pthbs_package -cd skalibs ./configure \ --prefix="$prefix" \ --sysdepdir="${prefix}/sysdeps" \ @@ -26,8 +29,12 @@ cd skalibs --disable-shared --enable-static make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + make DESTDIR="$pthbs_destdir" install + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -49,6 +56,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -79,3 +90,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep @@ -1,31 +1,38 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 -#+pthbs-banginstall.249673e1473eb7766c7d20ad2d155f9ad35c828714679cf3bc831c7fb9b3ae90 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c +#+pthbs-banginstall.e83271751060d45b4e26c9d63dd28f0f8859de39cd86a2ba6124a4f15a864878 + #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep -: ${JOBS:=1} + + + prefix=/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'snaprep' + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -48,8 +55,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -80,3 +90,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace @@ -1,19 +1,39 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 -#+patch.a9e8e529731f8eaff01ff7c4b676a2ddea81fce80572b7dba3470d1973b8442d -#+libunwind.21021f0307ebc09bc29eaee30d29f26f777e9d9cb4436c9cf0eb2a7bff19f5a9 -#@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 +#+patch.5132407860a7fc2f4779eb741673451dd0e13b07c8b25952db946081d8e563de +#+libunwind.344d5c2904e5cdb1cb6136d77b27090d1dd5f3125b862e38fe7bb64748654127 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch +#@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. + + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -33,39 +53,31 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'strace-6.13' + + -cd strace-6.13 patch -p1 <../strace-6.5-static.patch -autotools_static . --with-unwind --without-libdw --enable-mpers=check -check_static command/strace +autotools_config_static --with-unwind --without-libdw --enable-mpers=check + + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) + + +make DESTDIR="$pthbs_destdir" install + + + +check_static command/strace cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -92,6 +104,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -122,3 +138,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -1,29 +1,30 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+diffutils.4138993fdd1a0766d266e33a52f5e964f2b58bd9f16cfb639bba05e8dfb62e4e -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+aat.205b40d55ba0a6ecceb3664b007574080104d6a57fd71ffd03c135f8ac40635b -#+fileset.434ce1cc2ef456cfc04182f4e2c6c537de8a78a81ea0e5a63258d4421765c850 -#+rsync.239d21280f5ab1d304e39de610a91177fe5bf2cb7815e28be018629ce7330892 -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#+kbd.e27b0fc6e7f93c31160c40b18882654a593306532d0e91edff18beb657f0989c -#+mdevd.f6f5f2ee7309d863ffd72a1dc4ff53a977fa6d17851df8f879ff2b818c1e7779 -#+s6-linux-utils.b83ea8d93a559e8327905d871cb048d1a3006b67dfb31855abcfc732d81ddcbe -#+s6-rc.2cbb9de798ca3a70edcafb668f78b6b190471c5d8325bb1fb8f9a02c060e1c70 -#+s6.d8628fde93f1f7ba3e253353002c5008cd72c4657179a1726af3153a25bc9c58 -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 -#+system-config-scripts.9ea14c0baa0d03226a30f31e9eea3a41ebb3ae04abae4a280f5825d35ff466da -#+logincaps.0be057f3ed01ee93c37d668645f61a712bde44c8351282e8ec2806721ac0a1cc +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+diffutils.04c5fa54e9b88def5daf2f9c4dfb4822daf5e2482f5c4ca8d0a84baf11c037ee +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+aat.3a4791a496db78a9d1b2cddd6c67399326760fd1a380e1f6f7b34d41048066db +#+fileset.852e377bffeb781a1c35711906400eca95c92d5272b8019541ff6d0fd9013c70 +#+rsync.9ec64da524cadb6fe8883b19c5d9812384c588b33dfa5eea62f72db256efe029 +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf +#+kbd.6f086623f14d6c109a09e55942a187fc6dcd62b2e0e82759b5a605bfe687f3b1 +#+mdevd.cf9adaa5f866ec158bfcfc26dba2beb58d9bf2b2dc20c3378cb321dc4a5dffb1 +#+s6-linux-utils.e2984fedee63eb7deba90060fc4e6437f8c384809791ddac001f4026b7eeb40f +#+s6-rc.cd759df9bbf788cfadb2fa05cb502da9dd5214f9fca863f7f28d91d7a759ef54 +#+s6.4f0c07fe475108c8688ea9e2d80f9f06e60b6b7e28b75436046cbec4605f906d +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c +#+system-config-scripts.433598d380031fac19b3f00da20ebd279356d74ab33d670ce26f3de9bd4ce246 +#+logincaps.5576282225839a1d2324dcb0d2dd5d591fd32943936c7a5e72e6aface58c23d6 #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -def_prefix -def_dest + + + +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 @@ -39,8 +40,6 @@ linkdep() { ln -sf $exe "$dest/deps/command/$name" } -cd 'system-config' - printf '%s\n' >config/etc/motd \ "Welcome to $(cat ./config/hostname)!" \ 'Current running configuration was generated from system-config:cdeb78362ceacd8087b1d04ef26573cb115b7844' \ @@ -52,8 +51,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.9f7c07dc9db9965e4ed1c7ee02e5735dee2d359e225353703c320782110425f9' \ - 'pthbs_path_mdevd=/versions/env.32f82a34a5e77063141f26a771ed2be08064c9cc91a55461eb60032e81cd6eee' \ + 'pthbs_path_containers=/versions/env.2302126f90c8e8a1307e5341b3fb4ddb8729b957e9a6e14076bdcebe9b4306ff' \ + 'pthbs_path_mdevd=/versions/env.b940ea967777a47aa806ad7c4fc50eaca1456d3f46a853858f17e1f39bf4bbbd' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do @@ -78,6 +77,12 @@ mv -v keys "$dest/" cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { + x["./command/install-as-current-environment.postinstall"]=1 + x["./config/etc/fstab"]=1 + x["./config/etc/motd"]=1 + x["./config/etc/skel/loginexec"]=1 + x["./config/hostname"]=1 + x["./keys/ssh/root"]=1 } function r1(s) { @@ -98,6 +103,8 @@ $1!="."{exit 1} $2 == "config" { link($0); next } $2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -128,3 +135,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -1,32 +1,39 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+s6.d8628fde93f1f7ba3e253353002c5008cd72c4657179a1726af3153a25bc9c58 -#+s6-rc.2cbb9de798ca3a70edcafb668f78b6b190471c5d8325bb1fb8f9a02c060e1c70 -#+s6-portable-utils.b925df30b752d1d21d57accda2aad7c0f6e59ec97da2497725f1bf2f93f14600 -#+s6-linux-init.596f266b3f1959fdfcc2cf72c66131beeb21a31dfab00b9a553bef308384c976 -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#+system-config-rc.fbf11ec8d4754993f9f927a2c7514cf7e958f5e872ee441909bbb2748b4ec16e - -s6rcdb=/versions/system-config-rc.fbf11ec8d4754993f9f927a2c7514cf7e958f5e872ee441909bbb2748b4ec16e/config/s6-rc-db +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+s6.4f0c07fe475108c8688ea9e2d80f9f06e60b6b7e28b75436046cbec4605f906d +#+s6-rc.cd759df9bbf788cfadb2fa05cb502da9dd5214f9fca863f7f28d91d7a759ef54 +#+s6-portable-utils.a51f66f4409b325395b0122f379df9075e9cdf289229b4edec61f4ceaf4cdf93 +#+s6-linux-init.cb53f1b9e5c4b48137e097ae48bf9f5b0e1868bf3fb20d69cff570e45d19103d +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf +#+system-config-rc.f199d73a4af5f41c801b9cda75e13a49a14862580cdc8a9f5f85a452e8e04230 + + + + + prefix=/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" +dest=${pthbs_destdir%/}${prefix} +cd 'system-config-init' + -q() { +q() { # quote list of strings to be suitable for execline "s6-quote" "$@" } - -qx() { +qx() { # register executable as dependency and quote full path to be suitable for execline exe=$(realpath "$(which "$1")") name=$(basename "$1") if ! test -x "$exe"; then printf 'Error: executable not found: %s\n' "$1" fi - mkdir -p "$pkgdir/deps/command" - ln -sf $exe "$pkgdir/deps/command/$name" + mkdir -p "${dest}/deps/command" + ln -sf $exe "${dest}/deps/command/$name" "s6-quote" "$prefix/deps/command/$name" } -# Generate init ($pkgdir must not exist but parent dir does) +s6rcdb=/versions/system-config-rc.f199d73a4af5f41c801b9cda75e13a49a14862580cdc8a9f5f85a452e8e04230/config/s6-rc-db + +# Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//versions" s6-linux-init-maker \ -p "/run/current/command:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \ @@ -34,7 +41,7 @@ s6-linux-init-maker \ -t 1 \ -N \ -c "$prefix" \ - "$pkgdir" + "${dest}" # Link deps that are passed to s6-l-i-m @@ -46,17 +53,17 @@ qx execlineb el=$prefix/deps/command/$name # Rewrite bin/init as it fails finding it's own s6-linux-init -s6-cat >"$pkgdir/bin/init.new" <<EOF || exit $? +s6-cat >"${dest}/bin/init.new" <<EOF || exit $? #!$el -S0 $(qx pthbs-enter) $(qx s6-envdir) -I /run/current/env EOF -s6-cat >>"$pkgdir/bin/init.new" <"$pkgdir/bin/init" -chmod +x "$pkgdir/bin/init.new" -mv -v "$pkgdir/bin/init.new" "$pkgdir/bin/init" +s6-cat >>"${dest}/bin/init.new" <"${dest}/bin/init" +chmod +x "${dest}/bin/init.new" +mv -v "${dest}/bin/init.new" "${dest}/bin/init" # Rewrite dynamically generated scripts -s6-cat >"$pkgdir/scripts/rc.init" <<EOF || exit $? +s6-cat >"${dest}/scripts/rc.init" <<EOF || exit $? #!$el -S1 $(qx export) TERM "linux" $(qx foreground) { $(qx s6-echo) "* Starting s6-rc from "$(q "$s6rcdb") } @@ -64,7 +71,7 @@ $(qx if) { $(qx s6-rc-init) -d -c $(q "$s6rcdb") /run/service } $prefix/scripts/runlevel \$1 EOF -s6-cat >"$pkgdir/scripts/rc.shutdown" <<EOF || exit $? +s6-cat >"${dest}/scripts/rc.shutdown" <<EOF || exit $? #!$el -P ### Things to do before hardware halt/reboot/poweroff. @@ -76,7 +83,7 @@ $(qx redirfd) -w 2 /dev/console $(qx s6-rc) -v2 -bDa change EOF -s6-cat >"$pkgdir/scripts/runlevel" <<EOF || exit $? +s6-cat >"${dest}/scripts/runlevel" <<EOF || exit $? #!$el -S1 export TERM "linux" @@ -103,16 +110,34 @@ $(qx foreground) { $(qx s6-svc) -d /run/service/console-log-tail } $(qx s6-rc) -v 2 -t 600000 -- change ok-all EOF -s6-mkdir "$pkgdir/run-image/service/console-log-tail" || exit $? -s6-cat >"$pkgdir/run-image/service/console-log-tail/run" <<EOF || exit $? +s6-mkdir "${dest}/run-image/service/console-log-tail" || exit $? +s6-cat >"${dest}/run-image/service/console-log-tail/run" <<EOF || exit $? #!$el -P $(qx redirfd) -w 1 /dev/console $(qx fdmove) -c 2 1 $(qx pipeline) -w { $(qx s6-tai64nlocal) } $(qx tail) -F -n +1 /run/uncaught-logs/current EOF -s6-chmod 755 "$pkgdir/run-image/service/console-log-tail/run" exit $? +s6-chmod 755 "${dest}/run-image/service/console-log-tail/run" exit $? + +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} +check_static bin/init +check_static bin/halt +check_static bin/poweroff +check_static bin/reboot cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -138,6 +163,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -168,3 +197,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc @@ -1,23 +1,26 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+s6-rc.2cbb9de798ca3a70edcafb668f78b6b190471c5d8325bb1fb8f9a02c060e1c70 -#+fileset.434ce1cc2ef456cfc04182f4e2c6c537de8a78a81ea0e5a63258d4421765c850 -#+system-config.484e760e51c9a6db1f86b3036d4cbd5dc668637c4e17c48677e88a26ffd6a3c1 - -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -def_dest +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+s6-rc.cd759df9bbf788cfadb2fa05cb502da9dd5214f9fca863f7f28d91d7a759ef54 +#+fileset.852e377bffeb781a1c35711906400eca95c92d5272b8019541ff6d0fd9013c70 +#+system-config.fbf7bf229ee2929068555c461a8469fe443640b2b27de84c3e950f3a918bdbc9 + + + -src=/versions/system-config.484e760e51c9a6db1f86b3036d4cbd5dc668637c4e17c48677e88a26ffd6a3c1/config/s6-rc-source + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'system-config-rc' + + +src=/versions/system-config.fbf7bf229ee2929068555c461a8469fe443640b2b27de84c3e950f3a918bdbc9/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -40,6 +43,9 @@ $1!="."{exit 1} $2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -70,3 +76,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/system-config-scripts b/variants/root-x86_64/system-config-scripts @@ -1,31 +1,37 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 -#+pthbs-banginstall.249673e1473eb7766c7d20ad2d155f9ad35c828714679cf3bc831c7fb9b3ae90 -#@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts -: ${JOBS:=1} +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c +#+pthbs-banginstall.e83271751060d45b4e26c9d63dd28f0f8859de39cd86a2ba6124a4f15a864878 + + + + + prefix=/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" +dest=${pthbs_destdir%/}${prefix} cd 'system-config-scripts' + for d in bin sbin command; do if test -d "$d"; then - pthbs-banginstall "$d"/* "$pkgdir" + pthbs-banginstall "$d"/* "${dest}" fi done if test -d vim; then - mkdir -p "$pkgdir/vimfiles/pack/plugins/start" - mv -v vim "$pkgdir/vimfiles/pack/plugins/start/$pthbs_package" + mkdir -p "${dest}/vimfiles/pack/plugins/start" + mv -v vim "${dest}/vimfiles/pack/plugins/start/$pthbs_package" fi if test -d zsh-functions; then - mkdir -p "$pkgdir/zsh" - mv -v zsh-functions "$pkgdir/zsh/site-functions" + mkdir -p "${dest}/zsh" + mv -v zsh-functions "${dest}/zsh/site-functions" fi + + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -48,8 +54,11 @@ function link(src) { $1!="."{exit 1} -$2 == "zsh" { link($0); next } $2 == "vimfiles" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -80,3 +89,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/system-config-zsh b/variants/root-x86_64/system-config-zsh @@ -1,22 +1,23 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c + #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package -} -def_prefix -def_dest + + +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 { @@ -38,8 +39,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } $2 == "zsh" { link($0); next } -$2 == "vimfiles" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -70,3 +73,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env @@ -1,13 +1,23 @@ #!/usr/bin/env pthbs-build -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#+pthbs-banginstall.249673e1473eb7766c7d20ad2d155f9ad35c828714679cf3bc831c7fb9b3ae90 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf +#+pthbs-banginstall.e83271751060d45b4e26c9d63dd28f0f8859de39cd86a2ba6124a4f15a864878 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env -installdir="$pthbs_destdir//versions/$pthbs_package" -mkdir -p "$installdir/command" + + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd '.' + + +mkdir -p "${dest}/command" chmod +x user-env -pthbs-banginstall user-env "$installdir" +pthbs-banginstall user-env "${dest}" + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -31,6 +41,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -61,3 +75,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + 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.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+diffutils.4138993fdd1a0766d266e33a52f5e964f2b58bd9f16cfb639bba05e8dfb62e4e -#+patch.a9e8e529731f8eaff01ff7c4b676a2ddea81fce80572b7dba3470d1973b8442d -#+flex.00222eb0858c9942b9eb0c93af6bc9438c5a189a54cc78d636183509bb910361 -#+bison.896621605c03a9080b8234a1e66281b7a9894bc65c6ef4a3c4f99c595c955404 -#+rsync.239d21280f5ab1d304e39de610a91177fe5bf2cb7815e28be018629ce7330892 -#+execline.432a563054e8ce92f19c3f1d39ccedf35733ba81d1b38aa1bec1642e19d43dc8 -#+s6.d8628fde93f1f7ba3e253353002c5008cd72c4657179a1726af3153a25bc9c58 -#+s6-rc.2cbb9de798ca3a70edcafb668f78b6b190471c5d8325bb1fb8f9a02c060e1c70 -#+s6-portable-utils.b925df30b752d1d21d57accda2aad7c0f6e59ec97da2497725f1bf2f93f14600 -#+s6-linux-utils.b83ea8d93a559e8327905d871cb048d1a3006b67dfb31855abcfc732d81ddcbe -#+s6-linux-init.596f266b3f1959fdfcc2cf72c66131beeb21a31dfab00b9a553bef308384c976 -#+mdevd.f6f5f2ee7309d863ffd72a1dc4ff53a977fa6d17851df8f879ff2b818c1e7779 -#+s6-dns.46a069527b08ef4b28e7cbf3d4cec842889ebfb463d73ad9243144a9acda989a -#+libressl.5ec790cada590f86c500896e3f05eebb81b83875e3c6ea3abd07aba8c4e6ab1a -#+s6-networking.8357c47f2723fdc19dc1d56a9fde206114127cd640b8324357679539bc7956de -#+zsh.6ebae6a8e2e46e1366eed8c9fa2c1e6a8ad09100cb6a0794bcaea354973035a8 -#+pthbs-banginstall.249673e1473eb7766c7d20ad2d155f9ad35c828714679cf3bc831c7fb9b3ae90 -#+aat.205b40d55ba0a6ecceb3664b007574080104d6a57fd71ffd03c135f8ac40635b -#+confz.0c5fee3168fd8b2dc26f87e64f2c3aebb2061578d371a1993e84c228308cf946 -#+containers.783e24447786fe667c602e806b06f43e31021ca1b60ecda1bc1faa83c1777c30 -#+fileset.434ce1cc2ef456cfc04182f4e2c6c537de8a78a81ea0e5a63258d4421765c850 -#+logincaps.0be057f3ed01ee93c37d668645f61a712bde44c8351282e8ec2806721ac0a1cc -#+snaprep.663d9aba62f16d75162b7026b338fa2ecc0536dc4feb9ea65b5422a5b116ea3f -#+curl.138cde93b5815de702799b406e50847db41875455c2d03f8c367866031ad32c5 -#+git.6ccd4b83e0b065e1af42c14f7f31eae8d44420d9ab54b4c62418ace02d5fa9f1 -#+xbps.a41ba365036b82076650b66c8db5549d62967bd531f67f6de96070505126e5f9 -#+apk-tools.be0f3867fc9008f2dfe2730e727f7436bc29efbcef0fdbf931fd3813add1a438 -#+getent.c0de0dd3375e5c67b9a3c1385091bac35da92c383e8b4aa7485deea738fe972c -#+getconf.b3fb9ea316934b57944c5e21bfe59f8d2f30393100bf360fa72cb0329b97704e -#+iconv.cccaea09de4fb7223e9733a18f6b1cde643e7b46ef606979ef830e860e1798e6 -#+libcap.69d5804a91c4e95e1ee9eb62a94b16f49316541e48dedea5608820765f223fce -#+applyuidgid-caps.c07358d37a56467f8d610cb5ceb76365fc48cbd66ec14c5bda22d1042633279a -#+ccx-utils.2af8c3da1c223ad03338868c6e3546cd68cdf5b762d08a2474138d9724d2b6a8 -#+user-env.70b104400966765a8b3818d455ec35ab73fc59cd575c654ba08a7c7917009161 -#+strace.e807758f985eeb720c04ba093a712b97023887228d7eda81e56792075369499e -#+mlog.3d5b9f0177235a25d319603779cebd52df8324a892ef68b375c47498189292a6- \ No newline at end of file +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+diffutils.04c5fa54e9b88def5daf2f9c4dfb4822daf5e2482f5c4ca8d0a84baf11c037ee +#+patch.5132407860a7fc2f4779eb741673451dd0e13b07c8b25952db946081d8e563de +#+flex.f013b317e1dbbc2c60f41ba89f5e2d1fd85648d293790b8d02dcf389a69236fa +#+bison.a8e2eb9101bcac70fa3f14d6a362b1038b83bc4ed81c3392a90c4d1288bfd4ae +#+rsync.9ec64da524cadb6fe8883b19c5d9812384c588b33dfa5eea62f72db256efe029 +#+execline.e1a9512727ffe759495a6355e51df919120c6ae44a47a4c0fc2c920844a314bf +#+s6.4f0c07fe475108c8688ea9e2d80f9f06e60b6b7e28b75436046cbec4605f906d +#+s6-rc.cd759df9bbf788cfadb2fa05cb502da9dd5214f9fca863f7f28d91d7a759ef54 +#+s6-portable-utils.a51f66f4409b325395b0122f379df9075e9cdf289229b4edec61f4ceaf4cdf93 +#+s6-linux-utils.e2984fedee63eb7deba90060fc4e6437f8c384809791ddac001f4026b7eeb40f +#+s6-linux-init.cb53f1b9e5c4b48137e097ae48bf9f5b0e1868bf3fb20d69cff570e45d19103d +#+mdevd.cf9adaa5f866ec158bfcfc26dba2beb58d9bf2b2dc20c3378cb321dc4a5dffb1 +#+s6-dns.877a566667ebde543fcd0abe99159cf10e2017fe85c90a071f59d0c15b20de4d +#+libressl.1720258e6fb73d0594767b0e418dd6d13b3f8569a8b8d7519ecfd92ddabd9747 +#+s6-networking.8e3c15a357e077a455be1f1eafde9b7a052eb6acaf791526afc55c7487ab1e61 +#+zsh.eabf337d71d8a79b463c53e4263ea467145441f4710933d0fdd7a5333d136d5c +#+pthbs-banginstall.e83271751060d45b4e26c9d63dd28f0f8859de39cd86a2ba6124a4f15a864878 +#+aat.3a4791a496db78a9d1b2cddd6c67399326760fd1a380e1f6f7b34d41048066db +#+confz.585454eeb01deb79c027829dcea4e3388317cc85badfc0f3108e20e4b4d876a3 +#+containers.0e20aded403593557507f61e15d06a30c5eb7876fdc6703f32192349f8207d54 +#+fileset.852e377bffeb781a1c35711906400eca95c92d5272b8019541ff6d0fd9013c70 +#+logincaps.5576282225839a1d2324dcb0d2dd5d591fd32943936c7a5e72e6aface58c23d6 +#+snaprep.4be57f45c3bb52a54a74c3dff4276543bcdb98b7966c2cdee12254bff4828509 +#+curl.b5d10267a5714adcd48a51d4be0249ee9b28f91c46bd14cc4aacbc58e6009a58 +#+git.eb757d0b7226e74bad0eff9941f640c284f11a3ec6479aa8820ce8607994e9f9 +#+xbps.038c67f679398d5d66a024f53db44722fb6709a2ecc562888d28288d18311150 +#+apk-tools.17f2b71de2861d2d3a3e847793edb35fe84f827217aa8fe22e418dd97886ca95 +#+getent.68c8d23deb2b5ae2227c182a446de42e6367b6dcee27175a7a41949e6135785d +#+getconf.0e7409ad78f78cb39c4f4b781743277aebf70f124c1084d6c882e1ed7e8e5c4c +#+iconv.9fff939da21dbf81ec0f7038d9b0e96b56e4590e6a0a9a7383796b64c0d5459a +#+libcap.ba8f9ed96fd176a0826e5ea4c3ca63a6b2528955350469bc8335ae81d5033766 +#+applyuidgid-caps.0ea7dceea2b85f3b0f35e918de3da6ca1a9a8ab71aa718800e86b6d320c8de5d +#+ccx-utils.062bf67bbee69235561c8badf805e2af00da42519b37a159d06d437b8c13baa5 +#+user-env.085c0e79091d11490d102eb98e116195226910bde321ccf95b9cf3d0c7a80158 +#+strace.4302766c2d60b86f4f69fc34088ecf2b781aff42bb82bc847699c7b27b7086d3 +#+mlog.6473f7f1c8420fc18d1112ef997d9ea78c45351596529dcf1a6baa8edaf6f5fc+ \ 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.24ff1523d58fb97ea6e0e029b1e4028466a92d4ac81ea473ffa5c18118a273a3- \ No newline at end of file +#+linux-qemu-guest.99c3bd32fb52a1836bc289e816519a2f3a8c0bdc475b5c16c1b40c49f94eb985+ \ No newline at end of file diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps @@ -1,80 +1,28 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 -#+libarchive.ec5bc22e24837c8d5363b0e9dfd11c2ec76a84e59e4bb0d713bf6cd84986c5df -#+libressl.5ec790cada590f86c500896e3f05eebb81b83875e3c6ea3abd07aba8c4e6ab1a -#+pkgconf-pkg-config.e76c8de275dbcbbf67bca23e0f573d4a1765438a9fd3bc14c76d45e6b7552c39 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+libarchive.dde30d3c6cb1ded353f2232ad9d8c90785b515acd28bbfd83b025d347f389bab +#+libressl.1720258e6fb73d0594767b0e418dd6d13b3f8569a8b8d7519ecfd92ddabd9747 +#+pkgconf-pkg-config.2776bc621d98e6a8a53db55f903d855e8636000d2afd2eddf67d6b14eea746f3 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} -autotools_config() { - prefix=/versions/$pthbs_package - ./configure -C \ - --prefix="$prefix" \ - --build="$(${CC:-gcc} -dumpmachine)" \ - --bindir="$prefix/command" \ - --sbindir="$prefix/command" \ - --infodir="$prefix/info" \ - --localedir="$prefix/locale" \ - --mandir="$prefix/man" \ - --libdir="$prefix/library" \ - --docdir="$prefix/doc/xbps" \ - --datadir="$prefix/data" \ - --datarootdir="$prefix/data" \ - --localstatedir='/var/pthbs' \ - "$@" -} -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} -autotools_static() { - build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'xbps-0.59.2' -def_prefix() { - prefix=/versions/$pthbs_package -} -def_dest() { - dest=${pthbs_destdir%/}//versions/$pthbs_package +build_env_static() { + export LD_LIBRARY_PATH="$pthbs_build_environment/library" + export CPATH="$pthbs_build_environment/include" + export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } - -export LDFLAGS=--static -export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" build_env_static -def_dest -def_prefix -cd xbps-0.59.2 find lib bin -name '*.c' -exec sed -iEe '/^[\t ]*#[\t ]*define[\t ]+_GNU_SOURCE/d' '{}' \; find lib bin -name '*.c' -exec sed -iEe '/#.*_GNU_SOURCE/d' '{}' \; + ./configure --verbose \ --prefix="$prefix" \ --build="$(${CC:-gcc} -dumpmachine)" \ @@ -86,8 +34,10 @@ 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" @@ -98,12 +48,25 @@ done 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 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} check_static command/xbps-install.static mkdir -p "$dest/keys" mv -v "$pthbs_destdir/var/db/xbps/keys" "$dest/keys/void" - - cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -126,6 +89,10 @@ $1!="."{exit 1} $2 == "keys" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -156,3 +123,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh @@ -1,19 +1,38 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 -#+m4.92b752ba28b1527c0886b2f7abe58106cc88e4d5dc4c538975b7c1e4ec609500 -#+netbsd-curses.fcf1cfdedde17dad8d7ad2c5b47f7d0fe6ac4b12efe761d1dcaf5c3718a4b7fb -#+libbsd.4bd9222a3da6a7581071f17d1549d86fa7dbcf19845f355ba92fc72140bcf985 + +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+m4.f4fe375519675db20d3094d67c6a8afdcb3c398e01867316f00f5a95297fd1e9 +#+netbsd-curses.38a7ef138e3faf82d351a0a3554df67802194f421e19e4e39b85c82e8418e26e +#+libbsd.357849e7ea19aba0c5a644225c74bab290cfe086fd2a01c8f4ac7d2f9be6ceb9 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. + + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} + autotools_config() { prefix=/versions/$pthbs_package ./configure -C \ @@ -33,60 +52,44 @@ autotools_config() { } -autotools() { - cd "$1" - shift - autotools_config "$@" - make -j${JOBS:-1} -l$((1+${JOBS:-1})) - make DESTDIR="$pthbs_destdir" install -} - -autotools_static() { +autotools_config_static() { build_env_static - autotools "$@" --enable-static --disable-shared -} -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + autotools_config "$@" --enable-static --disable-shared } -build_env_static -cd zsh-5.9 -autotools_config \ - --enable-static --disable-shared \ +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'zsh-5.9' + + + +autotools_config_static --enable-static --disable-shared \ --enable-libc-musl --disable-locale \ --enable-cap \ --enable-maildir-support \ - --enable-datadir="/versions/$pthbs_package" \ - --enable-datarootdir="/versions/$pthbs_package" \ - --enable-etcdir="/versions/$pthbs_package/etc" \ - --enable-scriptdir="/versions/$pthbs_package/zsh/scripts" \ - --enable-site-scriptdir="/versions/$pthbs_package/zsh/site-scripts" \ - --enable-fndir="/versions/$pthbs_package/zsh/functions" \ - --enable-site-fndir="/versions/$pthbs_package/zsh/site-functions" \ - --enable-runhelpdir="/versions/$pthbs_package/zsh/help" + --enable-datadir="${prefix}" \ + --enable-datarootdir="${prefix}" \ + --enable-etcdir="${prefix}/etc" \ + --enable-scriptdir="${prefix}/zsh/scripts" \ + --enable-site-scriptdir="${prefix}/zsh/site-scripts" \ + --enable-fndir="${prefix}/zsh/functions" \ + --enable-site-fndir="${prefix}/zsh/site-functions" \ + --enable-runhelpdir="${prefix}/zsh/help" + sed -Ee '/name=zsh\/(files|stat|system|zselect|zutil|regex|net\/socket|net\/tcp) /s/link=[^ ]+/link=static/' -i config.modules cat config.modules + make -j${JOBS:-1} -l$((1+${JOBS:-1})) cat Src/zshpaths.h make DESTDIR="$pthbs_destdir" install -mv -v ../zsh_config/etc "$pthbs_destdir//versions/$pthbs_package/" -mv -v ../zsh_config/zsh-functions/* "$pthbs_destdir//versions/$pthbs_package/zsh/site-functions/" -check_static command/zsh +mv -v ../zsh_config/etc "${dest}/" +mv -v ../zsh_config/zsh-functions/* "${dest}/zsh/site-functions/" +check_static command/zsh cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' @@ -113,6 +116,10 @@ $1!="."{exit 1} $2 == "zsh" { link($0); next } +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -143,3 +150,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links + diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd @@ -1,23 +1,21 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc -#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 -#+busybox.2dca4670067de07a66c2f0192ceb3ad1dd7f1a4fa19f0adfd9992b0952897f07 -#+busybox-diffutils.c47a0fa6378a9360b129bd90ce77427aa19d514c1906c825c61539def5423111 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-findutils.a5387458c3161d556927ac0318640c56d7f4bc708bafc7418326706ae8f6725a +#+musl-cross-make.8fc5c95668fce100aa1a35c11d3909aae419737e105a17c89d0db0beb9c5f90b +#+gnu-make.b2012881790e6e18e1ab2a3fb70520b619e873a8c1b3bd9601ac02d3755abf78 +#+busybox.3fd1a2fcc09904765bd3ed2741c87765b257636adcf85a94418739c5bc5f69fc +#+busybox-diffutils.55f1c248a3543bd3a84523a20f179aae6e8f151936e83c55b7a7a41e4df363d9 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. -check_static() { - local exe || true - exe=$pthbs_destdir/'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} + + + + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'zstd-1.5.5' + + build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" @@ -25,7 +23,6 @@ build_env_static() { } build_env_static -cd zstd-1.5.5 make -j${JOBS:-1} -l$((1+${JOBS:-1})) default install \ V=1 \ DESTDIR="$pthbs_destdir" \ @@ -33,11 +30,24 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) default install \ datarootdir="/versions/$pthbs_package" \ bindir="/versions/$pthbs_package/command" \ libdir="/versions/$pthbs_package/library" - -check_static command/zstd rm -v "$pthbs_destdir//versions/$pthbs_package/library"/*.so* +check_static() { + local exe || true + exe=$pthbs_destdir'/versions'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + if test x '!=' "x$interp_info"; then + printf '%s\n' "Error: '$1' is a dynamic binary!" + exit 1 + fi +} +check_static command/zstd + cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { @@ -60,6 +70,10 @@ function link(src) { $1!="."{exit 1} +$2 == "config" { link($0); next } +$2 == "keys" { link($0); next } +$2 == "zsh" { link($0); next } +$2 == "env" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -90,3 +104,4 @@ END { } }' >.install-links.new mv .install-links.new .install-links +