commit 64cf08cc0155f7451d2bbca71976b47288fbf4f9 parent 851345549a2209fd9f7feeb12e00e1dea18c338b Author: Jan Pobříslo <ccx@te2000.cz> Date: Sun, 21 Jan 2024 20:17:54 +0100 WIP sandboxing using sydbox Diffstat:
80 files changed, 670 insertions(+), 349 deletions(-)
diff --git a/.gitmodules b/.gitmodules @@ -89,3 +89,6 @@ [submodule "sources/core-system-scripts"] path = sources/core-system-scripts url = /home/ccx/git/carbon-scripts.git +[submodule "sources/patchelf"] + path = sources/patchelf + url = https://github.com/NixOS/patchelf diff --git a/command/pthbs-build b/command/pthbs-build @@ -2,7 +2,7 @@ bsh=$(sha256sum $1) || exit $? bsh=${bsh%% *} basedir=$(dirname "$(dirname "$(realpath "$0")")") -workdir=$basedir/work/builddir.$$ +workdir=$(realpath "$basedir/work/builddir.$$") script=$(realpath "$1") pthbs_package=${1##*/} @@ -37,6 +37,11 @@ function q(s) { # quote string for sh return single_quote s single_quote } +function dirname(s) { # strip the last path component + sub("/[^/]*$", "", s) + return s +} + function fatal(msg) { printf "FATAL: pthbs-build: %s %s:%d: \"%s\"\n", msg, FILENAME, FNR, $0 >"/dev/stderr" exit 1 @@ -101,13 +106,32 @@ function at_filehash(hash_type, file_hash, dst, dstdir){ } /^$/ { if(settings["sandbox"]) { - fatal("Sandboxing not supported yet") + if(length(ENVIRON["PTHBS_SYD"])) { + sandbox_cmd=" SYD_NO_SYSLOG=1 SYD_LOG_FD=3 3>syd.log" + sandbox_cmd=sandbox_cmd " " ENVIRON["PTHBS_SYD"] " -m sandbox/stat:off -m sandbox/exec:off" + sandbox_cmd=sandbox_cmd " -m trace/allow_unsafe_chmod:1" # Allow sticky bit on directories + sandbox_cmd=sandbox_cmd " -m " q("allowlist/read+"ENVIRON["workdir"]"/***") + sandbox_cmd=sandbox_cmd " -m " q("allowlist/write+"ENVIRON["workdir"]"/***") + sandbox_cmd=sandbox_cmd " -m " q("allowlist/read+/proc/loadavg") + sandbox_cmd=sandbox_cmd " -m " q("allowlist/read+/etc/passwd") + sandbox_cmd=sandbox_cmd " -m " q("allowlist/read+/etc/group") + sandbox_cmd=sandbox_cmd " -m " q("allowlist/read+/tmp/***") + sandbox_cmd=sandbox_cmd " -m " q("allowlist/write+/tmp/***") + sandbox_cmd=sandbox_cmd " -m " q("allowlist/read+/dev/***") + sandbox_cmd=sandbox_cmd " -m " q("allowlist/write+/dev/***") + sandbox_cmd=sandbox_cmd " -m " q("allowlist/read+"ENVIRON["script"]) + sandbox_cmd=sandbox_cmd " -m " q("allowlist/read+"dirname(ENVIRON["envdir"])"/***") + } else { + fatal("set $PTHBS_SYD to enable sandboxing") + } + } else { + sandbox_cmd="" } if(length(ENVIRON["envdir"])){ printf "exec >build.log 2>&1 env" printf " %s", "pthbs_build_environment="q(ENVIRON["envdir"]) if(settings["set_path"]) { - printf " %s", "PATH="q(ENVIRON["envdir"]"/command") + printf " %s", "PATH="q(ENVIRON["envdir"]"/command") sandbox_cmd print " "q(ENVIRON["envdir"]"/command/sh")" -xe "q(ENVIRON["script"]) } else { print " sh -xe "q(ENVIRON["script"]) @@ -160,7 +184,8 @@ else fi printf "BUILD FAILED: exitcode %s :: %s :: %s :: %s\n" "$ret" "$1" "$workdir" "$logdir" mkdir -p "$logdir" - ln -sf "$(basename "$logdir")" "$(dirname "$logdir")/last_failed_build" + rm -v "$(dirname "$logdir")/last_failed_build" + ln -v -s -f "$(basename "$logdir")" "$(dirname "$logdir")/last_failed_build" pthbs-digest-tree >"$logdir/workdir-digest" "$workdir" fi @@ -171,6 +196,11 @@ if test -e "$workdir/build.log"; then bzip2 "$logdir/log" fi +if test -e "$workdir/syd.log"; then + mv "$workdir/syd.log" "$logdir/syd.log" + bzip2 "$logdir/syd.log" +fi + if test -e "$workdir/pthbs-setup"; then mv "$workdir/pthbs-setup" "$logdir/" fi diff --git a/downloadlist.sha256 b/downloadlist.sha256 @@ -29,3 +29,4 @@ ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd 783756 https:// 39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8 9143169 https://sourceware.org/elfutils/ftp/0.189/elfutils-0.189.tar.bz2 4496d6cec9644cda8006ead15e17e500629ce30fe85ab2f2052a77ba43a1358d 122231 ./libelf-compat-0.152c001.tar.bz2 9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5 3332400 https://sourceforge.net/projects/zsh/files/zsh/5.9/zsh-5.9.tar.xz +d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b 80888824 https://ftpmirror.gnu.org/gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz diff --git a/gen-downloadlist-entry b/gen-downloadlist-entry @@ -0,0 +1,78 @@ +#!/bin/zsh +setopt no_unset warn_create_global +zmodload zsh/stat || exit $? + +typeset -g basedir=$0:h + +### Utility functions {{{1 +# helper that prints out stack, error message and exits +die_ret() { + set +x + local ret n + ret=$1 + shift + print -r - >&2 "${hl_fatal}Fatal$hl_reset error occurend in:" + for n in {${#funcfiletrace}..1}; do + printf >&2 '%d> %s (%s)\n' $n "$funcfiletrace[$n]" "$functrace[$n]" + done + printf >&2 '%s\n' "${hl_fatal}*$hl_reset $^@" + exit $ret +} + +die() { + set +x + die_ret 1 "$@" +} +die100() { # 100: wrong usage + set +x + die_ret 100 "$@" +} +die111() { # 111: system call failed + set +x + die_ret 111 "$@" +} + +-() { # Run command and die on nonzero exitcode + "$@" || die_ret $? "command failed with exitcode $?: ${(j: :)${(q)@}}" +} + +in() { # Run command in subdirectory and die on nonzero exitcode + local d=$1 + shift + (cd $d && "$@") || die_ret $? "command failed with exitcode $? (dir=${(qqq)d}): ${(j: :)${(q)@}}" +} + +pretend() { + : "$@" +} +typeset -f -t pretend + +confirm() { + local REPLY + printf >&2 '%s ' ${1:-y/N} + if read -q; then + echo + else + echo + exit 1 + fi +} + +### Main {{{1 + +main() { + local digest url fname + local -A statinfo + + url=$1 + fname=${2:-./${1:t}} + + zstat -H statinfo - $fname || die_ret $? "stat failed" + digest=${"$(sha256sum $fname)"%% *} || die_ret $? "sha256sum failed" + printf '%s %s %s\n' $digest $statinfo[size] $url + confirm "Write to $basedir/downloadlist.sha256 and move file to downloads? [y/N]" + printf >>$basedir/downloadlist.sha256 '%s %s %s\n' $digest $statinfo[size] $url + mv -v $fname $basedir/downloads/sha256/$digest +} + +main "$@" diff --git a/packages/aat b/packages/aat @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+zsh.ab347c2bf33345f5c8ccc911490305d65cb5d3fb86d29ab374e218a93fc6e268 -#+pthbs-banginstall.4acc05826812a65baca1dea7ce467bdbe33570c70e35a3ead46c43d24ae089ed +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+zsh.d890666b11de1830b4b3097362ae463e8d2a8fa30a67401201d4ff6b6ef93fa0 +#+pthbs-banginstall.ca7bf7214ad2a44a99c1ac63112d83ae6eee13aad6bf2a56a92990eba5943a4a #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat : ${JOBS:=1} diff --git a/packages/bison b/packages/bison @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+busybox-diffutils.a1112631b6daa058b9bb166ac4b2146973ca7c18b909c5400eb991d168556bd0 -#+m4.0580f144290b5b2b8dfd82bae7b209444498f0b2c49b1d3a85f7a31e3c00a146 -#+flex.b62d752270e090ca95e6899f099ca4743cb1486a1ec36a9bcdf1ae4bf7ffa50d +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+busybox-diffutils.750d25b58b64e04edf431dcc96c3cbfe8e2126a20cf648034d0e68ddd9311c77 +#+m4.7a37a1630b818c108d8ea8919e9d29a46fc8c7bcbb2b09c3b8b1a53be9a39ee0 +#+flex.27309ca99c4dac3c0f1e57fe5ee78f06cd9ac4605eaccbb54268d090b3041f18 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. autotools() { diff --git a/packages/bootstrap.environment b/packages/bootstrap.environment @@ -1,3 +1,3 @@ -#+busybox.fad51f588bfae3a2228c40316784ec621fcccdcc87788e85b4aa24a6d685dd27 -#+gnu-make.3d2c4be858e305bbf33223eedde87f66a34ab1df0a316c4e7e5bf4efa2cd6291 -#+musl-cross-make.6cb863941ec71737e8d15f654be7f64f5e1d1b3578e28f61419c5e7ce58f77c6- \ No newline at end of file +#+busybox.17b16297d2583e9adc29df4b7f80cae4881614a7adcb3f9bea1c66f1ea4864e2 +#+gnu-make.03bc40a9faf5c287ed6254cd69e3b7db3629f4b52c6cfc490be90923cf22b247 +#+musl-cross-make.776e0d99cded5e96fcdc0905738eaec82ff804310fc978af7f59106711aae018+ \ No newline at end of file diff --git a/packages/busybox b/packages/busybox @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3d2c4be858e305bbf33223eedde87f66a34ab1df0a316c4e7e5bf4efa2cd6291 -#+busybox.fad51f588bfae3a2228c40316784ec621fcccdcc87788e85b4aa24a6d685dd27 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.03bc40a9faf5c287ed6254cd69e3b7db3629f4b52c6cfc490be90923cf22b247 +#+busybox.17b16297d2583e9adc29df4b7f80cae4881614a7adcb3f9bea1c66f1ea4864e2 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab:busybox/.config diff --git a/packages/busybox-diffutils b/packages/busybox-diffutils @@ -1,6 +1,5 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/packages/busybox-login b/packages/busybox-login @@ -1,6 +1,5 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/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.6cb863941ec71737e8d15f654be7f64f5e1d1b3578e28f61419c5e7ce58f77c6 -#+gnu-make.3d2c4be858e305bbf33223eedde87f66a34ab1df0a316c4e7e5bf4efa2cd6291 +#+musl-cross-make.776e0d99cded5e96fcdc0905738eaec82ff804310fc978af7f59106711aae018 +#+gnu-make.03bc40a9faf5c287ed6254cd69e3b7db3629f4b52c6cfc490be90923cf22b247 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config : ${JOBS:=1} -mcm=/home/ccx/versions/musl-cross-make.6cb863941ec71737e8d15f654be7f64f5e1d1b3578e28f61419c5e7ce58f77c6 -make=/home/ccx/versions/gnu-make.3d2c4be858e305bbf33223eedde87f66a34ab1df0a316c4e7e5bf4efa2cd6291 +mcm=/home/ccx/versions/musl-cross-make.776e0d99cded5e96fcdc0905738eaec82ff804310fc978af7f59106711aae018 +make=/home/ccx/versions/gnu-make.03bc40a9faf5c287ed6254cd69e3b7db3629f4b52c6cfc490be90923cf22b247 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,8 +1,7 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+zsh.ab347c2bf33345f5c8ccc911490305d65cb5d3fb86d29ab374e218a93fc6e268 -#+pthbs-banginstall.4acc05826812a65baca1dea7ce467bdbe33570c70e35a3ead46c43d24ae089ed +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+zsh.d890666b11de1830b4b3097362ae463e8d2a8fa30a67401201d4ff6b6ef93fa0 +#+pthbs-banginstall.ca7bf7214ad2a44a99c1ac63112d83ae6eee13aad6bf2a56a92990eba5943a4a #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz : ${JOBS:=1} diff --git a/packages/containers b/packages/containers @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+zsh.ab347c2bf33345f5c8ccc911490305d65cb5d3fb86d29ab374e218a93fc6e268 -#+pthbs-banginstall.4acc05826812a65baca1dea7ce467bdbe33570c70e35a3ead46c43d24ae089ed -#+execline.212907020e985bcf7a850b25114d7d264ae725bea35d0d631d58e1e5801eeefc +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+zsh.d890666b11de1830b4b3097362ae463e8d2a8fa30a67401201d4ff6b6ef93fa0 +#+pthbs-banginstall.ca7bf7214ad2a44a99c1ac63112d83ae6eee13aad6bf2a56a92990eba5943a4a +#+execline.be364e9b578b0d78e556691379755a762c972bf776d3f2d3fb4ef681a8cdd747 #@git:e1e16c08f53d80d08f0ce9e405115fd650270e6b:containers : ${JOBS:=1} diff --git a/packages/core-system-conf b/packages/core-system-conf @@ -1,10 +1,9 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+diffutils.8b8d8e77ea4a38208c2ec62e4f48df8ba365476d0363d9139b4e87a371e9220c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+aat.324ec1b33055301b8884508fb052dc047e89e6ca47f2e17949cdce8918f2c4fc -#+fileset.8db1ec15a8c764b4999a9ec882cb7ef4ad7693d8d51dfa8070a21b6bd9e0a149 +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+diffutils.cf048a6e9e9bf7bde7d4eae25394477723a18e7a4190af1d343e8d42181106dc +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+aat.6ba8d8cc4000d624d9391d95fa290879d0a4dc07b54b93ea19c1f929e8ec765b +#+fileset.86290e6a573bac8bf36372e7b2bd0ab15b9dba580184698be536c5f81fd27e14 #@git:68c2ffd5f266f0c27e3d0b9038872088235659f5:core-system-conf : ${JOBS:=1} diff --git a/packages/core-system-init b/packages/core-system-init @@ -1,14 +1,13 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+s6.5842cf13ac273f44789effa073be8856e140c0c1c8e881e56b0953d8c3f9bfde -#+s6-rc.d9477400ee9be61bbd377c180fc7cdc6a23ebad752775622078a8000f3485214 -#+s6-portable-utils.74e1284710969971e975e52a4a18c628df2c12db025139d5707e1a0af27dab64 -#+s6-linux-init.ae12bfa48868d8e6ebf8066df04a4d51751a879322992a6883586c4580c6a0d6 -#+execline.212907020e985bcf7a850b25114d7d264ae725bea35d0d631d58e1e5801eeefc -#+core-system-rc.3ae386addf824444a7c470e615ec72fd61effa62221c6897eb4cbdb1c26700b5 - -s6rcdb=/home/ccx/versions/core-system-rc.3ae386addf824444a7c470e615ec72fd61effa62221c6897eb4cbdb1c26700b5/s6-rc-db +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+s6.f00aa300746aa32adb2e4513dd2b9f32e7a6841f82b925a2690431e4b6d6fbbc +#+s6-rc.14a018754e6f57c036811bb9a0ce99f1f260da82b22cefa0d1dc325348325624 +#+s6-portable-utils.b4ab366a98f790440e9c1d875b1bef5582ce6676ca75a746cebf14e169db07c3 +#+s6-linux-init.555076f18a039ea18437b5640772f46bd739264d1de0397d2e6eb26e5faaf064 +#+execline.be364e9b578b0d78e556691379755a762c972bf776d3f2d3fb4ef681a8cdd747 +#+core-system-rc.cf8fa54b5baae95d4c89199e6aa5ef50b37e574d80023fd5b566a47181ffa231 + +s6rcdb=/home/ccx/versions/core-system-rc.cf8fa54b5baae95d4c89199e6aa5ef50b37e574d80023fd5b566a47181ffa231/s6-rc-db prefix=/home/ccx/versions/$pthbs_package pkgdir="$pthbs_destdir/$prefix" diff --git a/packages/core-system-rc b/packages/core-system-rc @@ -1,12 +1,11 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+busybox-diffutils.a1112631b6daa058b9bb166ac4b2146973ca7c18b909c5400eb991d168556bd0 -#+s6-rc.d9477400ee9be61bbd377c180fc7cdc6a23ebad752775622078a8000f3485214 -#+fileset.8db1ec15a8c764b4999a9ec882cb7ef4ad7693d8d51dfa8070a21b6bd9e0a149 -#+core-system-conf.47c9e8c97fd233c043f9b63abc8e0a915be08cb4ac26dd8d64e917f4e040cfb3 +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+busybox-diffutils.750d25b58b64e04edf431dcc96c3cbfe8e2126a20cf648034d0e68ddd9311c77 +#+s6-rc.14a018754e6f57c036811bb9a0ce99f1f260da82b22cefa0d1dc325348325624 +#+fileset.86290e6a573bac8bf36372e7b2bd0ab15b9dba580184698be536c5f81fd27e14 +#+core-system-conf.05a95c7e257f913e6520296778312bef0d29f5db7393548f083ca1aa7afe7145 -conf=/home/ccx/versions/core-system-conf.47c9e8c97fd233c043f9b63abc8e0a915be08cb4ac26dd8d64e917f4e040cfb3/core-system-conf +conf=/home/ccx/versions/core-system-conf.05a95c7e257f913e6520296778312bef0d29f5db7393548f083ca1aa7afe7145/core-system-conf prefix=/home/ccx/versions/$pthbs_package pkgdir="$pthbs_destdir/$prefix" mkdir -p "$pkgdir/s6-rc-source" diff --git a/packages/core-system-scripts b/packages/core-system-scripts @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+zsh.ab347c2bf33345f5c8ccc911490305d65cb5d3fb86d29ab374e218a93fc6e268 -#+pthbs-banginstall.4acc05826812a65baca1dea7ce467bdbe33570c70e35a3ead46c43d24ae089ed +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+zsh.d890666b11de1830b4b3097362ae463e8d2a8fa30a67401201d4ff6b6ef93fa0 +#+pthbs-banginstall.ca7bf7214ad2a44a99c1ac63112d83ae6eee13aad6bf2a56a92990eba5943a4a #@git:98fabf6dffa7a3a7850f1797f557e181b7e8460f:core-system-scripts : ${JOBS:=1} diff --git a/packages/default.environment b/packages/default.environment @@ -1,30 +1,30 @@ -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+diffutils.8b8d8e77ea4a38208c2ec62e4f48df8ba365476d0363d9139b4e87a371e9220c -#+patch.e88eea6400a7d36c81defb72be8639b32a81791f6dc45424cf5cc04aaf636006 -#+flex.b62d752270e090ca95e6899f099ca4743cb1486a1ec36a9bcdf1ae4bf7ffa50d -#+bison.3d9db209c80cf73d47088ce649e2d3267818413cf749e0bfccdc84003d492677 -#+rsync.456bd92f8127bdd35d14b434ccc3ef01e2e3c5bf51e09e81cf31793bffc445f0 -#+execline.212907020e985bcf7a850b25114d7d264ae725bea35d0d631d58e1e5801eeefc -#+s6.5842cf13ac273f44789effa073be8856e140c0c1c8e881e56b0953d8c3f9bfde -#+s6-rc.d9477400ee9be61bbd377c180fc7cdc6a23ebad752775622078a8000f3485214 -#+s6-portable-utils.74e1284710969971e975e52a4a18c628df2c12db025139d5707e1a0af27dab64 -#+s6-linux-utils.715675b37c929447b8a7434a9fc330e1692e5bbd459e406743eec778a4305fed -#+s6-linux-init.ae12bfa48868d8e6ebf8066df04a4d51751a879322992a6883586c4580c6a0d6 -#+mdevd.c61798b14d712f303b7d13e56d4be3230187c72bcc12d0a68345bfe5f83c1b67 -#+s6-dns.218c387833bb5f3db8cf6d46fdf9b5daf76fdcd344ba23dd433f0790815ae93d -#+s6-networking.20244fbbe73d9b70b6e1030ff6d198d6ff04162284c523722859fed11c2eb558 -#+zsh.ab347c2bf33345f5c8ccc911490305d65cb5d3fb86d29ab374e218a93fc6e268 -#+pthbs-banginstall.4acc05826812a65baca1dea7ce467bdbe33570c70e35a3ead46c43d24ae089ed -#+aat.324ec1b33055301b8884508fb052dc047e89e6ca47f2e17949cdce8918f2c4fc -#+confz.31c18a68f15e9e49fa8c1b7a850c5eb7cfe456f2bb6ff859267628dc3fac6b4c -#+containers.da63edefe232296a47c6e639b30fb9ab127f6d9bd27132e0306ba18e036d91c5 -#+fileset.8db1ec15a8c764b4999a9ec882cb7ef4ad7693d8d51dfa8070a21b6bd9e0a149 -#+logincaps.d1cbcbb8c5bca5c69e85fbe821229189ded7b9eb29d83e6c4fc6b9c6196826bc -#+snaprep.1ed06cea3dda8aca11d7d3ec83742e10eabc2836633213b39806eafaa6ef078a -#+core-system-conf.47c9e8c97fd233c043f9b63abc8e0a915be08cb4ac26dd8d64e917f4e040cfb3 -#+core-system-rc.3ae386addf824444a7c470e615ec72fd61effa62221c6897eb4cbdb1c26700b5 -#+core-system-scripts.3ee976e69ffcf28b2be06f881b98406c9c01ff56fde5ffad512e2e2f9e6f544b -#+core-system-init.decfe63f6801447f980ac30b7fec5b007d415ae7802a001bb11da3b84fca3fe7 -#+linux.6f1590762b7d76ff71297f21c313b58800c8d8b4cd18f013d3a275e75b41c2dd- \ No newline at end of file +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+diffutils.cf048a6e9e9bf7bde7d4eae25394477723a18e7a4190af1d343e8d42181106dc +#+patch.9e2d522b78ab86e75b7b1ee8f48a106a47dc4c858b5adf8859d2ec53eb7a76ee +#+flex.27309ca99c4dac3c0f1e57fe5ee78f06cd9ac4605eaccbb54268d090b3041f18 +#+bison.46d5b2b6aa022621cfff54ba200b1f90c41e0894902bab58cc7d1d5cf743ce1e +#+rsync.b6b8b584d90e5e4e9da31f117b7e4950fd748757ca75bf23b343d9d0b7538dd6 +#+execline.be364e9b578b0d78e556691379755a762c972bf776d3f2d3fb4ef681a8cdd747 +#+s6.f00aa300746aa32adb2e4513dd2b9f32e7a6841f82b925a2690431e4b6d6fbbc +#+s6-rc.14a018754e6f57c036811bb9a0ce99f1f260da82b22cefa0d1dc325348325624 +#+s6-portable-utils.b4ab366a98f790440e9c1d875b1bef5582ce6676ca75a746cebf14e169db07c3 +#+s6-linux-utils.956a96815511103ab60607fab26138bc91423b3aab212c6e77e8df376e3fae64 +#+s6-linux-init.555076f18a039ea18437b5640772f46bd739264d1de0397d2e6eb26e5faaf064 +#+mdevd.5644829c799d316edef8961a9fb6c3d32bc87ba341979a6aeafd2317ce594bc5 +#+s6-dns.4f9cf1c4bb5d40451448561e6a3155d1dfbe2c4f9c2dfb82e6bdfb9dbc25c438 +#+s6-networking.f9ba82a20aa66c7a091b541d7bafb8876ef20ff574dd489522cdd1e2f860e354 +#+zsh.d890666b11de1830b4b3097362ae463e8d2a8fa30a67401201d4ff6b6ef93fa0 +#+pthbs-banginstall.ca7bf7214ad2a44a99c1ac63112d83ae6eee13aad6bf2a56a92990eba5943a4a +#+aat.6ba8d8cc4000d624d9391d95fa290879d0a4dc07b54b93ea19c1f929e8ec765b +#+confz.2425ec7a2e6128e1ebd3a8dc2490f531ad2e9e343347babcaeb9b41f94ddeb45 +#+containers.998b198f64395aa07014d8d592289ebd73b791fc42d72c890273b44eb61dcd02 +#+fileset.86290e6a573bac8bf36372e7b2bd0ab15b9dba580184698be536c5f81fd27e14 +#+logincaps.a15410037fcb6467bf45d546a985859bcbb18db98f4c2ca13685b383292315bd +#+snaprep.425443078f1b7dacd022d954cf3e8989f099c2dfebca78c9b503df14f8889826 +#+core-system-conf.05a95c7e257f913e6520296778312bef0d29f5db7393548f083ca1aa7afe7145 +#+core-system-rc.cf8fa54b5baae95d4c89199e6aa5ef50b37e574d80023fd5b566a47181ffa231 +#+core-system-scripts.8dd9eed07b1b2a8c63623ce85b764a05f096a40062fe17aa4295ccaa6353dcb4 +#+core-system-init.3beb78dc26952726e68ba0579ff6820dd58982c7d0e66d246cf26809f58e3cfa +#+linux.2200c052c019b8ba96605961c79abf3d38098df9c76e9a4e900f54ccc8bc0c26+ \ No newline at end of file diff --git a/packages/diffutils b/packages/diffutils @@ -1,10 +1,9 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+busybox-diffutils.a1112631b6daa058b9bb166ac4b2146973ca7c18b909c5400eb991d168556bd0 -#+m4.0580f144290b5b2b8dfd82bae7b209444498f0b2c49b1d3a85f7a31e3c00a146 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+busybox-diffutils.750d25b58b64e04edf431dcc96c3cbfe8e2126a20cf648034d0e68ddd9311c77 +#+m4.7a37a1630b818c108d8ea8919e9d29a46fc8c7bcbb2b09c3b8b1a53be9a39ee0 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. autotools() { diff --git a/packages/elf.h b/packages/elf.h @@ -1,6 +1,5 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e #@sha256:a6ffb38364effd623e135b206ec97ff9e6826a1f285e349a3633df55db38bc9e:elf.h installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package" diff --git a/packages/elfutils b/packages/elfutils @@ -1,10 +1,9 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+busybox-diffutils.a1112631b6daa058b9bb166ac4b2146973ca7c18b909c5400eb991d168556bd0 -#+m4.0580f144290b5b2b8dfd82bae7b209444498f0b2c49b1d3a85f7a31e3c00a146 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+busybox-diffutils.750d25b58b64e04edf431dcc96c3cbfe8e2126a20cf648034d0e68ddd9311c77 +#+m4.7a37a1630b818c108d8ea8919e9d29a46fc8c7bcbb2b09c3b8b1a53be9a39ee0 #@untar:-j:sha256:39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8:. autotools() { @@ -43,7 +42,7 @@ autotools() { export CFLAGS="-D_GNU_SOURCE -Wno-error -Wno-null-dereference" -export LDFLAGS="-static -L/home/ccx/versions/musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c/lib" +export LDFLAGS="-static -L/home/ccx/versions/musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61/lib" autotools elfutils-0.189 \ --disable-nls \ diff --git a/packages/execline b/packages/execline @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96 #@git:85315b3e709f65781dd221fd3f13d3a989a748d4:execline : ${JOBS:=1} @@ -17,7 +16,7 @@ cd 'execline' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/fileset b/packages/fileset @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+zsh.ab347c2bf33345f5c8ccc911490305d65cb5d3fb86d29ab374e218a93fc6e268 -#+pthbs-banginstall.4acc05826812a65baca1dea7ce467bdbe33570c70e35a3ead46c43d24ae089ed +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+zsh.d890666b11de1830b4b3097362ae463e8d2a8fa30a67401201d4ff6b6ef93fa0 +#+pthbs-banginstall.ca7bf7214ad2a44a99c1ac63112d83ae6eee13aad6bf2a56a92990eba5943a4a #@git:4cced2cb91b19ebb648b803cfdcc936148cd6f94:fileset : ${JOBS:=1} diff --git a/packages/flex b/packages/flex @@ -1,10 +1,9 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+busybox-diffutils.a1112631b6daa058b9bb166ac4b2146973ca7c18b909c5400eb991d168556bd0 -#+m4.0580f144290b5b2b8dfd82bae7b209444498f0b2c49b1d3a85f7a31e3c00a146 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+busybox-diffutils.750d25b58b64e04edf431dcc96c3cbfe8e2126a20cf648034d0e68ddd9311c77 +#+m4.7a37a1630b818c108d8ea8919e9d29a46fc8c7bcbb2b09c3b8b1a53be9a39ee0 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. autotools() { diff --git a/packages/gmp b/packages/gmp @@ -1,10 +1,9 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+busybox-diffutils.a1112631b6daa058b9bb166ac4b2146973ca7c18b909c5400eb991d168556bd0 -#+m4.0580f144290b5b2b8dfd82bae7b209444498f0b2c49b1d3a85f7a31e3c00a146 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+busybox-diffutils.750d25b58b64e04edf431dcc96c3cbfe8e2126a20cf648034d0e68ddd9311c77 +#+m4.7a37a1630b818c108d8ea8919e9d29a46fc8c7bcbb2b09c3b8b1a53be9a39ee0 #@untar:-j:sha256:5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2:. autotools() { diff --git a/packages/gnu-make b/packages/gnu-make @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3d2c4be858e305bbf33223eedde87f66a34ab1df0a316c4e7e5bf4efa2cd6291 -#+busybox.fad51f588bfae3a2228c40316784ec621fcccdcc87788e85b4aa24a6d685dd27 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.03bc40a9faf5c287ed6254cd69e3b7db3629f4b52c6cfc490be90923cf22b247 +#+busybox.17b16297d2583e9adc29df4b7f80cae4881614a7adcb3f9bea1c66f1ea4864e2 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. autotools() { diff --git a/packages/gnu-make:bootstrap b/packages/gnu-make:bootstrap @@ -1,5 +1,7 @@ #!/usr/bin/env pthbs-build -#+* +#@pragma:nosandbox +#@pragma:nopath +#+musl-cross-make.776e0d99cded5e96fcdc0905738eaec82ff804310fc978af7f59106711aae018 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. autotools() { @@ -38,7 +40,7 @@ autotools() { -mcm=/home/ccx/versions/musl-cross-make.6cb863941ec71737e8d15f654be7f64f5e1d1b3578e28f61419c5e7ce58f77c6 +mcm=/home/ccx/versions/musl-cross-make.776e0d99cded5e96fcdc0905738eaec82ff804310fc978af7f59106711aae018 export PATH="$mcm/bin:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/packages/libelf-compat b/packages/libelf-compat @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e #@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6 #@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch #@untar:-j:sha256:4496d6cec9644cda8006ead15e17e500629ce30fe85ab2f2052a77ba43a1358d:. diff --git a/packages/libelf.h b/packages/libelf.h @@ -1,6 +1,5 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e #@sha256:9be2e5a97b3fcbc60dedb71967667b9a21d562dbfdaa7f9f74f4b3d9cbb5df86:include/dwarf.h #@sha256:0991a992f75396056c7d7f698fa7e87be24349ae85a195060d46e6a61881d97b:include/gelf.h #@sha256:3b20df1d58f9a445785503415aea1188d33159327c2edab3d370dbd37bc4845e:include/libelf.h diff --git a/packages/linux b/packages/linux @@ -1,14 +1,13 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+diffutils.8b8d8e77ea4a38208c2ec62e4f48df8ba365476d0363d9139b4e87a371e9220c -#+patch.e88eea6400a7d36c81defb72be8639b32a81791f6dc45424cf5cc04aaf636006 -#+flex.b62d752270e090ca95e6899f099ca4743cb1486a1ec36a9bcdf1ae4bf7ffa50d -#+bison.3d9db209c80cf73d47088ce649e2d3267818413cf749e0bfccdc84003d492677 -#+rsync.456bd92f8127bdd35d14b434ccc3ef01e2e3c5bf51e09e81cf31793bffc445f0 -#+libelf-compat.1754316c0f1decdbeaee39e0265d71a4478a1f086f8dc1a4a8e1f9e36b30aa6f +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+diffutils.cf048a6e9e9bf7bde7d4eae25394477723a18e7a4190af1d343e8d42181106dc +#+patch.9e2d522b78ab86e75b7b1ee8f48a106a47dc4c858b5adf8859d2ec53eb7a76ee +#+flex.27309ca99c4dac3c0f1e57fe5ee78f06cd9ac4605eaccbb54268d090b3041f18 +#+bison.46d5b2b6aa022621cfff54ba200b1f90c41e0894902bab58cc7d1d5cf743ce1e +#+rsync.b6b8b584d90e5e4e9da31f117b7e4950fd748757ca75bf23b343d9d0b7538dd6 +#+libelf-compat.81dd8f2800e353979a2e0af0897b68f7060da17b72b98e80cc9c057a557d189a #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cb8081499f316acdc7b31b486b8d68afd68094db8f420aba0eab2c3e8de13888:linux.config diff --git a/packages/logincaps b/packages/logincaps @@ -1,10 +1,9 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+zsh.ab347c2bf33345f5c8ccc911490305d65cb5d3fb86d29ab374e218a93fc6e268 -#+pthbs-banginstall.4acc05826812a65baca1dea7ce467bdbe33570c70e35a3ead46c43d24ae089ed -#+execline.212907020e985bcf7a850b25114d7d264ae725bea35d0d631d58e1e5801eeefc -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+zsh.d890666b11de1830b4b3097362ae463e8d2a8fa30a67401201d4ff6b6ef93fa0 +#+pthbs-banginstall.ca7bf7214ad2a44a99c1ac63112d83ae6eee13aad6bf2a56a92990eba5943a4a +#+execline.be364e9b578b0d78e556691379755a762c972bf776d3f2d3fb4ef681a8cdd747 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 #@git:b8c706e2a24a12ec3854d41e777e4b8840f98be2:logincaps : ${JOBS:=1} diff --git a/packages/m4 b/packages/m4 @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+busybox-diffutils.a1112631b6daa058b9bb166ac4b2146973ca7c18b909c5400eb991d168556bd0 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+busybox-diffutils.750d25b58b64e04edf431dcc96c3cbfe8e2126a20cf648034d0e68ddd9311c77 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. autotools() { diff --git a/packages/mdevd b/packages/mdevd @@ -1,10 +1,9 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6 -#+execline.212907020e985bcf7a850b25114d7d264ae725bea35d0d631d58e1e5801eeefc +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96 +#+execline.be364e9b578b0d78e556691379755a762c972bf776d3f2d3fb4ef681a8cdd747 #@git:d9f63961ec01dc02131ad0967734ae1a058b27b8:mdevd : ${JOBS:=1} @@ -18,7 +17,7 @@ cd 'mdevd' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/mpc b/packages/mpc @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+busybox-diffutils.a1112631b6daa058b9bb166ac4b2146973ca7c18b909c5400eb991d168556bd0 -#+m4.0580f144290b5b2b8dfd82bae7b209444498f0b2c49b1d3a85f7a31e3c00a146 -#+gmp.d3ba33733e7776276dbec738710925643e5cd3e5c252bec1343a817bb2c141e6 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+busybox-diffutils.750d25b58b64e04edf431dcc96c3cbfe8e2126a20cf648034d0e68ddd9311c77 +#+m4.7a37a1630b818c108d8ea8919e9d29a46fc8c7bcbb2b09c3b8b1a53be9a39ee0 +#+gmp.b0b93790e18ac2c45443f7448c0e3aa028e2ce1e29f4635a559bad3ce56a58d0 #@untar:-z:sha256:6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e:. autotools() { diff --git a/packages/mpfr b/packages/mpfr @@ -1,10 +1,9 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+busybox-diffutils.a1112631b6daa058b9bb166ac4b2146973ca7c18b909c5400eb991d168556bd0 -#+m4.0580f144290b5b2b8dfd82bae7b209444498f0b2c49b1d3a85f7a31e3c00a146 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+busybox-diffutils.750d25b58b64e04edf431dcc96c3cbfe8e2126a20cf648034d0e68ddd9311c77 +#+m4.7a37a1630b818c108d8ea8919e9d29a46fc8c7bcbb2b09c3b8b1a53be9a39ee0 #@untar:-z:sha256:c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc:. autotools() { diff --git a/packages/musl-cross-make b/packages/musl-cross-make @@ -1,12 +1,11 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6cb863941ec71737e8d15f654be7f64f5e1d1b3578e28f61419c5e7ce58f77c6 -#+gnu-make.3d2c4be858e305bbf33223eedde87f66a34ab1df0a316c4e7e5bf4efa2cd6291 -#+busybox.fad51f588bfae3a2228c40316784ec621fcccdcc87788e85b4aa24a6d685dd27 +#+musl-cross-make.776e0d99cded5e96fcdc0905738eaec82ff804310fc978af7f59106711aae018 +#+gnu-make.03bc40a9faf5c287ed6254cd69e3b7db3629f4b52c6cfc490be90923cf22b247 +#+busybox.17b16297d2583e9adc29df4b7f80cae4881614a7adcb3f9bea1c66f1ea4864e2 #@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 -#@sha256:c95da32f440378d7751dd95533186f7fc05ceb4fb65eb5b85234e6299eb9838e:musl-cross-make/sources/gcc-9.4.0.tar.xz +#@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz #@sha256:5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2:musl-cross-make/sources/gmp-6.1.2.tar.bz2 #@sha256:bdf76c15229b241e578046b8486106f09534d754ea4cbf105e0660e551fb1669:musl-cross-make/sources/linux-6.5.4.tar.xz #@sha256:6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e:musl-cross-make/sources/mpc-1.1.0.tar.gz @@ -22,7 +21,12 @@ export HOSTCC="$pthbs_build_environment/command/x86_64-linux-musl-gcc" printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}/home/ccx/versions/$pthbs_package" \ "TARGET=x86_64-linux-musl" \ - 'LINUX_VER=6.5.4' + 'GCC_VER=11.2.0' \ + 'LINUX_VER=6.5.4' \ + 'st=-static --static' \ + 'fl=-g0 -O2' \ + 'COMMON_CONFIG += CFLAGS="${fl} ${st}" CXXFLAGS="${fl} ${st}" FFLAGS="${fl}" LDFLAGS="-s ${st}"' \ + 'COMMON_CONFIG += CC="x86_64-linux-musl-gcc ${st}" CXX="x86_64-linux-musl-g++ ${st}"' printf '%s %s\n' >musl-cross-make/hashes/linux-6.5.4.tar.xz.sha1 \ 24ffca128d47b6c8e5c15efaa2b1c9ebe546c13c linux-6.5.4.tar.xz diff --git a/packages/musl-cross-make:bootstrap b/packages/musl-cross-make:bootstrap @@ -1,9 +1,11 @@ #!/usr/bin/env pthbs-build -#+* +#@pragma:nosandbox +#@pragma:nopath +#+musl-cross-make.96e6501dce1d35d3debcc35756f15d7568a3a994a3bb4109b3ab3660715e83d5 #@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 -#@sha256:c95da32f440378d7751dd95533186f7fc05ceb4fb65eb5b85234e6299eb9838e:musl-cross-make/sources/gcc-9.4.0.tar.xz +#@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz #@sha256:5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2:musl-cross-make/sources/gmp-6.1.2.tar.bz2 #@sha256:995bc76ccf0c40d752b5ea67c022232a17eef6c9ec80ea74ea742e3c19992813:musl-cross-make/sources/linux-headers-4.19.88-1.tar.xz #@sha256:6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e:musl-cross-make/sources/mpc-1.1.0.tar.gz @@ -11,10 +13,24 @@ #@sha256:7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4:musl-cross-make/sources/musl-1.2.3.tar.gz : ${JOBS:=1} -printf '%s\n' >musl-cross-make/config.mak "OUTPUT=${pthbs_destdir%/}/home/ccx/versions/$pthbs_package" "TARGET=x86_64-linux-musl" +bootstrap=/home/ccx/versions/musl-cross-make.96e6501dce1d35d3debcc35756f15d7568a3a994a3bb4109b3ab3660715e83d5 +printf '%s\n' >musl-cross-make/config.mak \ + "OUTPUT=${pthbs_destdir%/}/home/ccx/versions/$pthbs_package" \ + 'GCC_VER=11.2.0' \ + "TARGET=x86_64-linux-musl" \ + 'st=-static --static' \ + 'fl=-g0 -O2' \ + "bbin=$bootstrap/bin" \ + 'COMMON_CONFIG += CFLAGS="${fl}" CXXFLAGS="${fl}" FFLAGS="${fl}" LDFLAGS="-s ${st}"' \ + 'COMMON_CONFIG += CC="${bbin}/x86_64-linux-musl-gcc ${st}" CXX="${bbin}/x86_64-linux-musl-g++ ${st}"' touch musl-cross-make/sources/* -make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make || exit $? -make -C musl-cross-make install || exit $? +export PATH="$bootstrap/bin:$PATH" +make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make +make -C musl-cross-make install +"$bootstrap/bin/x86_64-linux-musl-gcc" --version +make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make +make -C musl-cross-make install +"${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' --version cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' diff --git a/packages/musl-cross-make:bootstrap-0 b/packages/musl-cross-make:bootstrap-0 @@ -0,0 +1,78 @@ +#!/usr/bin/env pthbs-build +#@pragma:nosandbox +#@pragma:nopath +#@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 +#@sha256:c95da32f440378d7751dd95533186f7fc05ceb4fb65eb5b85234e6299eb9838e:musl-cross-make/sources/gcc-9.4.0.tar.xz +#@sha256:5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2:musl-cross-make/sources/gmp-6.1.2.tar.bz2 +#@sha256:995bc76ccf0c40d752b5ea67c022232a17eef6c9ec80ea74ea742e3c19992813:musl-cross-make/sources/linux-headers-4.19.88-1.tar.xz +#@sha256:6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e:musl-cross-make/sources/mpc-1.1.0.tar.gz +#@sha256:c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc:musl-cross-make/sources/mpfr-4.0.2.tar.bz2 +#@sha256:7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4:musl-cross-make/sources/musl-1.2.3.tar.gz + +: ${JOBS:=1} +printf '%s\n' >musl-cross-make/config.mak \ + "OUTPUT=${pthbs_destdir%/}/home/ccx/versions/$pthbs_package" \ + "TARGET=x86_64-linux-musl" \ + 'fl=-g0 -O2' \ + 'COMMON_CONFIG += CFLAGS="${fl}" CXXFLAGS="${fl}" FFLAGS="${fl}" LDFLAGS="-s"' +touch musl-cross-make/sources/* +make -j${JOBS:-1} -l$((1+${JOBS:-1})) -C musl-cross-make +make -C musl-cross-make install +"${pthbs_destdir%/}"'/home/ccx/versions'"/$pthbs_package/bin/"'x86_64-linux-musl-gcc' --version + +cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./bin/x86_64-linux-musl-g++"]=1 + x["./bin/x86_64-linux-musl-gcc"]=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 == "bin" && $3 ~ /^x86_64-linux-musl-/ { target=$3; sub("x86_64-linux-musl-", "", target); link("./command/" target) } +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } + +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "icons" { link($0); next } +$2 == "terminfo" { link($0); next } + +$2 == "include" { link($0); next } + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + exit 3 + } + } +}' >.install-links.new +mv .install-links.new .install-links diff --git a/packages/netbsd-curses b/packages/netbsd-curses @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 #@git:5874f9b1ced9c29d7d590d95e254b252f657a160:curses export CFLAGS="-L$pthbs_build_environment/library -L$pthbs_build_environment/library.so" diff --git a/packages/patch b/packages/patch @@ -1,10 +1,9 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+busybox-diffutils.a1112631b6daa058b9bb166ac4b2146973ca7c18b909c5400eb991d168556bd0 -#+m4.0580f144290b5b2b8dfd82bae7b209444498f0b2c49b1d3a85f7a31e3c00a146 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+busybox-diffutils.750d25b58b64e04edf431dcc96c3cbfe8e2126a20cf648034d0e68ddd9311c77 +#+m4.7a37a1630b818c108d8ea8919e9d29a46fc8c7bcbb2b09c3b8b1a53be9a39ee0 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. autotools() { diff --git a/packages/patchelf:bootstrap b/packages/patchelf:bootstrap @@ -0,0 +1,99 @@ +#!/usr/bin/env pthbs-build +#@pragma:nosandbox +#@pragma:nopath +#@git:7c2f768bf9601268a4e71c2ebe91e2011918a70f:patchelf + +autotools() { + cd "$1" + shift + export LD_LIBRARY_PATH="$pthbs_build_environment/library:$pthbs_build_environment/library.so" + export CPATH="$pthbs_build_environment/include" + export CFLAGS="-L$pthbs_build_environment/library" + prefix=/home/ccx/versions/$pthbs_package + ./configure -C \ + --prefix="$prefix" \ + --build="$(${CC:-gcc} -dumpmachine)" \ + --bindir="$prefix/command" \ + --sbindir="$prefix/command" \ + --infodir="$prefix/info" \ + --localedir="$prefix/locale" \ + --mandir="$prefix/man" \ + --libdir="$prefix/library" \ + --docdir="$prefix/doc/patchelf:bootstrap" \ + --localstatedir='/home/ccx/.local/var' \ + "$@" + # --libexecdir=DIR program executables [EPREFIX/libexec] + # --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + # --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + # --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + # --includedir=DIR C header files [PREFIX/include] + # --oldincludedir=DIR C header files for non-gcc [/usr/include] + # --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + # --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + + # ac_cv_func_malloc_0_nonnull=yes \ + # ac_cv_func_realloc_0_nonnull=yes + make -j${JOBS:-1} -l$((1+${JOBS:-1})) + make DESTDIR="$pthbs_destdir" install +} + + +export LDFLAGS="-static" +cd patchelf +./bootstrap.sh +autotools . --enable-static --disable-shared --disable-nls + + +cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./command/patchelf"]=1 + x["./man/man1/patchelf.1"]=1 +} + +function r1(s) { + sub("^[.]/[^/]*", ".", s) + return s +} +function s1(repl, s) { + sub("^[.]/[^/]*", "./"repl, s) + return s +} +function link(src) { + x[$0]=0 + printf "%s\t%s\n", $0, src + printf "genlinks >>%s\t%s<<\n", $0, src >>"/dev/stderr" +} +$1!="."{exit 1} + + +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } + +$2 == "library.so" { link($0); next } +$2 == "library" { link($0); next } +$2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next } +$2 == "lib" && $NF ~ /\.so(|\..*)$/ { link(s1("library.so", $0)); next } + +$2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } + +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { link($0); next } +$2 == "icons" { link($0); next } +$2 == "terminfo" { link($0); next } + +$2 == "include" { link($0); next } + +{ printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" } + +END { + for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" } + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + exit 3 + } + } +}' >.install-links.new +mv .install-links.new .install-links diff --git a/packages/popt b/packages/popt @@ -1,10 +1,9 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+busybox-diffutils.a1112631b6daa058b9bb166ac4b2146973ca7c18b909c5400eb991d168556bd0 -#+m4.0580f144290b5b2b8dfd82bae7b209444498f0b2c49b1d3a85f7a31e3c00a146 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+busybox-diffutils.750d25b58b64e04edf431dcc96c3cbfe8e2126a20cf648034d0e68ddd9311c77 +#+m4.7a37a1630b818c108d8ea8919e9d29a46fc8c7bcbb2b09c3b8b1a53be9a39ee0 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. autotools() { diff --git a/packages/pthbs-banginstall b/packages/pthbs-banginstall @@ -1,7 +1,6 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+zsh.ab347c2bf33345f5c8ccc911490305d65cb5d3fb86d29ab374e218a93fc6e268 +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+zsh.d890666b11de1830b4b3097362ae463e8d2a8fa30a67401201d4ff6b6ef93fa0 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package" diff --git a/packages/rsync b/packages/rsync @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+busybox-diffutils.a1112631b6daa058b9bb166ac4b2146973ca7c18b909c5400eb991d168556bd0 -#+m4.0580f144290b5b2b8dfd82bae7b209444498f0b2c49b1d3a85f7a31e3c00a146 -#+popt.9e2251ed8473b6d01a62766677fd2b67988385bdbbdb62fcdbc9960060f797c8 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+busybox-diffutils.750d25b58b64e04edf431dcc96c3cbfe8e2126a20cf648034d0e68ddd9311c77 +#+m4.7a37a1630b818c108d8ea8919e9d29a46fc8c7bcbb2b09c3b8b1a53be9a39ee0 +#+popt.4b3b6f206cbdf53885c5c26ab7e080ad661e6e3aa4ae7a3615a38e6b4e63669a #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. autotools() { diff --git a/packages/s6 b/packages/s6 @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+patch.e88eea6400a7d36c81defb72be8639b32a81791f6dc45424cf5cc04aaf636006 -#+skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6 -#+execline.212907020e985bcf7a850b25114d7d264ae725bea35d0d631d58e1e5801eeefc +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+patch.9e2d522b78ab86e75b7b1ee8f48a106a47dc4c858b5adf8859d2ec53eb7a76ee +#+skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96 +#+execline.be364e9b578b0d78e556691379755a762c972bf776d3f2d3fb4ef681a8cdd747 #@git:3e7acf5c35999492e7feeaa59616510bf9cc51ac:s6 #@sha256:627d1273036dc35239ba9dd1da45132e3bfce1ab8171dd27dc7952cdf09b698e:s6_clone3_newpid.patch @@ -20,7 +19,7 @@ patch -up 1 -i ../s6_clone3_newpid.patch --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-dns b/packages/s6-dns @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96 #@git:4d081d9c2657ef40e770145f21328d37035dd774:s6-dns : ${JOBS:=1} @@ -17,7 +16,7 @@ cd 's6-dns' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-linux-init b/packages/s6-linux-init @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6 -#+execline.212907020e985bcf7a850b25114d7d264ae725bea35d0d631d58e1e5801eeefc -#+s6.5842cf13ac273f44789effa073be8856e140c0c1c8e881e56b0953d8c3f9bfde +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96 +#+execline.be364e9b578b0d78e556691379755a762c972bf776d3f2d3fb4ef681a8cdd747 +#+s6.f00aa300746aa32adb2e4513dd2b9f32e7a6841f82b925a2690431e4b6d6fbbc #@git:42a91a98b780759257862642c764c2102237fea6:s6-linux-init : ${JOBS:=1} @@ -19,7 +18,7 @@ cd 's6-linux-init' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-linux-utils b/packages/s6-linux-utils @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96 #@git:964442539c3b5b7f6f13a17cbf391843ec93ce6f:s6-linux-utils : ${JOBS:=1} @@ -17,7 +16,7 @@ cd 's6-linux-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-networking b/packages/s6-networking @@ -1,12 +1,11 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6 -#+execline.212907020e985bcf7a850b25114d7d264ae725bea35d0d631d58e1e5801eeefc -#+s6.5842cf13ac273f44789effa073be8856e140c0c1c8e881e56b0953d8c3f9bfde -#+s6-dns.218c387833bb5f3db8cf6d46fdf9b5daf76fdcd344ba23dd433f0790815ae93d +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96 +#+execline.be364e9b578b0d78e556691379755a762c972bf776d3f2d3fb4ef681a8cdd747 +#+s6.f00aa300746aa32adb2e4513dd2b9f32e7a6841f82b925a2690431e4b6d6fbbc +#+s6-dns.4f9cf1c4bb5d40451448561e6a3155d1dfbe2c4f9c2dfb82e6bdfb9dbc25c438 #@git:68db8af7c26461d4477f482ecbc279729fa911e4:s6-networking : ${JOBS:=1} @@ -20,7 +19,7 @@ cd 's6-networking' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-portable-utils b/packages/s6-portable-utils @@ -1,9 +1,8 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96 #@git:536eea15284be9a257b6f97f971e0d8d4a7e437b:s6-portable-utils : ${JOBS:=1} @@ -17,7 +16,7 @@ cd 's6-portable-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/s6-rc b/packages/s6-rc @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6 -#+execline.212907020e985bcf7a850b25114d7d264ae725bea35d0d631d58e1e5801eeefc -#+s6.5842cf13ac273f44789effa073be8856e140c0c1c8e881e56b0953d8c3f9bfde +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96 +#+execline.be364e9b578b0d78e556691379755a762c972bf776d3f2d3fb4ef681a8cdd747 +#+s6.f00aa300746aa32adb2e4513dd2b9f32e7a6841f82b925a2690431e4b6d6fbbc #@git:b79282b3746ff67c3c0df8aa32814b3688b91d4f:s6-rc : ${JOBS:=1} @@ -19,7 +18,7 @@ cd 's6-rc' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.80206639a7ca0a8adbc939567f54b9aa51323661fa1c5efffcb7a7db6387ebc6/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.f672ceb59347dd1485218e8b4d28d13918206764d34c71ed584c13430280ba96/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/packages/skalibs b/packages/skalibs @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e #@git:c555cd2ba1682f90fb5344d2865713fcd0f3c3e1:skalibs : ${JOBS:=1} diff --git a/packages/snaprep b/packages/snaprep @@ -1,8 +1,7 @@ #!/usr/bin/env pthbs-build -#+* -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+zsh.ab347c2bf33345f5c8ccc911490305d65cb5d3fb86d29ab374e218a93fc6e268 -#+pthbs-banginstall.4acc05826812a65baca1dea7ce467bdbe33570c70e35a3ead46c43d24ae089ed +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+zsh.d890666b11de1830b4b3097362ae463e8d2a8fa30a67401201d4ff6b6ef93fa0 +#+pthbs-banginstall.ca7bf7214ad2a44a99c1ac63112d83ae6eee13aad6bf2a56a92990eba5943a4a #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep : ${JOBS:=1} diff --git a/packages/userspace.environment b/packages/userspace.environment @@ -1,29 +1,29 @@ -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+diffutils.8b8d8e77ea4a38208c2ec62e4f48df8ba365476d0363d9139b4e87a371e9220c -#+patch.e88eea6400a7d36c81defb72be8639b32a81791f6dc45424cf5cc04aaf636006 -#+flex.b62d752270e090ca95e6899f099ca4743cb1486a1ec36a9bcdf1ae4bf7ffa50d -#+bison.3d9db209c80cf73d47088ce649e2d3267818413cf749e0bfccdc84003d492677 -#+rsync.456bd92f8127bdd35d14b434ccc3ef01e2e3c5bf51e09e81cf31793bffc445f0 -#+execline.212907020e985bcf7a850b25114d7d264ae725bea35d0d631d58e1e5801eeefc -#+s6.5842cf13ac273f44789effa073be8856e140c0c1c8e881e56b0953d8c3f9bfde -#+s6-rc.d9477400ee9be61bbd377c180fc7cdc6a23ebad752775622078a8000f3485214 -#+s6-portable-utils.74e1284710969971e975e52a4a18c628df2c12db025139d5707e1a0af27dab64 -#+s6-linux-utils.715675b37c929447b8a7434a9fc330e1692e5bbd459e406743eec778a4305fed -#+s6-linux-init.ae12bfa48868d8e6ebf8066df04a4d51751a879322992a6883586c4580c6a0d6 -#+mdevd.c61798b14d712f303b7d13e56d4be3230187c72bcc12d0a68345bfe5f83c1b67 -#+s6-dns.218c387833bb5f3db8cf6d46fdf9b5daf76fdcd344ba23dd433f0790815ae93d -#+s6-networking.20244fbbe73d9b70b6e1030ff6d198d6ff04162284c523722859fed11c2eb558 -#+zsh.ab347c2bf33345f5c8ccc911490305d65cb5d3fb86d29ab374e218a93fc6e268 -#+pthbs-banginstall.4acc05826812a65baca1dea7ce467bdbe33570c70e35a3ead46c43d24ae089ed -#+aat.324ec1b33055301b8884508fb052dc047e89e6ca47f2e17949cdce8918f2c4fc -#+confz.31c18a68f15e9e49fa8c1b7a850c5eb7cfe456f2bb6ff859267628dc3fac6b4c -#+containers.da63edefe232296a47c6e639b30fb9ab127f6d9bd27132e0306ba18e036d91c5 -#+fileset.8db1ec15a8c764b4999a9ec882cb7ef4ad7693d8d51dfa8070a21b6bd9e0a149 -#+logincaps.d1cbcbb8c5bca5c69e85fbe821229189ded7b9eb29d83e6c4fc6b9c6196826bc -#+snaprep.1ed06cea3dda8aca11d7d3ec83742e10eabc2836633213b39806eafaa6ef078a -#+core-system-conf.47c9e8c97fd233c043f9b63abc8e0a915be08cb4ac26dd8d64e917f4e040cfb3 -#+core-system-rc.3ae386addf824444a7c470e615ec72fd61effa62221c6897eb4cbdb1c26700b5 -#+core-system-scripts.3ee976e69ffcf28b2be06f881b98406c9c01ff56fde5ffad512e2e2f9e6f544b -#+core-system-init.decfe63f6801447f980ac30b7fec5b007d415ae7802a001bb11da3b84fca3fe7- \ No newline at end of file +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+diffutils.cf048a6e9e9bf7bde7d4eae25394477723a18e7a4190af1d343e8d42181106dc +#+patch.9e2d522b78ab86e75b7b1ee8f48a106a47dc4c858b5adf8859d2ec53eb7a76ee +#+flex.27309ca99c4dac3c0f1e57fe5ee78f06cd9ac4605eaccbb54268d090b3041f18 +#+bison.46d5b2b6aa022621cfff54ba200b1f90c41e0894902bab58cc7d1d5cf743ce1e +#+rsync.b6b8b584d90e5e4e9da31f117b7e4950fd748757ca75bf23b343d9d0b7538dd6 +#+execline.be364e9b578b0d78e556691379755a762c972bf776d3f2d3fb4ef681a8cdd747 +#+s6.f00aa300746aa32adb2e4513dd2b9f32e7a6841f82b925a2690431e4b6d6fbbc +#+s6-rc.14a018754e6f57c036811bb9a0ce99f1f260da82b22cefa0d1dc325348325624 +#+s6-portable-utils.b4ab366a98f790440e9c1d875b1bef5582ce6676ca75a746cebf14e169db07c3 +#+s6-linux-utils.956a96815511103ab60607fab26138bc91423b3aab212c6e77e8df376e3fae64 +#+s6-linux-init.555076f18a039ea18437b5640772f46bd739264d1de0397d2e6eb26e5faaf064 +#+mdevd.5644829c799d316edef8961a9fb6c3d32bc87ba341979a6aeafd2317ce594bc5 +#+s6-dns.4f9cf1c4bb5d40451448561e6a3155d1dfbe2c4f9c2dfb82e6bdfb9dbc25c438 +#+s6-networking.f9ba82a20aa66c7a091b541d7bafb8876ef20ff574dd489522cdd1e2f860e354 +#+zsh.d890666b11de1830b4b3097362ae463e8d2a8fa30a67401201d4ff6b6ef93fa0 +#+pthbs-banginstall.ca7bf7214ad2a44a99c1ac63112d83ae6eee13aad6bf2a56a92990eba5943a4a +#+aat.6ba8d8cc4000d624d9391d95fa290879d0a4dc07b54b93ea19c1f929e8ec765b +#+confz.2425ec7a2e6128e1ebd3a8dc2490f531ad2e9e343347babcaeb9b41f94ddeb45 +#+containers.998b198f64395aa07014d8d592289ebd73b791fc42d72c890273b44eb61dcd02 +#+fileset.86290e6a573bac8bf36372e7b2bd0ab15b9dba580184698be536c5f81fd27e14 +#+logincaps.a15410037fcb6467bf45d546a985859bcbb18db98f4c2ca13685b383292315bd +#+snaprep.425443078f1b7dacd022d954cf3e8989f099c2dfebca78c9b503df14f8889826 +#+core-system-conf.05a95c7e257f913e6520296778312bef0d29f5db7393548f083ca1aa7afe7145 +#+core-system-rc.cf8fa54b5baae95d4c89199e6aa5ef50b37e574d80023fd5b566a47181ffa231 +#+core-system-scripts.8dd9eed07b1b2a8c63623ce85b764a05f096a40062fe17aa4295ccaa6353dcb4 +#+core-system-init.3beb78dc26952726e68ba0579ff6820dd58982c7d0e66d246cf26809f58e3cfa+ \ No newline at end of file diff --git a/packages/zsh b/packages/zsh @@ -1,11 +1,10 @@ #!/usr/bin/env pthbs-build -#+* -#+musl-cross-make.6b51ffb677cb4f036686cda813695293f70e827cbabfc81d623c42961f93187c -#+gnu-make.3f7fc26fd89f68ca6f816688c80515b019776e41ba016b5156683b68617d80de -#+busybox.2148c04100bdf3af4de264efec32f63b4d2b836189cae739a75035e9ec4ceff1 -#+busybox-diffutils.a1112631b6daa058b9bb166ac4b2146973ca7c18b909c5400eb991d168556bd0 -#+m4.0580f144290b5b2b8dfd82bae7b209444498f0b2c49b1d3a85f7a31e3c00a146 -#+netbsd-curses.460245bc603ce1f365eac59de33eca096b4f18ca7578ed1fd84e53f8bfc7223f +#+musl-cross-make.185e9c3572158476b53b864fff75428b9e0827c24fd3c2c78fe11ec173939a61 +#+gnu-make.f945b4f7efc0f2ffa349ede9303cb8efd21c29dc194e3642a522279be7ad753e +#+busybox.f4009c6f66cc3a06f988db6da1557c20fab0cc9405a5663dfc23668e506b027e +#+busybox-diffutils.750d25b58b64e04edf431dcc96c3cbfe8e2126a20cf648034d0e68ddd9311c77 +#+m4.7a37a1630b818c108d8ea8919e9d29a46fc8c7bcbb2b09c3b8b1a53be9a39ee0 +#+netbsd-curses.0db2d54941885b9efd1e8cdbe35c48517fe03a83ea38bf44ad85a6a84b283fc6 #@git:73d317384c9225e46d66444f93b46f0fbe7084ef:zsh #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. diff --git a/sources/patchelf b/sources/patchelf @@ -0,0 +1 @@ +Subproject commit 7c2f768bf9601268a4e71c2ebe91e2011918a70f diff --git a/templates/autotools b/templates/autotools @@ -1,7 +1,6 @@ {% extends "genlinks" %} {%- block script %} {%- block default_deps %} -#+* #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox")}} diff --git a/templates/pkg/busybox b/templates/pkg/busybox @@ -1,6 +1,5 @@ {% extends "base" %} {%- block body %} -#+* #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make:bootstrap")}} #+{{pkg_install_name("busybox:bootstrap")}} diff --git a/templates/pkg/busybox-diffutils b/templates/pkg/busybox-diffutils @@ -1,6 +1,5 @@ {% extends "base" %} {%- block body %} -#+* #+{{pkg_install_name("busybox")}} mkdir -p "$pthbs_destdir{{versions}}/$pthbs_package" diff --git a/templates/pkg/busybox-login b/templates/pkg/busybox-login @@ -1,6 +1,5 @@ {% extends "base" %} {%- block body %} -#+* #+{{pkg_install_name("busybox")}} mkdir -p "$pthbs_destdir{{versions}}/$pthbs_package" diff --git a/templates/pkg/core-system-conf b/templates/pkg/core-system-conf @@ -1,6 +1,5 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("diffutils")}} #+{{pkg_install_name("gnu-make")}} diff --git a/templates/pkg/core-system-init b/templates/pkg/core-system-init @@ -1,6 +1,5 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("s6")}} #+{{pkg_install_name("s6-rc")}} diff --git a/templates/pkg/core-system-rc b/templates/pkg/core-system-rc @@ -1,6 +1,5 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("busybox-diffutils")}} #+{{pkg_install_name("s6-rc")}} diff --git a/templates/pkg/elf.h b/templates/pkg/elf.h @@ -1,6 +1,5 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("busybox")}} #@sha256:{{files["elf.h"]}}:elf.h diff --git a/templates/pkg/gnu-make b/templates/pkg/gnu-make @@ -1,6 +1,5 @@ {% extends "autotools" %} {%- block default_deps %} -#+* #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make:bootstrap")}} #+{{pkg_install_name("busybox:bootstrap")}} diff --git a/templates/pkg/gnu-make:bootstrap b/templates/pkg/gnu-make:bootstrap @@ -1,6 +1,8 @@ {% extends "autotools" %} {%- block default_deps %} -#+* +#@pragma:nosandbox +#@pragma:nopath +#+{{pkg_install_name("musl-cross-make:bootstrap")}} #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. {%- endblock %} {% block at_script %} diff --git a/templates/pkg/libelf-compat b/templates/pkg/libelf-compat @@ -1,6 +1,5 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox")}} diff --git a/templates/pkg/libelf.h b/templates/pkg/libelf.h @@ -1,6 +1,5 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("busybox")}} #@sha256:{{files["dwarf.h"]}}:include/dwarf.h #@sha256:{{files["gelf.h"]}}:include/gelf.h diff --git a/templates/pkg/linux b/templates/pkg/linux @@ -1,6 +1,5 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("musl-cross-make")}} diff --git a/templates/pkg/m4 b/templates/pkg/m4 @@ -1,6 +1,5 @@ {% extends "autotools" %} {%- block default_deps %} -#+* #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox")}} diff --git a/templates/pkg/musl-cross-make b/templates/pkg/musl-cross-make @@ -1,13 +1,12 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("musl-cross-make:bootstrap")}} #+{{pkg_install_name("gnu-make:bootstrap")}} #+{{pkg_install_name("busybox:bootstrap")}} #@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 -#@sha256:c95da32f440378d7751dd95533186f7fc05ceb4fb65eb5b85234e6299eb9838e:musl-cross-make/sources/gcc-9.4.0.tar.xz +#@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz #@sha256:5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2:musl-cross-make/sources/gmp-6.1.2.tar.bz2 #@sha256:bdf76c15229b241e578046b8486106f09534d754ea4cbf105e0660e551fb1669:musl-cross-make/sources/linux-6.5.4.tar.xz #@sha256:6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e:musl-cross-make/sources/mpc-1.1.0.tar.gz @@ -23,7 +22,12 @@ export HOSTCC="$pthbs_build_environment/command/{{triplet}}-gcc" printf '%s\n' >musl-cross-make/config.mak \ "OUTPUT=${pthbs_destdir%/}{{versions}}/$pthbs_package" \ "TARGET={{triplet}}" \ - 'LINUX_VER=6.5.4' + 'GCC_VER=11.2.0' \ + 'LINUX_VER=6.5.4' \ + 'st=-static --static' \ + 'fl=-g0 -O2' \ + 'COMMON_CONFIG += CFLAGS="${fl} ${st}" CXXFLAGS="${fl} ${st}" FFLAGS="${fl}" LDFLAGS="-s ${st}"' \ + 'COMMON_CONFIG += CC="{{triplet}}-gcc ${st}" CXX="{{triplet}}-g++ ${st}"' printf '%s %s\n' >musl-cross-make/hashes/linux-6.5.4.tar.xz.sha1 \ 24ffca128d47b6c8e5c15efaa2b1c9ebe546c13c linux-6.5.4.tar.xz diff --git a/templates/pkg/musl-cross-make:bootstrap b/templates/pkg/musl-cross-make:bootstrap @@ -1,10 +1,12 @@ {% extends "genlinks" %} {%- block script %} -#+* +#@pragma:nosandbox +#@pragma:nopath +#+{{pkg_install_name("musl-cross-make:bootstrap-0")}} #@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 -#@sha256:c95da32f440378d7751dd95533186f7fc05ceb4fb65eb5b85234e6299eb9838e:musl-cross-make/sources/gcc-9.4.0.tar.xz +#@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz #@sha256:5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2:musl-cross-make/sources/gmp-6.1.2.tar.bz2 #@sha256:995bc76ccf0c40d752b5ea67c022232a17eef6c9ec80ea74ea742e3c19992813:musl-cross-make/sources/linux-headers-4.19.88-1.tar.xz #@sha256:6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e:musl-cross-make/sources/mpc-1.1.0.tar.gz @@ -12,10 +14,24 @@ #@sha256:7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4:musl-cross-make/sources/musl-1.2.3.tar.gz : ${JOBS:=1} -printf '%s\n' >musl-cross-make/config.mak "OUTPUT=${pthbs_destdir%/}{{versions}}/$pthbs_package" "TARGET={{triplet}}" +bootstrap={{versions}}/musl-cross-make.{{pkg_sha256("musl-cross-make:bootstrap-0")}} +printf '%s\n' >musl-cross-make/config.mak \ + "OUTPUT=${pthbs_destdir%/}{{versions}}/$pthbs_package" \ + 'GCC_VER=11.2.0' \ + "TARGET={{triplet}}" \ + 'st=-static --static' \ + 'fl=-g0 -O2' \ + "bbin=$bootstrap/bin" \ + 'COMMON_CONFIG += CFLAGS="${fl}" CXXFLAGS="${fl}" FFLAGS="${fl}" LDFLAGS="-s ${st}"' \ + 'COMMON_CONFIG += CC="${bbin}/{{triplet}}-gcc ${st}" CXX="${bbin}/{{triplet}}-g++ ${st}"' touch musl-cross-make/sources/* -{{make}} -C musl-cross-make || exit $? -make -C musl-cross-make install || exit $? +export PATH="$bootstrap/bin:$PATH" +{{make}} -C musl-cross-make +make -C musl-cross-make install +"$bootstrap/bin/{{triplet}}-gcc" --version +{{make}} -C musl-cross-make +make -C musl-cross-make install +"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' --version {% endblock %} {% block genlinks_begin %} x["./bin/{{triplet}}-g++"]=1 diff --git a/templates/pkg/musl-cross-make:bootstrap-0 b/templates/pkg/musl-cross-make:bootstrap-0 @@ -0,0 +1,32 @@ +{% extends "genlinks" %} +{%- block script %} +#@pragma:nosandbox +#@pragma:nopath +#@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 +#@sha256:c95da32f440378d7751dd95533186f7fc05ceb4fb65eb5b85234e6299eb9838e:musl-cross-make/sources/gcc-9.4.0.tar.xz +#@sha256:5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2:musl-cross-make/sources/gmp-6.1.2.tar.bz2 +#@sha256:995bc76ccf0c40d752b5ea67c022232a17eef6c9ec80ea74ea742e3c19992813:musl-cross-make/sources/linux-headers-4.19.88-1.tar.xz +#@sha256:6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e:musl-cross-make/sources/mpc-1.1.0.tar.gz +#@sha256:c05e3f02d09e0e9019384cdd58e0f19c64e6db1fd6f5ecf77b4b1c61ca253acc:musl-cross-make/sources/mpfr-4.0.2.tar.bz2 +#@sha256:7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4:musl-cross-make/sources/musl-1.2.3.tar.gz + +: ${JOBS:=1} +printf '%s\n' >musl-cross-make/config.mak \ + "OUTPUT=${pthbs_destdir%/}{{versions}}/$pthbs_package" \ + "TARGET={{triplet}}" \ + 'fl=-g0 -O2' \ + 'COMMON_CONFIG += CFLAGS="${fl}" CXXFLAGS="${fl}" FFLAGS="${fl}" LDFLAGS="-s"' +touch musl-cross-make/sources/* +{{make}} -C musl-cross-make +make -C musl-cross-make install +"${pthbs_destdir%/}"'{{versions}}'"/$pthbs_package/bin/"'{{triplet}}-gcc' --version +{% endblock %} +{% block genlinks_begin %} + x["./bin/{{triplet}}-g++"]=1 + x["./bin/{{triplet}}-gcc"]=1 +{% endblock %} +{% block rules %} +$2 == "bin" && $3 ~ /^{{triplet}}-/ { target=$3; sub("{{triplet}}-", "", target); link("./command/" target) } +{% endblock -%} diff --git a/templates/pkg/netbsd-curses b/templates/pkg/netbsd-curses @@ -1,6 +1,5 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("musl-cross-make")}} diff --git a/templates/pkg/patchelf:bootstrap b/templates/pkg/patchelf:bootstrap @@ -0,0 +1,16 @@ +{% extends "autotools" %} +{%- block default_deps %} +#@pragma:nosandbox +#@pragma:nopath +#@git:{{submodule.current["patchelf"]}}:patchelf +{%- endblock %} +{% block at_script %} +export LDFLAGS="-static" +cd patchelf +./bootstrap.sh +autotools . --enable-static --disable-shared --disable-nls +{% endblock %} +{% block genlinks_begin %} + x["./command/patchelf"]=1 + x["./man/man1/patchelf.1"]=1 +{% endblock %} diff --git a/templates/pkg/pthbs-banginstall b/templates/pkg/pthbs-banginstall @@ -1,6 +1,5 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("zsh")}} #@sha256:{{files["pthbs-banginstall"]}}:pthbs-banginstall diff --git a/templates/pkg/s6 b/templates/pkg/s6 @@ -1,6 +1,5 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox")}} diff --git a/templates/pkg/skalibs b/templates/pkg/skalibs @@ -1,6 +1,5 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox")}} diff --git a/templates/scriptsetup b/templates/scriptsetup @@ -1,6 +1,5 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("zsh")}} #+{{pkg_install_name("pthbs-banginstall")}} diff --git a/templates/skaware b/templates/skaware @@ -1,6 +1,5 @@ {% extends "genlinks" %} {%- block script %} -#+* #+{{pkg_install_name("musl-cross-make")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox")}}