pthbs

Packaging Through Hashed Build Scripts
git clone https://ccx.te2000.cz/git/pthbs
Log | Files | Refs | Submodules | README

commit 61c27e6ac39ec2f04efec3606dd3db2cce34aa8e
parent b4bbe8b95092e910ef4dee5b3e4ddb02adf6a795
Author: ccx <ccx@te2000.cz>
Date:   Wed, 28 Feb 2024 19:16:54 +0000

static xbps & apk

Diffstat:
M.gitmodules | 3+++
Mdownloadlist.sha256 | 7+++++++
Mfiles/update-links | 4++++
Mpackages/aat | 6+++---
Apackages/apk-tools | 107+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mpackages/bison | 14+++++++-------
Mpackages/bootstrap.environment | 4++--
Mpackages/busybox | 6+++---
Mpackages/busybox-diffutils | 2+-
Mpackages/busybox-login | 2+-
Mpackages/busybox:bootstrap | 4++--
Mpackages/confz | 6+++---
Mpackages/containers | 12+++++++-----
Apackages/containers.environment | 11+++++++++++
Mpackages/core-system-conf | 10+++++-----
Mpackages/core-system-init | 18+++++++++---------
Mpackages/core-system-rc | 12++++++------
Mpackages/core-system-scripts | 6+++---
Mpackages/curl | 14+++++++-------
Mpackages/default.environment | 68+++++++++++++++++++++++++++++++++++---------------------------------
Mpackages/diffutils | 12++++++------
Mpackages/elf.h | 2+-
Mpackages/elfutils | 14+++++++-------
Mpackages/execline | 10+++++-----
Mpackages/fileset | 6+++---
Mpackages/flex | 12++++++------
Mpackages/git | 14+++++++-------
Mpackages/gnu-make | 8++++----
Mpackages/gnu-make:bootstrap | 2+-
Mpackages/kernel.environment | 4++--
Apackages/libarchive | 118+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mpackages/libelf-compat | 6+++---
Mpackages/libelf.h | 2+-
Mpackages/libressl | 12++++++------
Mpackages/linux | 18+++++++++---------
Mpackages/logincaps | 10+++++-----
Mpackages/m4 | 10+++++-----
Mpackages/mdevd | 12++++++------
Mpackages/musl-cross-make | 18++++++++++++++++--
Mpackages/netbsd-curses | 6+++---
Mpackages/patch | 12++++++------
Mpackages/patchelf:bootstrap | 2+-
Apackages/pkgconf | 115+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Apackages/pkgconf-pkg-config | 11+++++++++++
Mpackages/popt | 12++++++------
Mpackages/pthbs-banginstall | 4++--
Mpackages/rsync | 16++++++++--------
Mpackages/s6 | 14+++++++-------
Mpackages/s6-dns | 10+++++-----
Mpackages/s6-linux-init | 14+++++++-------
Mpackages/s6-linux-utils | 10+++++-----
Mpackages/s6-networking | 18+++++++++---------
Mpackages/s6-portable-utils | 10+++++-----
Mpackages/s6-rc | 14+++++++-------
Mpackages/skalibs | 6+++---
Mpackages/snaprep | 6+++---
Mpackages/userspace.environment | 60+++++++++++++++++++++++++++++++-----------------------------
Apackages/xbps | 147+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mpackages/zsh | 14+++++++-------
Apackages/zstd | 92+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Asources/apk-tools | 1+
Atemplates/functions/vars | 6++++++
Atemplates/pkg/apk-tools | 39+++++++++++++++++++++++++++++++++++++++
Mtemplates/pkg/containers | 2++
Atemplates/pkg/containers.environment | 10++++++++++
Atemplates/pkg/libarchive | 18++++++++++++++++++
Mtemplates/pkg/musl-cross-make | 14++++++++++++++
Atemplates/pkg/pkgconf | 15+++++++++++++++
Atemplates/pkg/pkgconf-pkg-config | 13+++++++++++++
Mtemplates/pkg/userspace.environment | 2++
Atemplates/pkg/xbps | 47+++++++++++++++++++++++++++++++++++++++++++++++
Atemplates/pkg/zstd | 29+++++++++++++++++++++++++++++
Mvars.yaml | 2+-
73 files changed, 1114 insertions(+), 283 deletions(-)

diff --git a/.gitmodules b/.gitmodules @@ -80,3 +80,6 @@ [submodule "sources/zsh_config"] path = sources/zsh_config url = ./sources/zsh_config +[submodule "sources/apk-tools"] + path = sources/apk-tools + url = https://gitlab.alpinelinux.org/alpine/apk-tools.git diff --git a/downloadlist.sha256 b/downloadlist.sha256 @@ -33,3 +33,10 @@ d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b 80888824 https: 6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954 4473978 http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.8.2.tar.gz 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 2630108 https://curl.haxx.se/download/curl-8.6.0.tar.xz f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9 7388636 http://cdn.kernel.org/pub/software/scm/git/git-2.43.2.tar.xz +98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1 2386533 https://github.com/facebook/zstd/archive/v1.5.5.tar.gz +04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb 5237056 https://libarchive.org/downloads/libarchive-3.7.2.tar.xz +3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5 311956 https://distfiles.ariadne.space/pkgconf/pkgconf-2.1.1.tar.xz +a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b 408144 https://github.com/void-linux/xbps/archive/0.59.2.tar.gz +d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c 11614 https://dev.gentoo.org/~blueness/musl-misc/getconf.c +f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7 2577 https://dev.gentoo.org/~blueness/musl-misc/iconv.c +002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8 11656 https://gitlab.alpinelinux.org/alpine/aports/-/raw/93a08815f8598db442d8b766b463d0150ed8e2ab/main/musl/getent.c diff --git a/files/update-links b/files/update-links @@ -10,3 +10,7 @@ for f in ../*(.); do h=${"$(sha256sum $f)"%% *} || exit $? ln -sTf $f $h || exit $? done +for f in ../../downloads/sha256/*(.); do + h=${f:t} + ln -sTf $f $h || exit $? +done diff --git a/packages/aat b/packages/aat @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89 -#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 +#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat : ${JOBS:=1} diff --git a/packages/apk-tools b/packages/apk-tools @@ -0,0 +1,107 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349 +#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3 +#+zstd.62d99b3e023021ff3e372f212569b6fb81c47c91a00c49dfd35f3f508e7370d1 +#+pkgconf-pkg-config.9ce762e8803a43c875dd59a366babec3f2ac504bf3985bba236c13f70b396f43 +#@git:4cfb907282ede4b7f52f2514fbf96c60e1cad441:apk-tools +#@sha256:921442b5f5bd0070caeb9c27137e63b804e634a2f5a2d69a82145362b2055b33: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 +} +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 \ + DESTDIR="$pthbs_destdir" \ + SBINDIR="$prefix/command" \ + CONFDIR="$prefix/etc/apk" \ + MANDIR="$prefix/man" \ + DOCDIR="$prefix/doc/apk" \ + INCLUDEDIR="$prefix/include" \ + LIBDIR="$prefix/library" \ + PKGCONFIGDIR="$prefix/library/pkgconfig" \ + install-static + +check_static command/apk.static + +cd "$pthbs_destdir/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./command/apk.static"]=1 + x["./library/libapk.a"]=1 + x["./library/pkgconfig/apk.pc"]=1} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} + + +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } + +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "icons" { link($0); next } +$2 == "terminfo" { link($0); next } + +$2 == "include" { link($0); next } + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + exit 3 + } + } +}' >.install-links.new +mv .install-links.new .install-links diff --git a/packages/bison b/packages/bison @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423 -#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9 -#+flex.c923d0974d874dbc8e34a1feeecd62a38821e7cb5b17e5d132ceb0edffa96d12 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+flex.c564f7c6d8a89cd1c53a5677f65987700122bb0a417dfff9348c78b8df17efb9 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. build_env_static() { @@ -24,7 +24,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/bison" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } diff --git a/packages/bootstrap.environment b/packages/bootstrap.environment @@ -1,3 +1,3 @@ -#+busybox.a6967ee47f129477093e0d7be6e2a6c676599efa95da22b23de805c8ff6d79e7 -#+gnu-make.661c6659ee3f0a8089f3fccb50c9a61631b58ccb4f024502bf49f0c4dd78afe4 +#+busybox.750086742815fb3f1e218ab2d859e1f84284296fad512b5598df8b100bca4e3a +#+gnu-make.49c2bb1b7d1b12bd86dc9dbf20aecf4218d79aa432e8862ee8e10324ba14516f #+musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f \ No newline at end of file diff --git a/packages/busybox b/packages/busybox @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.661c6659ee3f0a8089f3fccb50c9a61631b58ccb4f024502bf49f0c4dd78afe4 -#+busybox.a6967ee47f129477093e0d7be6e2a6c676599efa95da22b23de805c8ff6d79e7 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.49c2bb1b7d1b12bd86dc9dbf20aecf4218d79aa432e8862ee8e10324ba14516f +#+busybox.750086742815fb3f1e218ab2d859e1f84284296fad512b5598df8b100bca4e3a #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab:busybox/.config diff --git a/packages/busybox-diffutils b/packages/busybox-diffutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/packages/busybox-login b/packages/busybox-login @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/packages/busybox:bootstrap b/packages/busybox:bootstrap @@ -2,13 +2,13 @@ #@pragma:nosandbox #@pragma:nopath #+musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f -#+gnu-make.661c6659ee3f0a8089f3fccb50c9a61631b58ccb4f024502bf49f0c4dd78afe4 +#+gnu-make.49c2bb1b7d1b12bd86dc9dbf20aecf4218d79aa432e8862ee8e10324ba14516f #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config : ${JOBS:=1} mcm=/versions/musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f -make=/versions/gnu-make.661c6659ee3f0a8089f3fccb50c9a61631b58ccb4f024502bf49f0c4dd78afe4 +make=/versions/gnu-make.49c2bb1b7d1b12bd86dc9dbf20aecf4218d79aa432e8862ee8e10324ba14516f export PATH="$mcm/bin:$make/command:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/packages/confz b/packages/confz @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89 -#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 +#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz : ${JOBS:=1} diff --git a/packages/containers b/packages/containers @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89 -#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a -#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403 +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 +#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 +#+execline.658425c138cb0a254f960e2237f99618e27003ebe7bf4c23ba2713c744a33272 #@git:e1e16c08f53d80d08f0ce9e405115fd650270e6b:containers : ${JOBS:=1} @@ -33,7 +33,9 @@ BEGIN { x["./command/container_sysroot_run"]=1 x["./command/ns_run"]=1 x["./command/ns_umount_script.awk"]=1 - x["./command/pidns_run"]=1} + x["./command/pidns_run"]=1 + x["./zsh/site-functions/confz_containers_init"]=1 + x["./zsh/site-functions/confz_site_containers_init"]=1} function r1(s) { sub("^[.]/[^/]*", ".", s) diff --git a/packages/containers.environment b/packages/containers.environment @@ -0,0 +1,10 @@ +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+execline.658425c138cb0a254f960e2237f99618e27003ebe7bf4c23ba2713c744a33272 +#+s6.9c34339e1003b9d8adf4055bb2a9694c4cd56eda94258443c514996b2a0620b6 +#+s6-portable-utils.792e7d89881ab4c4516c298b6a22ed800210f0df4221723c3e8daff2a06aa7be +#+s6-linux-utils.14f66e4eeae2e1406d10752d06ca9ca4a83ca14464aa6179b32e9fc0bf21ad42 +#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 +#+confz.35f8619bf06bdf10d847e3fc93d49129ab2b39d4d23ed4d9e90f9309d298c22d +#+containers.95d305be1476ff63381709105af4098c7efc53c0fc428fe00d6461fcd523b7f0 +#+xbps.3fb741d52592288dcd04226e546971e58038901cceb53fcfcc49806e4d25c1e6 +#+apk-tools.92ac25d305512b8bf6942374a52485b4a5492fa62abfc0f0dee1eddafa0711b7+ \ No newline at end of file diff --git a/packages/core-system-conf b/packages/core-system-conf @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+diffutils.150138a6d189b794fc15df8b9fecb23cc66b970dbc7f83ccd3c099a4397f9ebd -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+aat.455972291ac5d9a314e7cc1b7f9b5578da91e9004342d676370d48058662dd69 -#+fileset.1193c4c671fb88d1cfbd5d1f9f7c17f644036cba45dc7ebd8a54947f229a1e8f +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+diffutils.9e9f05a65024308942ec533c1ea40a53f9ee81f0d3cf434ec9b9dfecda665ac8 +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+aat.edb4bd6fe5e267bc49c88621d03e0f415209a73b75edec16f439a8a87b6f14c0 +#+fileset.8eeccb853780cd74b0a926007fd20caceff376bff04e615de75b1efb9e71447c #@git:d4d8812908e64ae0e8ca233bfeef7e028d77acec:core-system-conf : ${JOBS:=1} diff --git a/packages/core-system-init b/packages/core-system-init @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+s6.afdcbbf90d09633aecf7bd52d289004d631104f7fa498ece06281ecbfa4aa0f2 -#+s6-rc.ec922b3bc760fbf1f8cbcf92d4a8644dd22161e7efcb6f33433c441b17c91b04 -#+s6-portable-utils.9ea66f89d317d6a7cac3f951d7ee459ba5c3c47df2e89093a1463732a19e907f -#+s6-linux-init.4b18086bfddc7f6aeebb0f97e68029819cd495ec5a2abd7c1524c045c2adc576 -#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403 -#+core-system-rc.6c6ac9b904defaeff43f12e47f24e480127b4cda30d77b03d9e9395158e948d8 - -s6rcdb=/versions/core-system-rc.6c6ac9b904defaeff43f12e47f24e480127b4cda30d77b03d9e9395158e948d8/s6-rc-db +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+s6.9c34339e1003b9d8adf4055bb2a9694c4cd56eda94258443c514996b2a0620b6 +#+s6-rc.4ca09d2fd012556098eeaeaa23e1ca33e820ffcc5c2aef5e1b7849c9b2370926 +#+s6-portable-utils.792e7d89881ab4c4516c298b6a22ed800210f0df4221723c3e8daff2a06aa7be +#+s6-linux-init.302c44c333344ac714ed4ca8eda9a4a2baa6fc5df7cb9a37bbb3e6e9fadf30ae +#+execline.658425c138cb0a254f960e2237f99618e27003ebe7bf4c23ba2713c744a33272 +#+core-system-rc.c7a30b45c572fd18d9fc2c7e7eb1c656ba1de9fc47c72dd86ee3d7e17f7cf4d0 + +s6rcdb=/versions/core-system-rc.c7a30b45c572fd18d9fc2c7e7eb1c656ba1de9fc47c72dd86ee3d7e17f7cf4d0/s6-rc-db prefix=/versions/$pthbs_package pkgdir="$pthbs_destdir/$prefix" diff --git a/packages/core-system-rc b/packages/core-system-rc @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423 -#+s6-rc.ec922b3bc760fbf1f8cbcf92d4a8644dd22161e7efcb6f33433c441b17c91b04 -#+fileset.1193c4c671fb88d1cfbd5d1f9f7c17f644036cba45dc7ebd8a54947f229a1e8f -#+core-system-conf.c68e0aacdcac8003484d99f9bc753d1b0b41d4d9874b1ee68dbd2e4611a9d18f +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+s6-rc.4ca09d2fd012556098eeaeaa23e1ca33e820ffcc5c2aef5e1b7849c9b2370926 +#+fileset.8eeccb853780cd74b0a926007fd20caceff376bff04e615de75b1efb9e71447c +#+core-system-conf.d2e04fd56432f9cb2aa900bd4b8b259b88cf8113224fce861242e92a86919850 -conf=/versions/core-system-conf.c68e0aacdcac8003484d99f9bc753d1b0b41d4d9874b1ee68dbd2e4611a9d18f/core-system-conf +conf=/versions/core-system-conf.d2e04fd56432f9cb2aa900bd4b8b259b88cf8113224fce861242e92a86919850/core-system-conf prefix=/versions/$pthbs_package pkgdir="$pthbs_destdir/$prefix" mkdir -p "$pkgdir/s6-rc-source" diff --git a/packages/core-system-scripts b/packages/core-system-scripts @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89 -#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 +#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 #@git:98fabf6dffa7a3a7850f1797f557e181b7e8460f:core-system-scripts : ${JOBS:=1} diff --git a/packages/curl b/packages/curl @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423 -#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9 -#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. build_env_static() { @@ -24,7 +24,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/curl" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } diff --git a/packages/default.environment b/packages/default.environment @@ -1,32 +1,34 @@ -#+core-system-conf.c68e0aacdcac8003484d99f9bc753d1b0b41d4d9874b1ee68dbd2e4611a9d18f -#+core-system-rc.6c6ac9b904defaeff43f12e47f24e480127b4cda30d77b03d9e9395158e948d8 -#+core-system-scripts.ee523efb83b205613798c4b7b55b7553201a688a256cc685087e31c750c69f1c -#+core-system-init.d36150f0a64b242c658bd2f53883ee951f849c0323614fc42d0dfae0d029e997 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+diffutils.150138a6d189b794fc15df8b9fecb23cc66b970dbc7f83ccd3c099a4397f9ebd -#+patch.1c6647a0253d26f524ab2bc15e7b5acb58b6433112d5864b48e743529905f251 -#+flex.c923d0974d874dbc8e34a1feeecd62a38821e7cb5b17e5d132ceb0edffa96d12 -#+bison.6ce08f01ee3e0ab2066de6f4c31eed79120ba3e0ebce6dc2130b35a55477fbda -#+rsync.7b7fc81bf3d24b81c643385b5e1938f5a15d9e6ee2d26b81b73017aaac2faa68 -#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403 -#+s6.afdcbbf90d09633aecf7bd52d289004d631104f7fa498ece06281ecbfa4aa0f2 -#+s6-rc.ec922b3bc760fbf1f8cbcf92d4a8644dd22161e7efcb6f33433c441b17c91b04 -#+s6-portable-utils.9ea66f89d317d6a7cac3f951d7ee459ba5c3c47df2e89093a1463732a19e907f -#+s6-linux-utils.051b3255e88d176e4179f9262f489d7f4e1e2f799d226056e282eced67c1256f -#+s6-linux-init.4b18086bfddc7f6aeebb0f97e68029819cd495ec5a2abd7c1524c045c2adc576 -#+mdevd.87eef0d9758ee67151321a12faa9a4d55a132dff95b3ee5df845b1c1ef3cf96b -#+s6-dns.36233ab3b402030208dcbeedfcbaeb98b548361c4f50d4b8b74fc384ddeed87c -#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061 -#+s6-networking.f562a19100efca2d688e007e771484e82dfa551588f5e64573a00416ca02abee -#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89 -#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a -#+aat.455972291ac5d9a314e7cc1b7f9b5578da91e9004342d676370d48058662dd69 -#+confz.d494f10b651c49ab09a9759710c3998adb568b50a5512bf116119bf906c3b07d -#+containers.89dbab49932aced8f0977728839ad737649360739b0551e8755966801f26cd09 -#+fileset.1193c4c671fb88d1cfbd5d1f9f7c17f644036cba45dc7ebd8a54947f229a1e8f -#+logincaps.5f7ebf75103348236fbc1f50a7085e448c3a59e3ad92be1ccceb81dea976e4df -#+snaprep.dba09cb13b0367665897131b2fdf9deba65ea321dc2fc8e30a1dbe57fd794d8d -#+curl.8f6539d068fe09350886ef5c00e60544453c021d9683575ecefbc8a0d65b4fec -#+git.48d7679b6bed977d6f110d7094b217bb1994c35cc43987fcf7cc64d0958c71b9- \ No newline at end of file +#+core-system-conf.d2e04fd56432f9cb2aa900bd4b8b259b88cf8113224fce861242e92a86919850 +#+core-system-rc.c7a30b45c572fd18d9fc2c7e7eb1c656ba1de9fc47c72dd86ee3d7e17f7cf4d0 +#+core-system-scripts.8e538b2b91597999d9a32a1b608728200f7f5630aa4066acdb297d47eb2f3e10 +#+core-system-init.7ff3fedf78e303ae23a4e7ed9dea3b90d72fa86efbc813c5b384ff28d47324e6 +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+diffutils.9e9f05a65024308942ec533c1ea40a53f9ee81f0d3cf434ec9b9dfecda665ac8 +#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349 +#+flex.c564f7c6d8a89cd1c53a5677f65987700122bb0a417dfff9348c78b8df17efb9 +#+bison.bd4f6247caa50159da9ce7ab37e36df1ecdfd779f307ed1f20e6fdbbb2a134e7 +#+rsync.3f8e5afe215047e1feee67c6b0389a0cb2e58511a479fd0b23a8c6321f32989d +#+execline.658425c138cb0a254f960e2237f99618e27003ebe7bf4c23ba2713c744a33272 +#+s6.9c34339e1003b9d8adf4055bb2a9694c4cd56eda94258443c514996b2a0620b6 +#+s6-rc.4ca09d2fd012556098eeaeaa23e1ca33e820ffcc5c2aef5e1b7849c9b2370926 +#+s6-portable-utils.792e7d89881ab4c4516c298b6a22ed800210f0df4221723c3e8daff2a06aa7be +#+s6-linux-utils.14f66e4eeae2e1406d10752d06ca9ca4a83ca14464aa6179b32e9fc0bf21ad42 +#+s6-linux-init.302c44c333344ac714ed4ca8eda9a4a2baa6fc5df7cb9a37bbb3e6e9fadf30ae +#+mdevd.aab70312a94d63d997121156d9c45ef65191d4adb009215fce85a432e808129a +#+s6-dns.48685ba743c4728b4176e99ae41261e5b13d9ad0ee52e6f711afd42f37f52da0 +#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3 +#+s6-networking.e5ecb215916af236a4d8e472572b544e0d25a89b9bbde23180f73f0565c61893 +#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 +#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 +#+aat.edb4bd6fe5e267bc49c88621d03e0f415209a73b75edec16f439a8a87b6f14c0 +#+confz.35f8619bf06bdf10d847e3fc93d49129ab2b39d4d23ed4d9e90f9309d298c22d +#+containers.95d305be1476ff63381709105af4098c7efc53c0fc428fe00d6461fcd523b7f0 +#+fileset.8eeccb853780cd74b0a926007fd20caceff376bff04e615de75b1efb9e71447c +#+logincaps.e5b11a254f8cd73cfa8637bad7ea833a8357642a09ba528bc48d0e79e39b9431 +#+snaprep.4386ae5a1a3fbf3d875ff06709e6d2103d4090f21a9ad73cee731c32a5e4f8f3 +#+curl.9ce7d4ddfc3a2df6a775182d191df4c96bd08f79a781d61ac9aebba39c8873bb +#+git.55986da38ffda7a1c13f96e1fe9d1c3906ddf296708125414d8f9dd42cb64caa +#+xbps.3fb741d52592288dcd04226e546971e58038901cceb53fcfcc49806e4d25c1e6 +#+apk-tools.92ac25d305512b8bf6942374a52485b4a5492fa62abfc0f0dee1eddafa0711b7+ \ No newline at end of file diff --git a/packages/diffutils b/packages/diffutils @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423 -#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. build_env_static() { @@ -23,7 +23,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/diffutils" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } diff --git a/packages/elf.h b/packages/elf.h @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c #@sha256:a6ffb38364effd623e135b206ec97ff9e6826a1f285e349a3633df55db38bc9e:elf.h installdir="$pthbs_destdir//versions/$pthbs_package" diff --git a/packages/elfutils b/packages/elfutils @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423 -#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 #@untar:-j:sha256:39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8:. build_env_static() { @@ -23,7 +23,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/elfutils" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } @@ -55,7 +55,7 @@ check_static() { } export CFLAGS="-D_GNU_SOURCE -Wno-error -Wno-null-dereference" -export LDFLAGS="-static -L/versions/musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa/lib" +export LDFLAGS="-static -L/versions/musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a/lib" autotools elfutils-0.189 \ --disable-nls \ diff --git a/packages/execline b/packages/execline @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c #@git:85315b3e709f65781dd221fd3f13d3a989a748d4:execline : ${JOBS:=1} @@ -14,7 +14,7 @@ cd 'execline' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/sysdeps' \ + --with-sysdeps='/versions/skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/fileset b/packages/fileset @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89 -#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 +#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset : ${JOBS:=1} diff --git a/packages/flex b/packages/flex @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423 -#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. build_env_static() { @@ -23,7 +23,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/flex" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } diff --git a/packages/git b/packages/git @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423 -#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9 -#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061 -#+curl.8f6539d068fe09350886ef5c00e60544453c021d9683575ecefbc8a0d65b4fec +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3 +#+curl.9ce7d4ddfc3a2df6a775182d191df4c96bd08f79a781d61ac9aebba39c8873bb #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. check_static() { diff --git a/packages/gnu-make b/packages/gnu-make @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.661c6659ee3f0a8089f3fccb50c9a61631b58ccb4f024502bf49f0c4dd78afe4 -#+busybox.a6967ee47f129477093e0d7be6e2a6c676599efa95da22b23de805c8ff6d79e7 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.49c2bb1b7d1b12bd86dc9dbf20aecf4218d79aa432e8862ee8e10324ba14516f +#+busybox.750086742815fb3f1e218ab2d859e1f84284296fad512b5598df8b100bca4e3a #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. build_env_static() { @@ -21,7 +21,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/gnu-make" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } diff --git a/packages/gnu-make:bootstrap b/packages/gnu-make:bootstrap @@ -21,7 +21,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/gnu-make:bootstrap" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } diff --git a/packages/kernel.environment b/packages/kernel.environment @@ -1 +1 @@ -#+linux.c5fe89bcf8fcccecb1d966791fc3fdf15cce0225905b6421064a25d5a961ddb4- \ No newline at end of file +#+linux.1968c865a84aabe992da5649761ee67798022accf23cec0d14dd5e0985094e11+ \ No newline at end of file diff --git a/packages/libarchive b/packages/libarchive @@ -0,0 +1,118 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#@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" +} +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/libarchive" \ + --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 +} + + +export LDFLAGS=--static +autotools_static libarchive-3.7.2 --without-xml2 + +check_static command/bsdtar +check_static command/bsdcpio + + + +cd "$pthbs_destdir/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./command/bsdtar"]=1 + x["./command/bsdcpio"]=1 + x["./library/libarchive.a"]=1} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} + + +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } + +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "icons" { link($0); next } +$2 == "terminfo" { link($0); next } + +$2 == "include" { link($0); next } + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + exit 3 + } + } +}' >.install-links.new +mv .install-links.new .install-links diff --git a/packages/libelf-compat b/packages/libelf-compat @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c #@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6 #@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch #@untar:-j:sha256:4496d6cec9644cda8006ead15e17e500629ce30fe85ab2f2052a77ba43a1358d:. diff --git a/packages/libelf.h b/packages/libelf.h @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c #@sha256:9be2e5a97b3fcbc60dedb71967667b9a21d562dbfdaa7f9f74f4b3d9cbb5df86:include/dwarf.h #@sha256:0991a992f75396056c7d7f698fa7e87be24349ae85a195060d46e6a61881d97b:include/gelf.h #@sha256:3b20df1d58f9a445785503415aea1188d33159327c2edab3d370dbd37bc4845e:include/libelf.h diff --git a/packages/libressl b/packages/libressl @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423 -#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. build_env_static() { @@ -23,7 +23,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/libressl" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } diff --git a/packages/linux b/packages/linux @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+diffutils.150138a6d189b794fc15df8b9fecb23cc66b970dbc7f83ccd3c099a4397f9ebd -#+patch.1c6647a0253d26f524ab2bc15e7b5acb58b6433112d5864b48e743529905f251 -#+flex.c923d0974d874dbc8e34a1feeecd62a38821e7cb5b17e5d132ceb0edffa96d12 -#+bison.6ce08f01ee3e0ab2066de6f4c31eed79120ba3e0ebce6dc2130b35a55477fbda -#+rsync.7b7fc81bf3d24b81c643385b5e1938f5a15d9e6ee2d26b81b73017aaac2faa68 -#+libelf-compat.e9c36311b84eb7e7e36596e51fab4031cf94e751fe6ac2ef45bbc95b7cc289a1 +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+diffutils.9e9f05a65024308942ec533c1ea40a53f9ee81f0d3cf434ec9b9dfecda665ac8 +#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349 +#+flex.c564f7c6d8a89cd1c53a5677f65987700122bb0a417dfff9348c78b8df17efb9 +#+bison.bd4f6247caa50159da9ce7ab37e36df1ecdfd779f307ed1f20e6fdbbb2a134e7 +#+rsync.3f8e5afe215047e1feee67c6b0389a0cb2e58511a479fd0b23a8c6321f32989d +#+libelf-compat.a3f567beacf8a00194cd18e3564737bbd3d58448706a3ac07a34ca88b8ad0a34 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cb8081499f316acdc7b31b486b8d68afd68094db8f420aba0eab2c3e8de13888:linux.config diff --git a/packages/logincaps b/packages/logincaps @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89 -#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a -#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403 -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 +#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 +#+execline.658425c138cb0a254f960e2237f99618e27003ebe7bf4c23ba2713c744a33272 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a #@git:b8c706e2a24a12ec3854d41e777e4b8840f98be2:logincaps : ${JOBS:=1} diff --git a/packages/m4 b/packages/m4 @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. build_env_static() { @@ -22,7 +22,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/m4" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } diff --git a/packages/mdevd b/packages/mdevd @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf -#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c +#+execline.658425c138cb0a254f960e2237f99618e27003ebe7bf4c23ba2713c744a33272 #@git:d9f63961ec01dc02131ad0967734ae1a058b27b8:mdevd : ${JOBS:=1} @@ -15,7 +15,7 @@ cd 'mdevd' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/sysdeps' \ + --with-sysdeps='/versions/skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/musl-cross-make b/packages/musl-cross-make @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #+musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f -#+gnu-make.661c6659ee3f0a8089f3fccb50c9a61631b58ccb4f024502bf49f0c4dd78afe4 -#+busybox.a6967ee47f129477093e0d7be6e2a6c676599efa95da22b23de805c8ff6d79e7 +#+gnu-make.49c2bb1b7d1b12bd86dc9dbf20aecf4218d79aa432e8862ee8e10324ba14516f +#+busybox.750086742815fb3f1e218ab2d859e1f84284296fad512b5598df8b100bca4e3a #@git:fe915821b652a7fa37b34a596f47d8e20bc72338:musl-cross-make #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub @@ -63,6 +63,20 @@ for pkg in $pkgs; do make -C musl-cross-make/build/local/x86_64-linux-musl/obj_gcc/$pkg prefix=/ DESTDIR="$dd" install done cp -va musl-cross-make/gcc-*.orig/zlib/zconf.h musl-cross-make/gcc-*.orig/zlib/zlib.h "$dd/include/" +mkdir -p "$dd/library/pkgconfig" +printf '%s\n' > "$dd/library/pkgconfig/zlib.pc" \ + "prefix=/versions/$pthbs_package" \ + 'exec_prefix=${prefix}' \ + 'includedir=${prefix}/include' \ + 'libdir=${exec_prefix}/library' \ + '' \ + 'Name: zlib' \ + 'Description: zlib compression library' \ + 'Version: 1.2.11' \ + '' \ + 'Requires:' \ + '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 diff --git a/packages/netbsd-curses b/packages/netbsd-curses @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a #@git:5874f9b1ced9c29d7d590d95e254b252f657a160:curses export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so" diff --git a/packages/patch b/packages/patch @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423 -#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. build_env_static() { @@ -23,7 +23,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/patch" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } diff --git a/packages/patchelf:bootstrap b/packages/patchelf:bootstrap @@ -20,7 +20,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/patchelf:bootstrap" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } diff --git a/packages/pkgconf b/packages/pkgconf @@ -0,0 +1,115 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#@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" +} +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/pkgconf" \ + --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 +} + + +export LDFLAGS=--static +autotools_static pkgconf-2.1.1 --with-pkg-config-dir= + +check_static command/pkgconf + + + +cd "$pthbs_destdir/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./command/pkgconf"]=1} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} + + +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } + +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "icons" { link($0); next } +$2 == "terminfo" { link($0); next } + +$2 == "include" { link($0); next } + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + exit 3 + } + } +}' >.install-links.new +mv .install-links.new .install-links diff --git a/packages/pkgconf-pkg-config b/packages/pkgconf-pkg-config @@ -0,0 +1,11 @@ +#!/usr/bin/env pthbs-build +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+pkgconf.e8cb09e47eb54af1a164ec34603d39f494b91035626d5903204f439f2aef4843 + +mkdir -p "$pthbs_destdir/versions/$pthbs_package" +cd "$pthbs_destdir/versions/$pthbs_package" +exe=$(realpath "$(which pkgconf)") +mkdir command +ln -sf "$exe" command/pkg-config +printf '%s\t%s\n' "./command/pkg-config" "./command/pkg-config" >>.install-links.new +mv .install-links.new .install-links diff --git a/packages/popt b/packages/popt @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423 -#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. build_env_static() { @@ -23,7 +23,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/popt" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } diff --git a/packages/pthbs-banginstall b/packages/pthbs-banginstall @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89 +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall installdir="$pthbs_destdir//versions/$pthbs_package" diff --git a/packages/rsync b/packages/rsync @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423 -#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9 -#+popt.6806563bd151522c2f0fe3ca45f5e929e15d09fb3f1d1545fa82e744820f78b9 -#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+popt.37ed47b20ce3edc6b2cd974ab0b22a92ce4d55e0b8e97be57c68a55810dce820 +#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. build_env_static() { @@ -25,7 +25,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/rsync" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } diff --git a/packages/s6 b/packages/s6 @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+patch.1c6647a0253d26f524ab2bc15e7b5acb58b6433112d5864b48e743529905f251 -#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf -#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349 +#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c +#+execline.658425c138cb0a254f960e2237f99618e27003ebe7bf4c23ba2713c744a33272 #@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6 #@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch @@ -19,7 +19,7 @@ patch -up 1 -i ../s6_clone3_newpid.patch --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/sysdeps' \ + --with-sysdeps='/versions/skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-dns b/packages/s6-dns @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c #@git:4d081d9c2657ef40e770145f21328d37035dd774:s6-dns : ${JOBS:=1} @@ -14,7 +14,7 @@ cd 's6-dns' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/sysdeps' \ + --with-sysdeps='/versions/skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-linux-init b/packages/s6-linux-init @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf -#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403 -#+s6.afdcbbf90d09633aecf7bd52d289004d631104f7fa498ece06281ecbfa4aa0f2 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c +#+execline.658425c138cb0a254f960e2237f99618e27003ebe7bf4c23ba2713c744a33272 +#+s6.9c34339e1003b9d8adf4055bb2a9694c4cd56eda94258443c514996b2a0620b6 #@git:42a91a98b780759257862642c764c2102237fea6:s6-linux-init : ${JOBS:=1} @@ -16,7 +16,7 @@ cd 's6-linux-init' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/sysdeps' \ + --with-sysdeps='/versions/skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-linux-utils b/packages/s6-linux-utils @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c #@git:964442539c3b5b7f6f13a17cbf391843ec93ce6f:s6-linux-utils : ${JOBS:=1} @@ -14,7 +14,7 @@ cd 's6-linux-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/sysdeps' \ + --with-sysdeps='/versions/skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-networking b/packages/s6-networking @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf -#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403 -#+s6.afdcbbf90d09633aecf7bd52d289004d631104f7fa498ece06281ecbfa4aa0f2 -#+s6-dns.36233ab3b402030208dcbeedfcbaeb98b548361c4f50d4b8b74fc384ddeed87c -#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c +#+execline.658425c138cb0a254f960e2237f99618e27003ebe7bf4c23ba2713c744a33272 +#+s6.9c34339e1003b9d8adf4055bb2a9694c4cd56eda94258443c514996b2a0620b6 +#+s6-dns.48685ba743c4728b4176e99ae41261e5b13d9ad0ee52e6f711afd42f37f52da0 +#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3 #@git:68db8af7c26461d4477f482ecbc279729fa911e4:s6-networking : ${JOBS:=1} @@ -18,7 +18,7 @@ cd 's6-networking' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/sysdeps' \ + --with-sysdeps='/versions/skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-portable-utils b/packages/s6-portable-utils @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c #@git:536eea15284be9a257b6f97f971e0d8d4a7e437b:s6-portable-utils : ${JOBS:=1} @@ -14,7 +14,7 @@ cd 's6-portable-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/sysdeps' \ + --with-sysdeps='/versions/skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-rc b/packages/s6-rc @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf -#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403 -#+s6.afdcbbf90d09633aecf7bd52d289004d631104f7fa498ece06281ecbfa4aa0f2 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c +#+execline.658425c138cb0a254f960e2237f99618e27003ebe7bf4c23ba2713c744a33272 +#+s6.9c34339e1003b9d8adf4055bb2a9694c4cd56eda94258443c514996b2a0620b6 #@git:b79282b3746ff67c3c0df8aa32814b3688b91d4f:s6-rc : ${JOBS:=1} @@ -16,7 +16,7 @@ cd 's6-rc' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.971b525e19f0f5e28728ad646942dcb14fa3ca3ba2a3b34fbd0496ba0f76e2bf/sysdeps' \ + --with-sysdeps='/versions/skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/skalibs b/packages/skalibs @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c #@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs : ${JOBS:=1} diff --git a/packages/snaprep b/packages/snaprep @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89 -#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 +#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep : ${JOBS:=1} diff --git a/packages/userspace.environment b/packages/userspace.environment @@ -1,28 +1,30 @@ -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+diffutils.150138a6d189b794fc15df8b9fecb23cc66b970dbc7f83ccd3c099a4397f9ebd -#+patch.1c6647a0253d26f524ab2bc15e7b5acb58b6433112d5864b48e743529905f251 -#+flex.c923d0974d874dbc8e34a1feeecd62a38821e7cb5b17e5d132ceb0edffa96d12 -#+bison.6ce08f01ee3e0ab2066de6f4c31eed79120ba3e0ebce6dc2130b35a55477fbda -#+rsync.7b7fc81bf3d24b81c643385b5e1938f5a15d9e6ee2d26b81b73017aaac2faa68 -#+execline.155e4e023469e65d34d6b4806c445c3a6e51c09ea4559fbcfbbb71ff85fa2403 -#+s6.afdcbbf90d09633aecf7bd52d289004d631104f7fa498ece06281ecbfa4aa0f2 -#+s6-rc.ec922b3bc760fbf1f8cbcf92d4a8644dd22161e7efcb6f33433c441b17c91b04 -#+s6-portable-utils.9ea66f89d317d6a7cac3f951d7ee459ba5c3c47df2e89093a1463732a19e907f -#+s6-linux-utils.051b3255e88d176e4179f9262f489d7f4e1e2f799d226056e282eced67c1256f -#+s6-linux-init.4b18086bfddc7f6aeebb0f97e68029819cd495ec5a2abd7c1524c045c2adc576 -#+mdevd.87eef0d9758ee67151321a12faa9a4d55a132dff95b3ee5df845b1c1ef3cf96b -#+s6-dns.36233ab3b402030208dcbeedfcbaeb98b548361c4f50d4b8b74fc384ddeed87c -#+libressl.76e45b2a0a4c2fa4edd91693c31a203f799174f01d7d89bd010b8a655e9f2061 -#+s6-networking.f562a19100efca2d688e007e771484e82dfa551588f5e64573a00416ca02abee -#+zsh.cb7ab223c38fa866f280c17d554fbbcbe374faee3df1af5ad59e1888c2e50d89 -#+pthbs-banginstall.9640d673f9e4415f4c91775d57ed3f8e24474cb71be499c6e60d707b43b48a2a -#+aat.455972291ac5d9a314e7cc1b7f9b5578da91e9004342d676370d48058662dd69 -#+confz.d494f10b651c49ab09a9759710c3998adb568b50a5512bf116119bf906c3b07d -#+containers.89dbab49932aced8f0977728839ad737649360739b0551e8755966801f26cd09 -#+fileset.1193c4c671fb88d1cfbd5d1f9f7c17f644036cba45dc7ebd8a54947f229a1e8f -#+logincaps.5f7ebf75103348236fbc1f50a7085e448c3a59e3ad92be1ccceb81dea976e4df -#+snaprep.dba09cb13b0367665897131b2fdf9deba65ea321dc2fc8e30a1dbe57fd794d8d -#+curl.8f6539d068fe09350886ef5c00e60544453c021d9683575ecefbc8a0d65b4fec -#+git.48d7679b6bed977d6f110d7094b217bb1994c35cc43987fcf7cc64d0958c71b9- \ No newline at end of file +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+diffutils.9e9f05a65024308942ec533c1ea40a53f9ee81f0d3cf434ec9b9dfecda665ac8 +#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349 +#+flex.c564f7c6d8a89cd1c53a5677f65987700122bb0a417dfff9348c78b8df17efb9 +#+bison.bd4f6247caa50159da9ce7ab37e36df1ecdfd779f307ed1f20e6fdbbb2a134e7 +#+rsync.3f8e5afe215047e1feee67c6b0389a0cb2e58511a479fd0b23a8c6321f32989d +#+execline.658425c138cb0a254f960e2237f99618e27003ebe7bf4c23ba2713c744a33272 +#+s6.9c34339e1003b9d8adf4055bb2a9694c4cd56eda94258443c514996b2a0620b6 +#+s6-rc.4ca09d2fd012556098eeaeaa23e1ca33e820ffcc5c2aef5e1b7849c9b2370926 +#+s6-portable-utils.792e7d89881ab4c4516c298b6a22ed800210f0df4221723c3e8daff2a06aa7be +#+s6-linux-utils.14f66e4eeae2e1406d10752d06ca9ca4a83ca14464aa6179b32e9fc0bf21ad42 +#+s6-linux-init.302c44c333344ac714ed4ca8eda9a4a2baa6fc5df7cb9a37bbb3e6e9fadf30ae +#+mdevd.aab70312a94d63d997121156d9c45ef65191d4adb009215fce85a432e808129a +#+s6-dns.48685ba743c4728b4176e99ae41261e5b13d9ad0ee52e6f711afd42f37f52da0 +#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3 +#+s6-networking.e5ecb215916af236a4d8e472572b544e0d25a89b9bbde23180f73f0565c61893 +#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 +#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 +#+aat.edb4bd6fe5e267bc49c88621d03e0f415209a73b75edec16f439a8a87b6f14c0 +#+confz.35f8619bf06bdf10d847e3fc93d49129ab2b39d4d23ed4d9e90f9309d298c22d +#+containers.95d305be1476ff63381709105af4098c7efc53c0fc428fe00d6461fcd523b7f0 +#+fileset.8eeccb853780cd74b0a926007fd20caceff376bff04e615de75b1efb9e71447c +#+logincaps.e5b11a254f8cd73cfa8637bad7ea833a8357642a09ba528bc48d0e79e39b9431 +#+snaprep.4386ae5a1a3fbf3d875ff06709e6d2103d4090f21a9ad73cee731c32a5e4f8f3 +#+curl.9ce7d4ddfc3a2df6a775182d191df4c96bd08f79a781d61ac9aebba39c8873bb +#+git.55986da38ffda7a1c13f96e1fe9d1c3906ddf296708125414d8f9dd42cb64caa +#+xbps.3fb741d52592288dcd04226e546971e58038901cceb53fcfcc49806e4d25c1e6 +#+apk-tools.92ac25d305512b8bf6942374a52485b4a5492fa62abfc0f0dee1eddafa0711b7+ \ No newline at end of file diff --git a/packages/xbps b/packages/xbps @@ -0,0 +1,147 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+libarchive.7ae626a2036298772ddce8cd995ff9097feef3ed3fa59d794c4bdebdc2435739 +#+libressl.74bd6b7eafc33403fa6a5ef2fa63e2c1ba5078e1cfd2991ae514544529f4d2b3 +#+pkgconf-pkg-config.9ce762e8803a43c875dd59a366babec3f2ac504bf3985bba236c13f70b396f43 +#@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" \ + --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 +} + + +export LDFLAGS=--static +export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" +build_env_static + +cd xbps-0.59.2 +prefix=/versions/$pthbs_package +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)" \ + --datadir="$prefix" \ + --bindir="$prefix/command" \ + --infodir="$prefix/info" \ + --mandir="$prefix/man" \ + --libdir="$prefix/library" \ + --localstatedir='/var/pthbs' \ + --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 "$pthbs_destdir/$prefix/library" +install -m 644 lib/libxbps.a "$pthbs_destdir/$prefix/library" +install -d "$pthbs_destdir/$prefix/command" +for cmd in xbps-alternatives xbps-create xbps-dgraph xbps-install xbps-pkgdb xbps-query xbps-reconfigure xbps-remove xbps-rindex xbps-uhelper xbps-checkvers xbps-fbulk xbps-digest xbps-fetch xbps-uchroot xbps-uunshare; do + make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C "bin/$cmd" "$cmd.static" + install -m 755 "bin/$cmd/$cmd.static" "$pthbs_destdir/$prefix/command" +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 command/xbps-install.static +mv -v "$pthbs_destdir//var/pthbs/db/xbps/keys" "$pthbs_destdir/$prefix/" + + + +cd "$pthbs_destdir/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./command/xbps-install.static"]=1} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} + + +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } + +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "icons" { link($0); next } +$2 == "terminfo" { link($0); next } + +$2 == "include" { link($0); next } + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + exit 3 + } + } +}' >.install-links.new +mv .install-links.new .install-links diff --git a/packages/zsh b/packages/zsh @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.c1554969b4bdc2f5ea01108664ae3edc682bc5eca73c81ac7281d1cdda08b4fa -#+gnu-make.531015196978c25453cb74601676e2cbeab2b98adfa8eea0d6d4a2dd37053f77 -#+busybox.1cff28305c51f4cf55a1395ac52f88c90b50e8291bc00c9c5a6235466c87934b -#+busybox-diffutils.fb5589f77afa32e846777a4c27d4f99544cd895248f47e6056855b65a1639423 -#+m4.8ff5fc8755296874d175fccea2c01e82720cf9f7e5f69297b322508da3e917f9 -#+netbsd-curses.9f6c8437de9bc082a51cb44c88ec317d1822028750b8724ff24b802f41b99b39 +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+netbsd-curses.317e80aebf0c196911a22856846094b23d6c920874844c45389d689f6cc381a6 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. @@ -25,7 +25,7 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/zsh" \ - --localstatedir='/home/ccx/.local/var' \ + --localstatedir='/var/pthbs' \ "$@" } diff --git a/packages/zstd b/packages/zstd @@ -0,0 +1,92 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc +#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#@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 +} +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 + +cd zstd-1.5.5 +make -j${JOBS:-1} -l$((1+${JOBS:-1})) default install \ + V=1 \ + DESTDIR="$pthbs_destdir" \ + prefix="/versions/$pthbs_package" \ + datarootdir="/versions/$pthbs_package" \ + bindir="/versions/$pthbs_package/command" \ + libdir="/versions/$pthbs_package/library" + +check_static command/zstd +rm -v "$pthbs_destdir//versions/$pthbs_package/library"/*.so* + + +cd "$pthbs_destdir/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./command/zstd"]=1 + x["./library/libzstd.a"]=1} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} + + +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } + +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "icons" { link($0); next } +$2 == "terminfo" { link($0); next } + +$2 == "include" { link($0); next } + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + exit 3 + } + } +}' >.install-links.new +mv .install-links.new .install-links diff --git a/sources/apk-tools b/sources/apk-tools @@ -0,0 +1 @@ +Subproject commit 4cfb907282ede4b7f52f2514fbf96c60e1cad441 diff --git a/templates/functions/vars b/templates/functions/vars @@ -0,0 +1,6 @@ +def_prefix() { + prefix={{versions}}/$pthbs_package +} +def_dest() { + dest=$pthbs_destdir/{{versions}}/$pthbs_package +} diff --git a/templates/pkg/apk-tools b/templates/pkg/apk-tools @@ -0,0 +1,39 @@ +{% extends "genlinks" %} +{%- block script %} +#+{{pkg_install_name("musl-cross-make")}} +#+{{pkg_install_name("gnu-make")}} +#+{{pkg_install_name("busybox")}} +#+{{pkg_install_name("busybox-diffutils")}} +#+{{pkg_install_name("patch")}} +#+{{pkg_install_name("libressl")}} +#+{{pkg_install_name("zstd")}} +#+{{pkg_install_name("pkgconf-pkg-config")}} +#@git:{{submodule.current[name]}}:{{name}} +#@sha256:{{files["apk-tools.patch"]}}:apk-tools.patch + +{% include "functions/check_static" %} +{% include "functions/build_env_static" %} +{% include "functions/vars" %} + +build_env_static +def_prefix +cd apk-tools +patch -p1 <../apk-tools.patch +{{make}} STATIC=y LUA=no V=1 \ + DESTDIR="$pthbs_destdir" \ + SBINDIR="$prefix/command" \ + CONFDIR="$prefix/etc/apk" \ + MANDIR="$prefix/man" \ + DOCDIR="$prefix/doc/apk" \ + INCLUDEDIR="$prefix/include" \ + LIBDIR="$prefix/library" \ + PKGCONFIGDIR="$prefix/library/pkgconfig" \ + install-static + +check_static command/apk.static +{% endblock %} +{% block genlinks_begin %} + x["./command/apk.static"]=1 + x["./library/libapk.a"]=1 + x["./library/pkgconfig/apk.pc"]=1 +{%- endblock %} diff --git a/templates/pkg/containers b/templates/pkg/containers @@ -7,4 +7,6 @@ x["./command/ns_run"]=1 x["./command/ns_umount_script.awk"]=1 x["./command/pidns_run"]=1 + x["./zsh/site-functions/confz_containers_init"]=1 + x["./zsh/site-functions/confz_site_containers_init"]=1 {%- endblock %} diff --git a/templates/pkg/containers.environment b/templates/pkg/containers.environment @@ -0,0 +1,10 @@ +#+{{pkg_install_name("busybox")}} +#+{{pkg_install_name("execline")}} +#+{{pkg_install_name("s6")}} +#+{{pkg_install_name("s6-portable-utils")}} +#+{{pkg_install_name("s6-linux-utils")}} +#+{{pkg_install_name("zsh")}} +#+{{pkg_install_name("confz")}} +#+{{pkg_install_name("containers")}} +#+{{pkg_install_name("xbps")}} +#+{{pkg_install_name("apk-tools")}} diff --git a/templates/pkg/libarchive b/templates/pkg/libarchive @@ -0,0 +1,18 @@ +{% extends "autotools" %} +{%- block extra_deps %} +#@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:. +{%- endblock %} +{% block at_script %} + +export LDFLAGS=--static +autotools_static libarchive-3.7.2 --without-xml2 + +check_static command/bsdtar +check_static command/bsdcpio + +{% endblock %} +{% block genlinks_begin %} + x["./command/bsdtar"]=1 + x["./command/bsdcpio"]=1 + x["./library/libarchive.a"]=1 +{%- endblock %} diff --git a/templates/pkg/musl-cross-make b/templates/pkg/musl-cross-make @@ -64,6 +64,20 @@ for pkg in $pkgs; do make -C musl-cross-make/build/local/x86_64-linux-musl/obj_gcc/$pkg prefix=/ DESTDIR="$dd" install done cp -va musl-cross-make/gcc-*.orig/zlib/zconf.h musl-cross-make/gcc-*.orig/zlib/zlib.h "$dd/include/" +mkdir -p "$dd/library/pkgconfig" +printf '%s\n' > "$dd/library/pkgconfig/zlib.pc" \ + "prefix={{versions}}/$pthbs_package" \ + 'exec_prefix=${prefix}' \ + 'includedir=${prefix}/include' \ + 'libdir=${exec_prefix}/library' \ + '' \ + 'Name: zlib' \ + 'Description: zlib compression library' \ + 'Version: 1.2.11' \ + '' \ + 'Requires:' \ + 'Libs: -L${libdir} -lz' \ + 'Cflags: -I${includedir}' # validate zlib "$dd"'/bin/{{triplet}}-gcc' -I"$dd/include" -L"$dd/lib" -static -o zpipe zpipe.c -lz diff --git a/templates/pkg/pkgconf b/templates/pkg/pkgconf @@ -0,0 +1,15 @@ +{% extends "autotools" %} +{%- block extra_deps %} +#@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:. +{%- endblock %} +{% block at_script %} + +export LDFLAGS=--static +autotools_static pkgconf-2.1.1 --with-pkg-config-dir= + +check_static command/pkgconf + +{% endblock %} +{% block genlinks_begin %} + x["./command/pkgconf"]=1 +{%- endblock %} diff --git a/templates/pkg/pkgconf-pkg-config b/templates/pkg/pkgconf-pkg-config @@ -0,0 +1,13 @@ +{% extends "base" %} +{%- block body %} +#+{{pkg_install_name("busybox")}} +#+{{pkg_install_name("pkgconf")}} + +mkdir -p "$pthbs_destdir{{versions}}/$pthbs_package" +cd "$pthbs_destdir{{versions}}/$pthbs_package" +exe=$(realpath "$(which pkgconf)") +mkdir command +ln -sf "$exe" command/pkg-config +printf '%s\t%s\n' "./command/pkg-config" "./command/pkg-config" >>.install-links.new +mv .install-links.new .install-links +{% endblock %} diff --git a/templates/pkg/userspace.environment b/templates/pkg/userspace.environment @@ -26,3 +26,5 @@ #+{{pkg_install_name("snaprep")}} #+{{pkg_install_name("curl")}} #+{{pkg_install_name("git")}} +#+{{pkg_install_name("xbps")}} +#+{{pkg_install_name("apk-tools")}} diff --git a/templates/pkg/xbps b/templates/pkg/xbps @@ -0,0 +1,47 @@ +{% extends "autotools" %} +{%- block extra_deps %} +#+{{pkg_install_name("libarchive")}} +#+{{pkg_install_name("libressl")}} +#+{{pkg_install_name("pkgconf-pkg-config")}} +#@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. +{%- endblock %} +{% block at_script %} + +export LDFLAGS=--static +export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" +build_env_static + +cd xbps-0.59.2 +prefix={{versions}}/$pthbs_package +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)" \ + --datadir="$prefix" \ + --bindir="$prefix/command" \ + --infodir="$prefix/info" \ + --mandir="$prefix/man" \ + --libdir="$prefix/library" \ + --localstatedir='{{var_dir}}' \ + --enable-static + +{{make}} -C include +{{make}} -C lib libxbps.a +install -d "$pthbs_destdir/$prefix/library" +install -m 644 lib/libxbps.a "$pthbs_destdir/$prefix/library" +install -d "$pthbs_destdir/$prefix/command" +for cmd in xbps-alternatives xbps-create xbps-dgraph xbps-install xbps-pkgdb xbps-query xbps-reconfigure xbps-remove xbps-rindex xbps-uhelper xbps-checkvers xbps-fbulk xbps-digest xbps-fetch xbps-uchroot xbps-uunshare; do + {{make}} -C "bin/$cmd" "$cmd.static" + install -m 755 "bin/$cmd/$cmd.static" "$pthbs_destdir/$prefix/command" +done +{{make}} -C data +{{make}} -C data install DESTDIR="$pthbs_destdir" + +check_static command/xbps-install.static +mv -v "$pthbs_destdir/{{var_dir}}/db/xbps/keys" "$pthbs_destdir/$prefix/" + +{% endblock %} +{% block genlinks_begin %} + x["./command/xbps-install.static"]=1 +{%- endblock %} diff --git a/templates/pkg/zstd b/templates/pkg/zstd @@ -0,0 +1,29 @@ +{% extends "genlinks" %} +{%- block script %} +#+{{pkg_install_name("musl-cross-make")}} +#+{{pkg_install_name("gnu-make")}} +#+{{pkg_install_name("busybox")}} +#+{{pkg_install_name("busybox-diffutils")}} +#@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. + +{% include "functions/check_static" %} +{% include "functions/build_env_static" %} +build_env_static + +cd zstd-1.5.5 +{{make}} default install \ + V=1 \ + DESTDIR="$pthbs_destdir" \ + prefix="{{versions}}/$pthbs_package" \ + datarootdir="{{versions}}/$pthbs_package" \ + bindir="{{versions}}/$pthbs_package/command" \ + libdir="{{versions}}/$pthbs_package/library" + +check_static command/zstd +rm -v "$pthbs_destdir/{{versions}}/$pthbs_package/library"/*.so* + +{% endblock %} +{% block genlinks_begin %} + x["./command/zstd"]=1 + x["./library/libzstd.a"]=1 +{%- endblock %} diff --git a/vars.yaml b/vars.yaml @@ -3,4 +3,4 @@ triplet: x86_64-linux-musl versions: /versions make: "make -j${JOBS:-1} -l$((1+${JOBS:-1}))" #etc_dir: /home/ccx/.local/etc -var_dir: /home/ccx/.local/var +var_dir: /var/pthbs