pthbs

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

commit 4eda640b9df6d000918e77035134cc633e40ef1d
parent 93e1e5b86b5f5d9c96894d459d82ad25b0187705
Author: ccx <ccx@te2000.cz>
Date:   Thu,  7 Mar 2024 01:05:30 +0000

environment check, deps for core-system-config

Diffstat:
Mcommand/pthbs-build | 28++++++++++++++++++++++++++++
Mcommand/pthbs-enter-gen | 1+
Mdownloadlist.sha256 | 1+
Mpackages/aat | 8++++----
Mpackages/alpine-keys | 4++--
Mpackages/apk-tools | 18+++++++++---------
Mpackages/bison | 16+++++++++-------
Mpackages/bootstrap.environment | 8++++----
Mpackages/busybox | 7++++---
Mpackages/busybox-diffutils | 2+-
Apackages/busybox-kbd | 12++++++++++++
Mpackages/busybox-login | 2+-
Mpackages/busybox:bootstrap | 8++++----
Mpackages/confz | 8++++----
Mpackages/containers | 18+++++++++---------
Mpackages/containers.environment | 34+++++++++++++++++-----------------
Mpackages/core-system-conf | 86++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------
Mpackages/core-system-init | 20++++++++++----------
Mpackages/core-system-rc | 36++++++++++++++++++------------------
Mpackages/core-system-scripts | 8++++----
Mpackages/curl | 16+++++++++-------
Mpackages/default.environment | 76++++++++++++++++++++++++++++++++++++++--------------------------------------
Mpackages/diffutils | 14++++++++------
Mpackages/elf.h | 4++--
Mpackages/elfutils | 16+++++++++-------
Mpackages/execline | 12++++++------
Mpackages/fileset | 8++++----
Mpackages/flex | 14++++++++------
Mpackages/getconf | 8++++----
Mpackages/getent | 8++++----
Mpackages/git | 16++++++++--------
Mpackages/gnu-make | 10++++++----
Mpackages/gnu-make:bootstrap | 8+++++---
Mpackages/iconv | 8++++----
Apackages/kbd | 122+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mpackages/kernel.environment | 4++--
Mpackages/libarchive | 14++++++++------
Mpackages/libelf-compat | 8++++----
Mpackages/libelf.h | 4++--
Mpackages/libressl | 14++++++++------
Mpackages/linux | 20++++++++++----------
Mpackages/logincaps | 12++++++------
Mpackages/m4 | 12+++++++-----
Mpackages/mdevd | 14+++++++-------
Mpackages/musl-cross-make | 8++++----
Mpackages/musl-cross-make:bootstrap-0 | 2+-
Mpackages/musl-cross-make:bootstrap-1 | 6+++---
Mpackages/netbsd-curses | 8++++----
Mpackages/patch | 14++++++++------
Mpackages/patchelf:bootstrap | 4+++-
Mpackages/pidns_run | 10+++++-----
Mpackages/pkgconf | 14++++++++------
Mpackages/pkgconf-pkg-config | 4++--
Mpackages/popt | 14++++++++------
Mpackages/pthbs-banginstall | 6+++---
Mpackages/rsync | 18++++++++++--------
Mpackages/s6 | 16++++++++--------
Mpackages/s6-dns | 12++++++------
Mpackages/s6-linux-init | 16++++++++--------
Mpackages/s6-linux-utils | 12++++++------
Mpackages/s6-networking | 20++++++++++----------
Mpackages/s6-portable-utils | 12++++++------
Mpackages/s6-rc | 16++++++++--------
Mpackages/skalibs | 8++++----
Mpackages/snaprep | 8++++----
Mpackages/userspace.environment | 68++++++++++++++++++++++++++++++++++----------------------------------
Mpackages/xbps | 20+++++++++++---------
Mpackages/zsh | 16+++++++++-------
Mpackages/zstd | 10+++++-----
Mtemplates/functions/autotools | 2++
Mtemplates/genlinks | 2+-
Mtemplates/pkg/busybox | 1+
Atemplates/pkg/busybox-kbd | 14++++++++++++++
Mtemplates/pkg/core-system-conf | 27++++++++++++++++++++-------
Mtemplates/pkg/core-system-rc | 19+++++++------------
Atemplates/pkg/kbd | 19+++++++++++++++++++
76 files changed, 741 insertions(+), 452 deletions(-)

diff --git a/command/pthbs-build b/command/pthbs-build @@ -30,10 +30,38 @@ pthbs_package=${pthbs_package%%:*}.$bsh printf "BUILDING %s => %s => %s\n" "$1" "$workdir" "$pthbs_package" +eval "$( + awk ' +BEGIN { + settings["sandbox"] = 1 + settings["set_path"] = 1 + FS=":" +} +/^#@pragma:/ { + if($2 == "nosandbox") { + settings["sandbox"] = 0 + } else if($2 == "nopath") { + settings["set_path"] = 0 + } else { + fatal("unrecognized @pragma:") + } +} +END { + print "setting_sandbox=" (settings["sandbox"]?"true":"false") + print "setting_set_path=" (settings["set_path"]?"true":"false") +} +' "$1" )" + if test -f "make/package.sha256.${bsh}.env"; then envfile="make/package.sha256.${bsh}.env" envhash=$(pthbs-getenvhash "$envfile") || exit $? export pthbs_build_environment=/versions/env.$envhash + if $setting_set_path; then + if ! test -x "$pthbs_build_environment/command/pthbs-enter"; then + printf >&2 "Error: %s does not exist!" "$pthbs_build_environment/command/pthbs-enter" + exit 1 + fi + fi fi mkdir -p "$workdir" diff --git a/command/pthbs-enter-gen b/command/pthbs-enter-gen @@ -48,6 +48,7 @@ EOF "$exe" true # TODO: don't run executables without sandbox fi +exe="$envcommand/install-as-current-environment" if test -x "$envcommand/install-as-current-environment.postinstall"; then cat >"$exe" <<EOF #!$envcommand/execlineb -P diff --git a/downloadlist.sha256 b/downloadlist.sha256 @@ -40,3 +40,4 @@ a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b 408144 https:// 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 +99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f 2999129 https://www.kernel.org/pub/linux/utils/kbd/kbd-2.6.4.tar.gz diff --git a/packages/aat b/packages/aat @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 -#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb +#+pthbs-banginstall.d1e43ec62e6d2b3a2a03a2d9ce487f6fe768fb7131c09ce0d2dd9e165233cff1 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat : ${JOBS:=1} @@ -66,7 +66,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/alpine-keys b/packages/alpine-keys @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #@sha256:9c102bcc376af1498d549b77bdbfa815ae86faa1d2d82f040e616b18ef2df2d4:alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub #@sha256:ebf31683b56410ecc4c00acd9f6e2839e237a3b62b5ae7ef686705c7ba0396a9:alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub #@sha256:1bb2a846c0ea4ca9d0e7862f970863857fc33c32f5506098c636a62a726a847b:alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub @@ -92,7 +92,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/apk-tools b/packages/apk-tools @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349 -#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7 -#+zstd.62d99b3e023021ff3e372f212569b6fb81c47c91a00c49dfd35f3f508e7370d1 -#+pkgconf-pkg-config.9ce762e8803a43c875dd59a366babec3f2ac504bf3985bba236c13f70b396f43 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+patch.c2f2ffe5c9b78dce8f2a1adeca76c83dd548ffcabed790bfb6e886e9d27474bb +#+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab +#+zstd.ab99ab40fa027a935e6012884c3988d7161dc0c6ff10c06566c0a92c694bca07 +#+pkgconf-pkg-config.2993a64b810b50b0fa289b8d8eaf614f6f1719d9f2473960b2cbf5856939b834 #@git:4cfb907282ede4b7f52f2514fbf96c60e1cad441:apk-tools #@sha256:921442b5f5bd0070caeb9c27137e63b804e634a2f5a2d69a82145362b2055b33:apk-tools.patch @@ -90,7 +90,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/bison b/packages/bison @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 -#+flex.c564f7c6d8a89cd1c53a5677f65987700122bb0a417dfff9348c78b8df17efb9 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 +#+flex.1ec95ce5516c7871d0757dc9ffc02f3a8795a765ad7936c23a6e2688e7d3afd0 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. build_env_static() { @@ -24,6 +24,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/bison" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -99,7 +101,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/bootstrap.environment b/packages/bootstrap.environment @@ -1,3 +1,3 @@ -#+busybox.750086742815fb3f1e218ab2d859e1f84284296fad512b5598df8b100bca4e3a -#+gnu-make.49c2bb1b7d1b12bd86dc9dbf20aecf4218d79aa432e8862ee8e10324ba14516f -#+musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f- \ No newline at end of file +#+busybox.4f3dc50a678af6b674a9dd28176dd70defdead9642b605d42ecde190ae0ef1ec +#+gnu-make.162efeebf8811ff0c94b916a634371c2f5804308501b77514191d787bf3a6639 +#+musl-cross-make.935182e555695bf1b9f401d79404e8c598026db9f8b93e0be41d176a782e932a+ \ 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.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.49c2bb1b7d1b12bd86dc9dbf20aecf4218d79aa432e8862ee8e10324ba14516f -#+busybox.750086742815fb3f1e218ab2d859e1f84284296fad512b5598df8b100bca4e3a +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.162efeebf8811ff0c94b916a634371c2f5804308501b77514191d787bf3a6639 +#+busybox.4f3dc50a678af6b674a9dd28176dd70defdead9642b605d42ecde190ae0ef1ec #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab:busybox/.config @@ -23,6 +23,7 @@ echo false | ./command/busybox --list >/dev/null # test if it works /^(cmp|diff)$/ {next} # provided by diffutils /^(login)$/ {next} # provided by logincaps /^(reset|clear)$/ {next} # provided by netbsd-curses +/^(chvt|deallocvt|fgconsole|kbd_mode|openvt|setfont|setkeycodes|showkey)$/ {next} # provided by kbd { print "./command/busybox\t./command/" $0 } END { print "./command/busybox\t./command/busybox" } ' >.install-links.new diff --git a/packages/busybox-diffutils b/packages/busybox-diffutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/packages/busybox-kbd b/packages/busybox-kbd @@ -0,0 +1,12 @@ +#!/usr/bin/env pthbs-build +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 + +mkdir -p "$pthbs_destdir/versions/$pthbs_package" +cd "$pthbs_destdir/versions/$pthbs_package" +bb=$(which busybox) +mkdir command +for exe in chvt deallocvt fgconsole kbd_mode openvt setfont setkeycodes showkey; do + ln -sf "$bb" command/$exe + printf '%s\t%s\n' "./command/$exe" "./command/$exe" >>.install-links.new +done +mv .install-links.new .install-links diff --git a/packages/busybox-login b/packages/busybox-login @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/packages/busybox:bootstrap b/packages/busybox:bootstrap @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f -#+gnu-make.49c2bb1b7d1b12bd86dc9dbf20aecf4218d79aa432e8862ee8e10324ba14516f +#+musl-cross-make.935182e555695bf1b9f401d79404e8c598026db9f8b93e0be41d176a782e932a +#+gnu-make.162efeebf8811ff0c94b916a634371c2f5804308501b77514191d787bf3a6639 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config : ${JOBS:=1} -mcm=/versions/musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f -make=/versions/gnu-make.49c2bb1b7d1b12bd86dc9dbf20aecf4218d79aa432e8862ee8e10324ba14516f +mcm=/versions/musl-cross-make.935182e555695bf1b9f401d79404e8c598026db9f8b93e0be41d176a782e932a +make=/versions/gnu-make.162efeebf8811ff0c94b916a634371c2f5804308501b77514191d787bf3a6639 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.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 -#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb +#+pthbs-banginstall.d1e43ec62e6d2b3a2a03a2d9ce487f6fe768fb7131c09ce0d2dd9e165233cff1 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz : ${JOBS:=1} @@ -64,7 +64,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/containers b/packages/containers @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 -#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 -#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb +#+pthbs-banginstall.d1e43ec62e6d2b3a2a03a2d9ce487f6fe768fb7131c09ce0d2dd9e165233cff1 +#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d #@git:e9d356d5d04d90fc0873524b985c36be14696fa2:containers : ${JOBS:=1} @@ -37,17 +37,17 @@ printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "$pkgdir/deps/command" -ln -sf '/versions/apk-tools.1a5bf6659a08ee0c79fae91d1eefaf8b8e5b93adb82c80e7f477f52fab0b489f/command/apk.static' "$pkgdir/deps/command/" -ln -sf '/versions/xbps.de1d351a8216d20d40694c87b8a45873b4c21b23d3fccbd6ad88852db30cd0ff/command/xbps-install.static' "$pkgdir/deps/command/" +ln -sf '/versions/apk-tools.c9cdb867562a26201a1618e0b1bf2147e6cee6aff1a6901909ee911a4462327a/command/apk.static' "$pkgdir/deps/command/" +ln -sf '/versions/xbps.9831b74b8d46bb8c240d6ba606b13d3a80d67804ddbce5e828bef08377d0f9b0/command/xbps-install.static' "$pkgdir/deps/command/" -for f in '/versions/alpine-keys.e2c47d8ae8d41e30d8ed82e811fd8b6d775c738c0672ea0a09cc90cdd8a008d8'/keys/alpine/*/*; do +for f in '/versions/alpine-keys.c541ae09189f19994476df864795dd7c26486939981309be95de258ab1554fa1'/keys/alpine/*/*; do d=$(basename "${f%/*}") mkdir -p "$pkgdir/deps/keys/alpine/$d" ln -sf "$f" "$pkgdir/deps/keys/alpine/$d/" done mkdir -p "$pkgdir/deps/keys/void" -for f in '/versions/xbps.de1d351a8216d20d40694c87b8a45873b4c21b23d3fccbd6ad88852db30cd0ff'/keys/void/*; do +for f in '/versions/xbps.9831b74b8d46bb8c240d6ba606b13d3a80d67804ddbce5e828bef08377d0f9b0'/keys/void/*; do ln -sf "$f" "$pkgdir/deps/keys/void/" done @@ -94,7 +94,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/containers.environment b/packages/containers.environment @@ -1,16 +1,16 @@ -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08 -#+s6.4f5d726b3cd79949492d55acfbc7a2554cdb7cc3f6861ad620870621e454da50 -#+s6-portable-utils.792e7d89881ab4c4516c298b6a22ed800210f0df4221723c3e8daff2a06aa7be -#+s6-linux-utils.14f66e4eeae2e1406d10752d06ca9ca4a83ca14464aa6179b32e9fc0bf21ad42 -#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 -#+confz.35f8619bf06bdf10d847e3fc93d49129ab2b39d4d23ed4d9e90f9309d298c22d -#+containers.f26df119904d0e9a93a7edc5cc35d06b4d01a37ae120172afa3832b5eb64c1a8 -#+xbps.de1d351a8216d20d40694c87b8a45873b4c21b23d3fccbd6ad88852db30cd0ff -#+zstd.62d99b3e023021ff3e372f212569b6fb81c47c91a00c49dfd35f3f508e7370d1 -#+apk-tools.1a5bf6659a08ee0c79fae91d1eefaf8b8e5b93adb82c80e7f477f52fab0b489f -#+alpine-keys.e2c47d8ae8d41e30d8ed82e811fd8b6d775c738c0672ea0a09cc90cdd8a008d8 -#+getent.71be4aabb688fc90f3ef296584adf760cfcd2b120193af2bc6198a75cee314aa -#+fileset.8eeccb853780cd74b0a926007fd20caceff376bff04e615de75b1efb9e71447c -#+pidns_run.9ee24751b87f1d881a49c8ff1b0e3ebe027bffb20d6017da7c69d78b85c9ac4d- \ No newline at end of file +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d +#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7 +#+s6-portable-utils.39f4babb8cd30769f1a931708e5442244b0305c36ddafe32348c7dc30c000b00 +#+s6-linux-utils.198acb1d9ef7c0d4eade19a06d07864bfda68d89e4d65990af8bc1026c069885 +#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb +#+confz.6658089fa0f90962e97d41b3fd8400d7ea37c6872828f5f7bd122a2d07a9c467 +#+containers.60c1acf0dfce9a977591b80f5ae29b57f6b436815af20c2a4cbd3c28d8308427 +#+xbps.9831b74b8d46bb8c240d6ba606b13d3a80d67804ddbce5e828bef08377d0f9b0 +#+zstd.ab99ab40fa027a935e6012884c3988d7161dc0c6ff10c06566c0a92c694bca07 +#+apk-tools.c9cdb867562a26201a1618e0b1bf2147e6cee6aff1a6901909ee911a4462327a +#+alpine-keys.c541ae09189f19994476df864795dd7c26486939981309be95de258ab1554fa1 +#+getent.15c11d87a5194766f1ba7b78feac3b77792756cfb12a84c5f5d0f2c7c1cfd25d +#+fileset.22d9abf3009dbbfe507bd7ff93fdd0bf7f86ee0bc317b37b423b89d70ab950a2 +#+pidns_run.e610612c1b58806fb58add7abaefcd0e1f456fba6421abe1b60753056578a057+ \ No newline at end of file diff --git a/packages/core-system-conf b/packages/core-system-conf @@ -1,21 +1,68 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+diffutils.9e9f05a65024308942ec533c1ea40a53f9ee81f0d3cf434ec9b9dfecda665ac8 -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+aat.edb4bd6fe5e267bc49c88621d03e0f415209a73b75edec16f439a8a87b6f14c0 -#+fileset.8eeccb853780cd74b0a926007fd20caceff376bff04e615de75b1efb9e71447c -#@git:d4d8812908e64ae0e8ca233bfeef7e028d77acec:core-system-conf - -: ${JOBS:=1} -prefix=/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/" -cp -av 'core-system-conf' "$pkgdir/" -# verify build -make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C 'core-system-conf' clean -make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C 'core-system-conf' all -rm -rf 'core-system-conf/build' -diff -ru 'core-system-conf/' "$pkgdir/core-system-conf/" +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+diffutils.fd5fae528e3d092e2e30271e8e273cd7fdecce4642547308ca3356e654c3990b +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+aat.e073f6b23349ea7153987ad737fc80f909241ae4a0c0a22adc12392fcad71597 +#+fileset.22d9abf3009dbbfe507bd7ff93fdd0bf7f86ee0bc317b37b423b89d70ab950a2 +#+rsync.f5e922072414cf74a8db00fadc751686c87650b09730663507e6bc5ee61f239b +#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d +#+kbd.4d0b59602cb299724eca17b59bddd6fbb1a72ad73b0103801da528856c31d461 +#+mdevd.d0ffd7f79efbd9ff9af5e2a93e8fe5fae0d994325eb28e2af7e5d6783c50afb3 +#+s6-linux-utils.198acb1d9ef7c0d4eade19a06d07864bfda68d89e4d65990af8bc1026c069885 +#+s6-rc.6cefe2791153127e0a783521ab97f3b124f023f21cdc2eddadbb865496ad0b45 +#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7 +#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb +#@git:434374c57fc499f47b86d92a3bdfdc53bede7ac3:core-system-conf + +def_prefix() { + prefix=/versions/$pthbs_package +} +def_dest() { + dest=${pthbs_destdir%/}//versions/$pthbs_package +} +def_prefix +def_dest +err_notfound() { + printf >&2 'Executable not found for command "%s"\n' "$1" + exit 1 +} +linkdep() { + exe=$(command which "$1") || err_notfound "$1" + exe=$(realpath "$exe") + name=$(basename "$1") + if ! test -x "$exe"; then + printf 'Error: executable not found: %s\n' "$1" + fi + mkdir -p "$dest/deps/command" + ln -sf $exe "$dest/deps/command/$name" +} + +cd 'core-system-conf' +printf '%s\n' >config/etc/motd \ + "Welcome to $(cat ./config/hostname)!" \ + 'Current running configuration was generated from core-system-conf:434374c57fc499f47b86d92a3bdfdc53bede7ac3' \ + 'Last change on 2024-03-06 23:59:03 +0000 by ccx' + +env 'pthbs_path_core-system-conf'="$prefix" \ + 'pthbs_path_containers=/versions/containers.environment.5c638a60055f057e241390ce3f606b4555427cd47c09becd05c48c29ca76d8bb' \ + make -j${JOBS:-1} -l$((1+${JOBS:-1})) all + +sort -u build/execfile | while IFS= read exename; do + linkdep "$exename" +done + +mkdir "$dest/command" +awk -v "zsh=$(which zsh)" <./postinstall >"$dest/command/install-as-current-environment.postinstall" ' +NR==1 { print "#!" zsh } +/@@current@@/ { print "current=/run/current"; next } +/@@versions@@/ { print "versions='/versions'"; next } +1 +' +chmod +x "$dest/command/install-as-current-environment.postinstall" + +mkdir -p "$dest/config/" +rsync -ai ./config/ "$dest/config/" +rsync -ai ./out/ "$dest/config/" cd "$pthbs_destdir/versions/$pthbs_package" @@ -39,8 +86,7 @@ function link(src) { $1!="."{exit 1} -$2 == "static" { link(r1($0)); next } -$2 == "authorized_keys" { link($0); next } +$2 == "config" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -56,7 +102,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/core-system-init b/packages/core-system-init @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+s6.4f5d726b3cd79949492d55acfbc7a2554cdb7cc3f6861ad620870621e454da50 -#+s6-rc.40667d135c9990814a75eb664f12673a28482a896e115579ec275163fb484292 -#+s6-portable-utils.792e7d89881ab4c4516c298b6a22ed800210f0df4221723c3e8daff2a06aa7be -#+s6-linux-init.8dfd3c5fae01b4c1fc48c9d454ba47e96bc832566ac352ee25de67907683a87e -#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08 -#+core-system-rc.fc5755de5b6e39f1a2e9047654c4e7c80beb59515f4c1d465c9c7f0435e7db23 - -s6rcdb=/versions/core-system-rc.fc5755de5b6e39f1a2e9047654c4e7c80beb59515f4c1d465c9c7f0435e7db23/s6-rc-db +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7 +#+s6-rc.6cefe2791153127e0a783521ab97f3b124f023f21cdc2eddadbb865496ad0b45 +#+s6-portable-utils.39f4babb8cd30769f1a931708e5442244b0305c36ddafe32348c7dc30c000b00 +#+s6-linux-init.396413eed542c149346f51a569f2d686c03b2104f4d062f52422e444ad9b502d +#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d +#+core-system-rc.569010dd05cdb91341a6537af073f9c31e781fa350800aafb98fe14d673cba68 + +s6rcdb=/versions/core-system-rc.569010dd05cdb91341a6537af073f9c31e781fa350800aafb98fe14d673cba68/s6-rc-db prefix=/versions/$pthbs_package pkgdir="$pthbs_destdir/$prefix" @@ -142,7 +142,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/core-system-rc b/packages/core-system-rc @@ -1,22 +1,22 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+s6-rc.40667d135c9990814a75eb664f12673a28482a896e115579ec275163fb484292 -#+fileset.8eeccb853780cd74b0a926007fd20caceff376bff04e615de75b1efb9e71447c -#+core-system-conf.d2e04fd56432f9cb2aa900bd4b8b259b88cf8113224fce861242e92a86919850 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+s6-rc.6cefe2791153127e0a783521ab97f3b124f023f21cdc2eddadbb865496ad0b45 +#+fileset.22d9abf3009dbbfe507bd7ff93fdd0bf7f86ee0bc317b37b423b89d70ab950a2 +#+core-system-conf.711c4b8980ffb2db553417aa25ef1ba3e66a3430a019024284b419f585ae66da -conf=/versions/core-system-conf.d2e04fd56432f9cb2aa900bd4b8b259b88cf8113224fce861242e92a86919850/core-system-conf -prefix=/versions/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/s6-rc-source" -cd "$pkgdir/" -fsapply ./s6-rc-source "$conf/s6-rc.fileset" -if ! [[ -f ./s6-rc-source/ok-all/type ]]; then - printf '%s\n' "Failed to generate s6-rc source directory" - exit 111 -fi -s6-rc-compile ./s6-rc-db ./s6-rc-source +def_prefix() { + prefix=/versions/$pthbs_package +} +def_dest() { + dest=${pthbs_destdir%/}//versions/$pthbs_package +} +def_dest +src=/versions/core-system-conf.711c4b8980ffb2db553417aa25ef1ba3e66a3430a019024284b419f585ae66da/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/ ' @@ -39,7 +39,7 @@ function link(src) { $1!="."{exit 1} -$2 == "s6-rc-db" { link($0); next } +$2 == "config" { link($0); next } $2 == "command" { link($0); next } $2 == "bin" { link(s1("command", $0)); next } @@ -55,7 +55,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/core-system-scripts b/packages/core-system-scripts @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 -#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb +#+pthbs-banginstall.d1e43ec62e6d2b3a2a03a2d9ce487f6fe768fb7131c09ce0d2dd9e165233cff1 #@git:98fabf6dffa7a3a7850f1797f557e181b7e8460f:core-system-scripts : ${JOBS:=1} @@ -65,7 +65,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/curl b/packages/curl @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 -#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 +#+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. build_env_static() { @@ -24,6 +24,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/curl" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -121,7 +123,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/default.environment b/packages/default.environment @@ -1,37 +1,37 @@ -#+core-system-conf.d2e04fd56432f9cb2aa900bd4b8b259b88cf8113224fce861242e92a86919850 -#+core-system-rc.fc5755de5b6e39f1a2e9047654c4e7c80beb59515f4c1d465c9c7f0435e7db23 -#+core-system-scripts.8e538b2b91597999d9a32a1b608728200f7f5630aa4066acdb297d47eb2f3e10 -#+core-system-init.4ade6ed159ed1fc54a2da7e8ad43f7f9d8c57dddb8f874d61a2087445c475ece -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+diffutils.9e9f05a65024308942ec533c1ea40a53f9ee81f0d3cf434ec9b9dfecda665ac8 -#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349 -#+flex.c564f7c6d8a89cd1c53a5677f65987700122bb0a417dfff9348c78b8df17efb9 -#+bison.bd4f6247caa50159da9ce7ab37e36df1ecdfd779f307ed1f20e6fdbbb2a134e7 -#+rsync.a6c51048cd1331f9a454a00ab852087080810b0bda2758c8033424fb99063aba -#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08 -#+s6.4f5d726b3cd79949492d55acfbc7a2554cdb7cc3f6861ad620870621e454da50 -#+s6-rc.40667d135c9990814a75eb664f12673a28482a896e115579ec275163fb484292 -#+s6-portable-utils.792e7d89881ab4c4516c298b6a22ed800210f0df4221723c3e8daff2a06aa7be -#+s6-linux-utils.14f66e4eeae2e1406d10752d06ca9ca4a83ca14464aa6179b32e9fc0bf21ad42 -#+s6-linux-init.8dfd3c5fae01b4c1fc48c9d454ba47e96bc832566ac352ee25de67907683a87e -#+mdevd.258e6ea50bf186f8ce57dee77b25e45f8b3bcae5283037d78dcd795db6397325 -#+s6-dns.48685ba743c4728b4176e99ae41261e5b13d9ad0ee52e6f711afd42f37f52da0 -#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7 -#+s6-networking.cc1e01f56502ebec90a4ea7b632dde9b02df852462d6a213b8c29191849f7e0c -#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 -#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 -#+aat.edb4bd6fe5e267bc49c88621d03e0f415209a73b75edec16f439a8a87b6f14c0 -#+confz.35f8619bf06bdf10d847e3fc93d49129ab2b39d4d23ed4d9e90f9309d298c22d -#+containers.f26df119904d0e9a93a7edc5cc35d06b4d01a37ae120172afa3832b5eb64c1a8 -#+fileset.8eeccb853780cd74b0a926007fd20caceff376bff04e615de75b1efb9e71447c -#+logincaps.d9386a7c29239489154a246351c0e0deb584624d16ec764b4a17e8856e37fc1f -#+snaprep.4386ae5a1a3fbf3d875ff06709e6d2103d4090f21a9ad73cee731c32a5e4f8f3 -#+curl.811150400df70e5701f0c499be0854745bb4470018e7211f9fbe6f1b2b1533d4 -#+git.c7e88a88793e6158bc09f8014837d162b9f50553fd5c9fe5c0b243fbe49d8f78 -#+xbps.de1d351a8216d20d40694c87b8a45873b4c21b23d3fccbd6ad88852db30cd0ff -#+apk-tools.1a5bf6659a08ee0c79fae91d1eefaf8b8e5b93adb82c80e7f477f52fab0b489f -#+getent.71be4aabb688fc90f3ef296584adf760cfcd2b120193af2bc6198a75cee314aa -#+getconf.17f16778ec3ce935b4a70331f01c6b233c8a5a8a064bbfbc86db16f1fa6cdf63 -#+iconv.d782d7452b3c1090084b0ba12c2e5bd2648d1d45eca1849a96d2b41dfb91c9d9- \ No newline at end of file +#+core-system-conf.711c4b8980ffb2db553417aa25ef1ba3e66a3430a019024284b419f585ae66da +#+core-system-rc.569010dd05cdb91341a6537af073f9c31e781fa350800aafb98fe14d673cba68 +#+core-system-scripts.f41cc8b889e46da5fe1c5d25d28fcbeac5165d9457d47734a62e32f9ee58396c +#+core-system-init.6ed6537658157fc839390880d584f43c40b21163f52078819ea1ae65ed833306 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+diffutils.fd5fae528e3d092e2e30271e8e273cd7fdecce4642547308ca3356e654c3990b +#+patch.c2f2ffe5c9b78dce8f2a1adeca76c83dd548ffcabed790bfb6e886e9d27474bb +#+flex.1ec95ce5516c7871d0757dc9ffc02f3a8795a765ad7936c23a6e2688e7d3afd0 +#+bison.fed01ec0597b5f4443ca53edb88e09263e1edbec32cb3bdc2d7c8642c295ab64 +#+rsync.f5e922072414cf74a8db00fadc751686c87650b09730663507e6bc5ee61f239b +#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d +#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7 +#+s6-rc.6cefe2791153127e0a783521ab97f3b124f023f21cdc2eddadbb865496ad0b45 +#+s6-portable-utils.39f4babb8cd30769f1a931708e5442244b0305c36ddafe32348c7dc30c000b00 +#+s6-linux-utils.198acb1d9ef7c0d4eade19a06d07864bfda68d89e4d65990af8bc1026c069885 +#+s6-linux-init.396413eed542c149346f51a569f2d686c03b2104f4d062f52422e444ad9b502d +#+mdevd.d0ffd7f79efbd9ff9af5e2a93e8fe5fae0d994325eb28e2af7e5d6783c50afb3 +#+s6-dns.c5b96ce0ad6fe55db7f000d9b5401897829075b1d2a5d9c60e738fc93c3b7db1 +#+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab +#+s6-networking.1d103641e11df88a43703c764e73ad46439950e82f6b64fc9f8b317b1bfde901 +#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb +#+pthbs-banginstall.d1e43ec62e6d2b3a2a03a2d9ce487f6fe768fb7131c09ce0d2dd9e165233cff1 +#+aat.e073f6b23349ea7153987ad737fc80f909241ae4a0c0a22adc12392fcad71597 +#+confz.6658089fa0f90962e97d41b3fd8400d7ea37c6872828f5f7bd122a2d07a9c467 +#+containers.60c1acf0dfce9a977591b80f5ae29b57f6b436815af20c2a4cbd3c28d8308427 +#+fileset.22d9abf3009dbbfe507bd7ff93fdd0bf7f86ee0bc317b37b423b89d70ab950a2 +#+logincaps.17443761febb558783bbc9fe3a6d04c132d8e15e94c06c9d115828d0f84664a1 +#+snaprep.42b7b97b7530a211dd0f01680c9b15362aa2e7249bc27cea0deb0632f7535bb1 +#+curl.b82f818e85570a561ca20ca417adba2f1c3214ef5c3e01626c0a4aa099b90f0c +#+git.1839db7305bbee32d184adc0ece64d40ab58132d3c7749b426c4d680659bd4eb +#+xbps.9831b74b8d46bb8c240d6ba606b13d3a80d67804ddbce5e828bef08377d0f9b0 +#+apk-tools.c9cdb867562a26201a1618e0b1bf2147e6cee6aff1a6901909ee911a4462327a +#+getent.15c11d87a5194766f1ba7b78feac3b77792756cfb12a84c5f5d0f2c7c1cfd25d +#+getconf.d16039d91561f2bb7f430eb2250f1e7c03d59ddeea80a9c55c21e293fb528fd9 +#+iconv.0b381a2e57a5e7b3df6b6a68d72230eec4e5ef2f6a460509c94d3d502fe1f2cf+ \ 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.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. build_env_static() { @@ -23,6 +23,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/diffutils" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -99,7 +101,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/elf.h b/packages/elf.h @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #@sha256:a6ffb38364effd623e135b206ec97ff9e6826a1f285e349a3633df55db38bc9e:elf.h installdir="$pthbs_destdir//versions/$pthbs_package" @@ -42,7 +42,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/elfutils b/packages/elfutils @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 #@untar:-j:sha256:39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8:. build_env_static() { @@ -23,6 +23,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/elfutils" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -55,7 +57,7 @@ check_static() { } export CFLAGS="-D_GNU_SOURCE -Wno-error -Wno-null-dereference" -export LDFLAGS="-static -L/versions/musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a/lib" +export LDFLAGS="-static -L/versions/musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2/lib" autotools elfutils-0.189 \ --disable-nls \ @@ -106,7 +108,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/execline b/packages/execline @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e #@git:85315b3e709f65781dd221fd3f13d3a989a748d4:execline : ${JOBS:=1} @@ -14,7 +14,7 @@ cd 'execline' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ + --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -66,7 +66,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/fileset b/packages/fileset @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 -#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb +#+pthbs-banginstall.d1e43ec62e6d2b3a2a03a2d9ce487f6fe768fb7131c09ce0d2dd9e165233cff1 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset : ${JOBS:=1} @@ -66,7 +66,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/flex b/packages/flex @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. build_env_static() { @@ -23,6 +23,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/flex" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -102,7 +104,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/getconf b/packages/getconf @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c name=getconf @@ -74,7 +74,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/getent b/packages/getent @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c name=getent @@ -74,7 +74,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/git b/packages/git @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 -#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7 -#+curl.811150400df70e5701f0c499be0854745bb4470018e7211f9fbe6f1b2b1533d4 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 +#+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab +#+curl.b82f818e85570a561ca20ca417adba2f1c3214ef5c3e01626c0a4aa099b90f0c #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. check_static() { @@ -83,7 +83,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/gnu-make b/packages/gnu-make @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.49c2bb1b7d1b12bd86dc9dbf20aecf4218d79aa432e8862ee8e10324ba14516f -#+busybox.750086742815fb3f1e218ab2d859e1f84284296fad512b5598df8b100bca4e3a +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.162efeebf8811ff0c94b916a634371c2f5804308501b77514191d787bf3a6639 +#+busybox.4f3dc50a678af6b674a9dd28176dd70defdead9642b605d42ecde190ae0ef1ec #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. build_env_static() { @@ -21,6 +21,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/gnu-make" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -96,7 +98,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/gnu-make:bootstrap b/packages/gnu-make:bootstrap @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f +#+musl-cross-make.935182e555695bf1b9f401d79404e8c598026db9f8b93e0be41d176a782e932a #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. build_env_static() { @@ -21,6 +21,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/gnu-make:bootstrap" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -53,7 +55,7 @@ check_static() { } -mcm=/versions/musl-cross-make.b43ad65630978888c1163fba8ea289e762d694bcd8e11eeab0799338405b843f +mcm=/versions/musl-cross-make.935182e555695bf1b9f401d79404e8c598026db9f8b93e0be41d176a782e932a export PATH="$mcm/bin:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" @@ -102,7 +104,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/iconv b/packages/iconv @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c name=iconv @@ -74,7 +74,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/kbd b/packages/kbd @@ -0,0 +1,122 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 +#@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" +} +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/kbd" \ + --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 +} + + +#export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" +export LDFLAGS="--static" +autotools_static kbd-2.6.4 \ + --disable-nls --disable-vlock --disable-werror --disable-tests \ + --datadir="$prefix/data" --datarootdir="$prefix/data" +check_static command/loadkeys +cd ../destdir +mv -v data ".$prefix/" + + + +cd "$pthbs_destdir/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./command/loadkeys"]=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 == "data" { 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/kernel.environment b/packages/kernel.environment @@ -1 +1 @@ -#+linux.bcc0e0ac888fcae5d61ba81807ab0bc6ef7a609cd32a856f2ec597689ebbce11- \ No newline at end of file +#+linux.fb92ea898f81f3d19b7e8396fd308c7e9351e637871b4fba196a8357a74ee436+ \ No newline at end of file diff --git a/packages/libarchive b/packages/libarchive @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:. build_env_static() { @@ -23,6 +23,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/libarchive" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -101,7 +103,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/libelf-compat b/packages/libelf-compat @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6 #@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch #@untar:-j:sha256:4496d6cec9644cda8006ead15e17e500629ce30fe85ab2f2052a77ba43a1358d:. @@ -52,7 +52,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/libelf.h b/packages/libelf.h @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #@sha256:9be2e5a97b3fcbc60dedb71967667b9a21d562dbfdaa7f9f74f4b3d9cbb5df86:include/dwarf.h #@sha256:0991a992f75396056c7d7f698fa7e87be24349ae85a195060d46e6a61881d97b:include/gelf.h #@sha256:3b20df1d58f9a445785503415aea1188d33159327c2edab3d370dbd37bc4845e:include/libelf.h @@ -45,7 +45,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/libressl b/packages/libressl @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. build_env_static() { @@ -23,6 +23,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/libressl" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -103,7 +105,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/linux b/packages/linux @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+diffutils.9e9f05a65024308942ec533c1ea40a53f9ee81f0d3cf434ec9b9dfecda665ac8 -#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349 -#+flex.c564f7c6d8a89cd1c53a5677f65987700122bb0a417dfff9348c78b8df17efb9 -#+bison.bd4f6247caa50159da9ce7ab37e36df1ecdfd779f307ed1f20e6fdbbb2a134e7 -#+rsync.a6c51048cd1331f9a454a00ab852087080810b0bda2758c8033424fb99063aba -#+libelf-compat.a3f567beacf8a00194cd18e3564737bbd3d58448706a3ac07a34ca88b8ad0a34 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+diffutils.fd5fae528e3d092e2e30271e8e273cd7fdecce4642547308ca3356e654c3990b +#+patch.c2f2ffe5c9b78dce8f2a1adeca76c83dd548ffcabed790bfb6e886e9d27474bb +#+flex.1ec95ce5516c7871d0757dc9ffc02f3a8795a765ad7936c23a6e2688e7d3afd0 +#+bison.fed01ec0597b5f4443ca53edb88e09263e1edbec32cb3bdc2d7c8642c295ab64 +#+rsync.f5e922072414cf74a8db00fadc751686c87650b09730663507e6bc5ee61f239b +#+libelf-compat.fe3d8e94f9889f2bda4206cd33dfeefb1a44c67d68cd513b067472696a706582 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cb8081499f316acdc7b31b486b8d68afd68094db8f420aba0eab2c3e8de13888:linux.config @@ -72,7 +72,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/logincaps b/packages/logincaps @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 -#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 -#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08 -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb +#+pthbs-banginstall.d1e43ec62e6d2b3a2a03a2d9ce487f6fe768fb7131c09ce0d2dd9e165233cff1 +#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #@git:b8c706e2a24a12ec3854d41e777e4b8840f98be2:logincaps : ${JOBS:=1} @@ -71,7 +71,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/m4 b/packages/m4 @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. build_env_static() { @@ -22,6 +22,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/m4" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -96,7 +98,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/mdevd b/packages/mdevd @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c -#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e +#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d #@git:d9f63961ec01dc02131ad0967734ae1a058b27b8:mdevd : ${JOBS:=1} @@ -15,7 +15,7 @@ cd 'mdevd' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ + --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -60,7 +60,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } 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.49c2bb1b7d1b12bd86dc9dbf20aecf4218d79aa432e8862ee8e10324ba14516f -#+busybox.750086742815fb3f1e218ab2d859e1f84284296fad512b5598df8b100bca4e3a +#+musl-cross-make.935182e555695bf1b9f401d79404e8c598026db9f8b93e0be41d176a782e932a +#+gnu-make.162efeebf8811ff0c94b916a634371c2f5804308501b77514191d787bf3a6639 +#+busybox.4f3dc50a678af6b674a9dd28176dd70defdead9642b605d42ecde190ae0ef1ec #@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 @@ -136,7 +136,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/musl-cross-make:bootstrap-0 b/packages/musl-cross-make:bootstrap-0 @@ -82,7 +82,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/musl-cross-make:bootstrap-1 b/packages/musl-cross-make:bootstrap-1 @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.e10036694579d6004eea572e22aff6c97911778116816cbabae5c3e9a5896a37 +#+musl-cross-make.4f084f4decf6af2657036a6ef0d3fa48ea62ec6f7ec3deb3c1255356d84012bd #@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 @@ -13,7 +13,7 @@ #@sha256:7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4:musl-cross-make/sources/musl-1.2.3.tar.gz : ${JOBS:=1} -bootstrap=/versions/musl-cross-make.e10036694579d6004eea572e22aff6c97911778116816cbabae5c3e9a5896a37 +bootstrap=/versions/musl-cross-make.4f084f4decf6af2657036a6ef0d3fa48ea62ec6f7ec3deb3c1255356d84012bd "$bootstrap/bin/x86_64-linux-musl-gcc" --version # For validating the compiler @@ -90,7 +90,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/netbsd-curses b/packages/netbsd-curses @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 #@git:5874f9b1ced9c29d7d590d95e254b252f657a160:curses export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so" @@ -62,7 +62,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/patch b/packages/patch @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. build_env_static() { @@ -23,6 +23,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/patch" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -96,7 +98,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/patchelf:bootstrap b/packages/patchelf:bootstrap @@ -20,6 +20,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/patchelf:bootstrap" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -95,7 +97,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/pidns_run b/packages/pidns_run @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e #@sha256:c7be49de876eea64554e2e46bcaa7059083bcd6210c5007fd9030e0a6e57a0dd:pidns_run.c name=pidns_run @@ -75,7 +75,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/pkgconf b/packages/pkgconf @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:. build_env_static() { @@ -23,6 +23,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/pkgconf" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -98,7 +100,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/pkgconf-pkg-config b/packages/pkgconf-pkg-config @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+pkgconf.e8cb09e47eb54af1a164ec34603d39f494b91035626d5903204f439f2aef4843 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+pkgconf.939909cf5717c0df6df9ef0e6e5a5745bec05de901f55fee8116cfe2a4f59e1d mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/packages/popt b/packages/popt @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. build_env_static() { @@ -23,6 +23,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/popt" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -95,7 +97,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/pthbs-banginstall b/packages/pthbs-banginstall @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall installdir="$pthbs_destdir//versions/$pthbs_package" @@ -45,7 +45,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/rsync b/packages/rsync @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 -#+popt.37ed47b20ce3edc6b2cd974ab0b22a92ce4d55e0b8e97be57c68a55810dce820 -#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 +#+popt.d994682732499125f79227d5e9ca96af0cc3023a2b7df3c1ee10f904d6c76278 +#+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. build_env_static() { @@ -25,6 +25,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/rsync" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -106,7 +108,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/s6 b/packages/s6 @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349 -#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c -#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+patch.c2f2ffe5c9b78dce8f2a1adeca76c83dd548ffcabed790bfb6e886e9d27474bb +#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e +#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d #@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.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ + --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -64,7 +64,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/s6-dns b/packages/s6-dns @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e #@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.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ + --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -59,7 +59,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/s6-linux-init b/packages/s6-linux-init @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c -#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08 -#+s6.4f5d726b3cd79949492d55acfbc7a2554cdb7cc3f6861ad620870621e454da50 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e +#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d +#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7 #@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.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ + --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -61,7 +61,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/s6-linux-utils b/packages/s6-linux-utils @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e #@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.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ + --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -59,7 +59,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/s6-networking b/packages/s6-networking @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c -#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08 -#+s6.4f5d726b3cd79949492d55acfbc7a2554cdb7cc3f6861ad620870621e454da50 -#+s6-dns.48685ba743c4728b4176e99ae41261e5b13d9ad0ee52e6f711afd42f37f52da0 -#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e +#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d +#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7 +#+s6-dns.c5b96ce0ad6fe55db7f000d9b5401897829075b1d2a5d9c60e738fc93c3b7db1 +#+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab #@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.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ + --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -67,7 +67,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/s6-portable-utils b/packages/s6-portable-utils @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e #@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.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ + --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -59,7 +59,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/s6-rc b/packages/s6-rc @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+skalibs.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c -#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08 -#+s6.4f5d726b3cd79949492d55acfbc7a2554cdb7cc3f6861ad620870621e454da50 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e +#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d +#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7 #@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.fe32704315b2fdfa2fe71679940d2ef4d644ff99458dd6c9bdf45ad451dd4d5c/sysdeps' \ + --with-sysdeps='/versions/skalibs.9c4a42aba2c3b6d3622a04a17fb8dbb75d51805220f45823c26fe7a73e842b5e/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -61,7 +61,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/skalibs b/packages/skalibs @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 #@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs : ${JOBS:=1} @@ -62,7 +62,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/snaprep b/packages/snaprep @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 -#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb +#+pthbs-banginstall.d1e43ec62e6d2b3a2a03a2d9ce487f6fe768fb7131c09ce0d2dd9e165233cff1 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep : ${JOBS:=1} @@ -65,7 +65,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/userspace.environment b/packages/userspace.environment @@ -1,33 +1,33 @@ -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+diffutils.9e9f05a65024308942ec533c1ea40a53f9ee81f0d3cf434ec9b9dfecda665ac8 -#+patch.c738e7d35300fa9db0eba35891656cd875ae3f672155663b7858045b64607349 -#+flex.c564f7c6d8a89cd1c53a5677f65987700122bb0a417dfff9348c78b8df17efb9 -#+bison.bd4f6247caa50159da9ce7ab37e36df1ecdfd779f307ed1f20e6fdbbb2a134e7 -#+rsync.a6c51048cd1331f9a454a00ab852087080810b0bda2758c8033424fb99063aba -#+execline.452e71f73707cbff64b401d0b8d334fe3d1f18e21a63719019dd79e5681bba08 -#+s6.4f5d726b3cd79949492d55acfbc7a2554cdb7cc3f6861ad620870621e454da50 -#+s6-rc.40667d135c9990814a75eb664f12673a28482a896e115579ec275163fb484292 -#+s6-portable-utils.792e7d89881ab4c4516c298b6a22ed800210f0df4221723c3e8daff2a06aa7be -#+s6-linux-utils.14f66e4eeae2e1406d10752d06ca9ca4a83ca14464aa6179b32e9fc0bf21ad42 -#+s6-linux-init.8dfd3c5fae01b4c1fc48c9d454ba47e96bc832566ac352ee25de67907683a87e -#+mdevd.258e6ea50bf186f8ce57dee77b25e45f8b3bcae5283037d78dcd795db6397325 -#+s6-dns.48685ba743c4728b4176e99ae41261e5b13d9ad0ee52e6f711afd42f37f52da0 -#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7 -#+s6-networking.cc1e01f56502ebec90a4ea7b632dde9b02df852462d6a213b8c29191849f7e0c -#+zsh.8474abd982544dce655067a14304164c886c611e5afe0862620d5da1d9b29ba4 -#+pthbs-banginstall.b64d9ba0fbbd756ae02cbab919b36d897f24c20d9b54001008bfc16f8555fb60 -#+aat.edb4bd6fe5e267bc49c88621d03e0f415209a73b75edec16f439a8a87b6f14c0 -#+confz.35f8619bf06bdf10d847e3fc93d49129ab2b39d4d23ed4d9e90f9309d298c22d -#+containers.f26df119904d0e9a93a7edc5cc35d06b4d01a37ae120172afa3832b5eb64c1a8 -#+fileset.8eeccb853780cd74b0a926007fd20caceff376bff04e615de75b1efb9e71447c -#+logincaps.d9386a7c29239489154a246351c0e0deb584624d16ec764b4a17e8856e37fc1f -#+snaprep.4386ae5a1a3fbf3d875ff06709e6d2103d4090f21a9ad73cee731c32a5e4f8f3 -#+curl.811150400df70e5701f0c499be0854745bb4470018e7211f9fbe6f1b2b1533d4 -#+git.c7e88a88793e6158bc09f8014837d162b9f50553fd5c9fe5c0b243fbe49d8f78 -#+xbps.de1d351a8216d20d40694c87b8a45873b4c21b23d3fccbd6ad88852db30cd0ff -#+apk-tools.1a5bf6659a08ee0c79fae91d1eefaf8b8e5b93adb82c80e7f477f52fab0b489f -#+getent.71be4aabb688fc90f3ef296584adf760cfcd2b120193af2bc6198a75cee314aa -#+getconf.17f16778ec3ce935b4a70331f01c6b233c8a5a8a064bbfbc86db16f1fa6cdf63 -#+iconv.d782d7452b3c1090084b0ba12c2e5bd2648d1d45eca1849a96d2b41dfb91c9d9- \ No newline at end of file +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+diffutils.fd5fae528e3d092e2e30271e8e273cd7fdecce4642547308ca3356e654c3990b +#+patch.c2f2ffe5c9b78dce8f2a1adeca76c83dd548ffcabed790bfb6e886e9d27474bb +#+flex.1ec95ce5516c7871d0757dc9ffc02f3a8795a765ad7936c23a6e2688e7d3afd0 +#+bison.fed01ec0597b5f4443ca53edb88e09263e1edbec32cb3bdc2d7c8642c295ab64 +#+rsync.f5e922072414cf74a8db00fadc751686c87650b09730663507e6bc5ee61f239b +#+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d +#+s6.bb3974d7b49c2034b5064bac508beae2d4bfc1a7b6543aefcbc1af9e9e94f1a7 +#+s6-rc.6cefe2791153127e0a783521ab97f3b124f023f21cdc2eddadbb865496ad0b45 +#+s6-portable-utils.39f4babb8cd30769f1a931708e5442244b0305c36ddafe32348c7dc30c000b00 +#+s6-linux-utils.198acb1d9ef7c0d4eade19a06d07864bfda68d89e4d65990af8bc1026c069885 +#+s6-linux-init.396413eed542c149346f51a569f2d686c03b2104f4d062f52422e444ad9b502d +#+mdevd.d0ffd7f79efbd9ff9af5e2a93e8fe5fae0d994325eb28e2af7e5d6783c50afb3 +#+s6-dns.c5b96ce0ad6fe55db7f000d9b5401897829075b1d2a5d9c60e738fc93c3b7db1 +#+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab +#+s6-networking.1d103641e11df88a43703c764e73ad46439950e82f6b64fc9f8b317b1bfde901 +#+zsh.762204e14953017be79e356d4bf9f7681625a750ecc951f3510bf144ea7b51bb +#+pthbs-banginstall.d1e43ec62e6d2b3a2a03a2d9ce487f6fe768fb7131c09ce0d2dd9e165233cff1 +#+aat.e073f6b23349ea7153987ad737fc80f909241ae4a0c0a22adc12392fcad71597 +#+confz.6658089fa0f90962e97d41b3fd8400d7ea37c6872828f5f7bd122a2d07a9c467 +#+containers.60c1acf0dfce9a977591b80f5ae29b57f6b436815af20c2a4cbd3c28d8308427 +#+fileset.22d9abf3009dbbfe507bd7ff93fdd0bf7f86ee0bc317b37b423b89d70ab950a2 +#+logincaps.17443761febb558783bbc9fe3a6d04c132d8e15e94c06c9d115828d0f84664a1 +#+snaprep.42b7b97b7530a211dd0f01680c9b15362aa2e7249bc27cea0deb0632f7535bb1 +#+curl.b82f818e85570a561ca20ca417adba2f1c3214ef5c3e01626c0a4aa099b90f0c +#+git.1839db7305bbee32d184adc0ece64d40ab58132d3c7749b426c4d680659bd4eb +#+xbps.9831b74b8d46bb8c240d6ba606b13d3a80d67804ddbce5e828bef08377d0f9b0 +#+apk-tools.c9cdb867562a26201a1618e0b1bf2147e6cee6aff1a6901909ee911a4462327a +#+getent.15c11d87a5194766f1ba7b78feac3b77792756cfb12a84c5f5d0f2c7c1cfd25d +#+getconf.d16039d91561f2bb7f430eb2250f1e7c03d59ddeea80a9c55c21e293fb528fd9 +#+iconv.0b381a2e57a5e7b3df6b6a68d72230eec4e5ef2f6a460509c94d3d502fe1f2cf+ \ No newline at end of file diff --git a/packages/xbps b/packages/xbps @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 -#+libarchive.7ae626a2036298772ddce8cd995ff9097feef3ed3fa59d794c4bdebdc2435739 -#+libressl.f24e842a162aca40e3f12feb1435c0c8fbc61796a319625d5d0bfa184853cae7 -#+pkgconf-pkg-config.9ce762e8803a43c875dd59a366babec3f2ac504bf3985bba236c13f70b396f43 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 +#+libarchive.aa7013d03a07172e4ec536b685db4b899245f2188585c41da811a44171645026 +#+libressl.712d293b92e9b1beb4a8b5905c45ea20cab64e3ddd9796f9c2781577f04771ab +#+pkgconf-pkg-config.2993a64b810b50b0fa289b8d8eaf614f6f1719d9f2473960b2cbf5856939b834 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. build_env_static() { @@ -26,6 +26,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/xbps" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -139,7 +141,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/zsh b/packages/zsh @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 -#+m4.2d780cdd4d9ee307f0f3b70f26b8431a36adba929521e24b1f422c99a77dc065 -#+netbsd-curses.317e80aebf0c196911a22856846094b23d6c920874844c45389d689f6cc381a6 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded +#+m4.d61a4ef6e5ca207e24ed8bbbd9931e1e0ac2359ed5aae4e384b49d71401b4840 +#+netbsd-curses.ff25fe788224b3d213f4fc5b1627e5c08f24ca35f1590f25465e2bd9fb47ceae #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. @@ -25,6 +25,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/zsh" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='/var/pthbs' \ "$@" @@ -125,7 +127,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/packages/zstd b/packages/zstd @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.531bc7e70f40f7357346d43d6992e9c914778858af129367c2c45eb33c52353a -#+gnu-make.27fdc2f1de0604a722f4244e66be12d1a53842b5ce57e30770495b176706eddc -#+busybox.d91bd595bbfadbd5a8aa0786dd0d6a00cc90a6fa513083219600bde926723c3c -#+busybox-diffutils.32158044bea39813508fd77f608b2d44a3b1d145ac6d8cda2f3efcbbf2cfaa48 +#+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2 +#+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5 +#+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9 +#+busybox-diffutils.4f5a07b29246414b77a7d71b103263af8f1249d75ddcbd9864e00def3d6feded #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. check_static() { @@ -75,7 +75,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/templates/functions/autotools b/templates/functions/autotools @@ -10,6 +10,8 @@ autotools_config() { --mandir="$prefix/man" \ --libdir="$prefix/library" \ --docdir="$prefix/doc/{{name}}" \ + --datadir="$prefix/data" \ + --datarootdir="$prefix/data" \ --localstatedir='{{var_dir}}' \ "$@" {# diff --git a/templates/genlinks b/templates/genlinks @@ -41,7 +41,7 @@ $2 == "info" { link($0); next } $2 == "doc" { link($0); next } $2 == "icons" { link($0); next } $2 == "terminfo" { link($0); next } - +$2 == "data" { link($0); next } $2 == "include" { link($0); next } { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } diff --git a/templates/pkg/busybox b/templates/pkg/busybox @@ -24,6 +24,7 @@ echo false | ./command/busybox --list >/dev/null # test if it works /^(cmp|diff)$/ {next} # provided by diffutils /^(login)$/ {next} # provided by logincaps /^(reset|clear)$/ {next} # provided by netbsd-curses +/^(chvt|deallocvt|fgconsole|kbd_mode|openvt|setfont|setkeycodes|showkey)$/ {next} # provided by kbd { print "./command/busybox\t./command/" $0 } END { print "./command/busybox\t./command/busybox" } ' >.install-links.new diff --git a/templates/pkg/busybox-kbd b/templates/pkg/busybox-kbd @@ -0,0 +1,14 @@ +{% extends "base" %} +{%- block body %} +#+{{pkg_install_name("busybox")}} + +mkdir -p "$pthbs_destdir{{versions}}/$pthbs_package" +cd "$pthbs_destdir{{versions}}/$pthbs_package" +bb=$(which busybox) +mkdir command +for exe in chvt deallocvt fgconsole kbd_mode openvt setfont setkeycodes showkey; do + ln -sf "$bb" command/$exe + printf '%s\t%s\n' "./command/$exe" "./command/$exe" >>.install-links.new +done +mv .install-links.new .install-links +{% endblock %} diff --git a/templates/pkg/core-system-conf b/templates/pkg/core-system-conf @@ -6,13 +6,25 @@ #+{{pkg_install_name("aat")}} #+{{pkg_install_name("fileset")}} #+{{pkg_install_name("rsync")}} +#+{{pkg_install_name("execline")}} +#+{{pkg_install_name("kbd")}} +#+{{pkg_install_name("mdevd")}} +#+{{pkg_install_name("s6-linux-utils")}} +#+{{pkg_install_name("s6-rc")}} +#+{{pkg_install_name("s6")}} +#+{{pkg_install_name("zsh")}} #@git:{{submodule.current[name]}}:{{name}} {% include "functions/vars" %} def_prefix def_dest +err_notfound() { + printf >&2 'Executable not found for command "%s"\n' "$1" + exit 1 +} linkdep() { - exe=$(realpath "$(which "$1")") + exe=$(command which "$1") || err_notfound "$1" + exe=$(realpath "$exe") name=$(basename "$1") if ! test -x "$exe"; then printf 'Error: executable not found: %s\n' "$1" @@ -23,12 +35,12 @@ linkdep() { cd '{{name}}' printf '%s\n' >config/etc/motd \ - "Welcome to $(<./config/hostname)!" + "Welcome to $(cat ./config/hostname)!" \ 'Current running configuration was generated from {{name}}:{{submodule.current[name]}}' \ 'Last change on {{submodule.commit_info(submodule.current[name])}}' env 'pthbs_path_{{name}}'="$prefix" \ - 'pthbs_path_containers={{pkg_install_dir("containers.environment"}}' \ + 'pthbs_path_containers={{pkg_install_dir("containers.environment")}}' \ {{make}} all sort -u build/execfile | while IFS= read exename; do @@ -36,16 +48,17 @@ sort -u build/execfile | while IFS= read exename; do done mkdir "$dest/command" -awk <./postinstall >./install-as-current-environment.postinstall ' +awk -v "zsh=$(which zsh)" <./postinstall >"$dest/command/install-as-current-environment.postinstall" ' +NR==1 { print "#!" zsh } /@@current@@/ { print "current=/run/current"; next } /@@versions@@/ { print "versions='{{versions}}'"; next } 1 ' -pthbs-banginstall ./install-as-current-environment.postinstall "$dest/command" +chmod +x "$dest/command/install-as-current-environment.postinstall" mkdir -p "$dest/config/" -rsync -aAi ./config/ "$dest/config/" -rsync -aAi ./out/ "$dest/config/" +rsync -ai ./config/ "$dest/config/" +rsync -ai ./out/ "$dest/config/" {% endblock -%} {% block rules %} diff --git a/templates/pkg/core-system-rc b/templates/pkg/core-system-rc @@ -6,19 +6,14 @@ #+{{pkg_install_name("fileset")}} #+{{pkg_install_name("core-system-conf")}} -conf={{pkg_install_dir("core-system-conf")}}/core-system-conf -prefix={{versions}}/$pthbs_package -pkgdir="$pthbs_destdir/$prefix" -mkdir -p "$pkgdir/s6-rc-source" -cd "$pkgdir/" -fsapply ./s6-rc-source "$conf/s6-rc.fileset" -if ! [[ -f ./s6-rc-source/ok-all/type ]]; then - printf '%s\n' "Failed to generate s6-rc source directory" - exit 111 -fi -s6-rc-compile ./s6-rc-db ./s6-rc-source +{% include "functions/vars" %} +def_dest +src={{pkg_install_dir("core-system-conf")}}/config/s6-rc-source +s6-rc-compile ./s6-rc-db "$src" +mkdir -p "$dest/config" +mv -v s6-rc-db "$dest/config/" {% endblock -%} {% block rules %} -$2 == "s6-rc-db" { link($0); next } +$2 == "config" { link($0); next } {% endblock -%} diff --git a/templates/pkg/kbd b/templates/pkg/kbd @@ -0,0 +1,19 @@ +{% extends "autotools" %} +{%- block extra_deps %} +#@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. +{%- endblock %} +{% block at_script %} + +#export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS" +export LDFLAGS="--static" +autotools_static kbd-2.6.4 \ + --disable-nls --disable-vlock --disable-werror --disable-tests \ + --datadir="$prefix/data" --datarootdir="$prefix/data" +check_static command/loadkeys +cd ../destdir +mv -v data ".$prefix/" + +{% endblock %} +{% block genlinks_begin %} + x["./command/loadkeys"]=1 +{% endblock %}