commit d73985b410bf152dd6534d80cc2113a70326b20f parent b41900652cbe20499f0a0957128f145ec0218605 Author: Jan Pobrislo <ccx@te2000.cz> Date: Thu, 27 Nov 2025 17:45:13 +0000 nah Diffstat:
16 files changed, 74 insertions(+), 602 deletions(-)
diff --git a/templates/pkg/autoconf b/templates/pkg/autoconf @@ -1,6 +0,0 @@ -{%- set pkg_version="2.72" -%} -{%- set pkg_source="tar.gz" -%} -{% extends "autotools_static" %} -{% block genlinks_begin %} - x["./command/autotools"]=1 -{% endblock %} diff --git a/templates/pkg/musl-fts b/templates/pkg/musl-fts @@ -1,10 +1,34 @@ {%- set pkg_version="1.2.7" -%} -{% extends "autotools_static" %} +{% extends "generic" %} +{%- do import_functions.add("build_env_static") %} {% block package_deps -%} -#+{{pkg_install_name("autoconf")}} #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. {% endblock %} +{% block build -%} +build_env_static + +cat >config.h <<EOF +#define HAVE_DECL_MAX 1 +#define HAVE_DECL_UINTMAX_MAX 0 +#define HAVE_DIRFD 1 +/* #undef HAVE_DIR_DD_FD */ +/* #undef HAVE_DIR_D_FD */ +EOF + +gcc -g -O2 -c fts.c -o fts.o +ar cr libfts.a fts.o +ranlib libfts.a + +{% endblock build %} +{%- block install -%} +mkdir -p "$dest/include" "$dest/library" "$dest/man/man3" +mv libfts.a "$dest/library/" +mv fts.h "$dest/include/" +mv fts.3 "$dest/man/man3" + +{% endblock install %} {% block genlinks_begin %} x["./library/libfts.a"]=1 x["./include/fts.h"]=1 + x["./man/man3/fts.3"]=1 {% endblock %} diff --git a/variants/ccx-x86_64/autoconf b/variants/ccx-x86_64/autoconf @@ -1,156 +0,0 @@ -#!/usr/bin/env pthbs-build -#+busybox.379b7b2d8316b3678245563c8e592d71e6c380bc22a735c30c1c0e6f8f60caf3 -#+busybox-bzip2.4788e6edf9eeb73c7c665238a23aeed4703f8e25ab101509aee01440865ccdb1 -#+busybox-gzip.4fc908cacf4533192819578a079617c0cbe879b8ebd3e2140d896b067d3a574c -#+busybox-lzop.e6e42a1a8451a4b845355899c9cd49efea2e395a0ef0c6ae7099103213a7bf4f -#+busybox-unzip.93b5e83122059c87a2ddf489cdc7381bb80288630c508c218c2cfbadff524784 -#+busybox-xz.34137cc6ac8d23bf1bf5979b7fd047d4f50b34be07cd6ab636368952a199368d -#+busybox-cpio.de88944ccff44a1f3abe06c42f83492a7e080de89fba27aadf5fe1a40e830cae -#+busybox-dpkg.17e445a8089bc61db749a44c665597ecac3f21c4088daaa024f574412eb4d704 -#+busybox-rpm.669ed61ee218bc72206e069c896f392a025c88772ceb92ecb37b01ab0765baf8 -#+busybox-tar.15f67670238651149114006ae79359f24e1fa3c62be2e229a48f1334747ba413 -#+busybox-ed.78c51627a372c5b2ad3d046d0e77f341ae7c79917c4a16ca8abba284e7472cb7 -#+busybox-sed.8782396ae5c7b6e7d6bc8a93a7cff9912e6427e3d919dd5e5b00d1813ae88caf -#+busybox-vi.e661d8eb052fbeebdd3be36ff6bd27651a7e59c857dad05c8633589790caa38c -#+busybox-xxd.d2dc96e92cfdafae2c91d6fe897f42fdccae2dbc8b2d79f31eccc49d4e3a2d68 -#+busybox-process-extra.993cfd65eae2892ecb3fdfbece44b11e7ff6caa78f73e9f22bc2c97e7cd8a267 -#+busybox-procps.51ea8cb23d5eb1498f9167cc80b97c1a873758a8c1a7293079f50a2365466a71 -#+busybox-psmisc.ff1f9cf00f4c448946acb65d52b3b598e0495822af70b1504720cadf559e2090 -#+busybox-ash.7d10753f118afb2568e9f950c9cffa559b053a9b3ea516d6b46c3c73ebb6f8d8 -#+busybox-bc.c595636f103108c81f0ae55d2bf10d7cbc06ef1455a8353fcf04e42e765780a8 -#+busybox-coreutils.6b8071260ab4297f0e71013e42ac2a1a83fa99d92378d181ba49003fd349134a -#+busybox-coreutils-extra.fc1b0766c881ee461d36c386833909553fcb0c31a547bfb563a7c6a50206bdcd -#+busybox-daemontools.97aad28bbe5f38cff29db16c0f0d21e2fdc931825f683137df9bb57ef3a9b628 -#+busybox-grep.261a809c35cb58acc896143c2a81406a097f5870e02ce9906953181ef6b4c72b -#+busybox-misc.5c2c025f1b74b9243a0128cd3f10dd1577b5ae123f53244d8e6895d4bdbd161d -#+busybox-sh.25a9438d8449ade9c98af61b14af5711990dd002462a046b13b61969634c4d94 -#+busybox-util-linux-unpriv.4ea1c8c8746d7e80d36dea8924c576bc9666905b461dd543ceb5595394406c97 -#+busybox-findutils.052256c5bf9c3e7fef2e69d22f3d402d004f22113ce10b4d2c54ff417bf42622 -#+busybox-awk.f44da758ab8e737f05fb82ca4342acdf29ec44a9c2a9670cded75b04e8208058 -#+busybox-diffutils.30a803a8b8dd1d4f18bc5e5952cc4b15aea625caf2af34dd424af233786ba0d0 -#+musl-cross-make.74cd95cd7bd1db21d28d9a8579d924d588b9cbfd0f9744c0fb890188d71646aa -#+gnu-make.31d90a55d6506852f9784f6f6febf0d843f8051f63bc18795fd5275baa369f50 -#+m4.6bc8e8d5403cf05226ef517faa0f48f5e843f5eafc5f859f69e8479caa10f4a0 -#@untar:-z:sha256:afb181a76e1ee72832f6581c0eddf8df032b83e2e0239ef79ebedc4467d92d6e:. - - -# - build script start - - -autotools_config() { - prefix=/home/ccx/versions/$pthbs_package - ./configure -C \ - --prefix="$prefix" \ - --build="$(${CC:-gcc} -dumpmachine)" \ - --bindir="$prefix/command" \ - --sbindir="$prefix/command" \ - --infodir="$prefix/info" \ - --localedir="$prefix/locale" \ - --mandir="$prefix/man" \ - --libdir="$prefix/library" \ - --docdir="$prefix/doc/autoconf" \ - --datadir="$prefix/data" \ - --datarootdir="$prefix/data" \ - --localstatedir='/var/pthbs' \ - "$@" - -} - -autotools_config_static() { - build_env_static - autotools_config "$@" --enable-static --disable-shared -} - -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} - -check_static() { - local exe || true - exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - local interp_info || true - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} - -prefix=/home/ccx/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd 'autoconf-2.72' - - -autotools_config_static - - -make -j${JOBS:-1} -l$((1+${JOBS:-1})) - -make DESTDIR="$pthbs_destdir" install - - - - - -cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" -find -type d -o -print | awk -F/ ' -BEGIN { - x["./command/autotools"]=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 == "config" { link($0); next } -$2 == "keys" { link($0); next } -$2 == "zsh" { link($0); next } -$2 == "env" { link($0); next } -$2 == "command" { link($0); next } -$2 == "bin" { link(s1("command", $0)); next } - -$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/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -88,9 +88,9 @@ #+squashfs-tools.e7bea5b78e0e2b577342fa09ed7d9691f38e8aea480a107a27f59ffe1b5ec12f #+mandoc.873388061ad4acc4a497ac4e216fa15837d2be004538344b7e99a4c0f288d773 #+tinyssh.b691a3785f950c64522766f5f43f05f24d72e6cad9320d8706cd9722ef763051 -#+system-config.90ebbbc90f1b403d20350825e76ffbe97826c98d5998551bd2ced2e6e99c05ff -#+system-config-rc.330401d559bea2ce98aa1d3eb0e3e620706994b189bd505191d3500168e0fbcf +#+system-config.85ab5c75f85668a096efd4323d05e9db19da7ec26199795de33d45d20998e6bd +#+system-config-rc.f2f9d488d43987c5ca74f807fa848a2e521867c4db83198abc96256c5f9be96f #+system-config-scripts.a983668711783d5c36b32ca9859fe7c99b0cf3588bbeeb315b8ba5ca6b692831 -#+system-config-init.5163686df3afb2b78d934a206dd411deab99e65808d66195bad1a3ce1af9d409 +#+system-config-init.cc5d7516a0c57cd78cf78b5389d3ce59c294bcb241518e2b66f253b91041d9ec #+system-config-zsh.9a3b5f12d36aa21000726f1da1e351fd62945101f5bb54392a52203d82c5aef9 #+busybox.2ef5301e1fcabd1b3cd0b88f9dda6a41d4e7b432be5e555dffa5aae865334e41 \ No newline at end of file diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup @@ -33,7 +33,7 @@ #+m4.6bc8e8d5403cf05226ef517faa0f48f5e843f5eafc5f859f69e8479caa10f4a0 #+flex.1108ea92b5d0a289d5884ebb2df2398eed87d0f2898feedc18af4d85dcb5255d #+bison.8878bfa3e199ad13de1c2932195a8654f3793729b04c6dc0f70bb57cb3697b40 -#+musl-fts.55fdcf235d18f713312ff6f668e058efd4997cdec7710b370ae5fa47f5e7ad35 +#+musl-fts.cbfa53e0ef32f9ec471ec7ee72c240cd6a90f72740f602cd4446ab0b3743df04 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts @@ -1,158 +1,41 @@ #!/usr/bin/env pthbs-build -#+busybox.379b7b2d8316b3678245563c8e592d71e6c380bc22a735c30c1c0e6f8f60caf3 -#+busybox-bzip2.4788e6edf9eeb73c7c665238a23aeed4703f8e25ab101509aee01440865ccdb1 -#+busybox-gzip.4fc908cacf4533192819578a079617c0cbe879b8ebd3e2140d896b067d3a574c -#+busybox-lzop.e6e42a1a8451a4b845355899c9cd49efea2e395a0ef0c6ae7099103213a7bf4f -#+busybox-unzip.93b5e83122059c87a2ddf489cdc7381bb80288630c508c218c2cfbadff524784 -#+busybox-xz.34137cc6ac8d23bf1bf5979b7fd047d4f50b34be07cd6ab636368952a199368d -#+busybox-cpio.de88944ccff44a1f3abe06c42f83492a7e080de89fba27aadf5fe1a40e830cae -#+busybox-dpkg.17e445a8089bc61db749a44c665597ecac3f21c4088daaa024f574412eb4d704 -#+busybox-rpm.669ed61ee218bc72206e069c896f392a025c88772ceb92ecb37b01ab0765baf8 -#+busybox-tar.15f67670238651149114006ae79359f24e1fa3c62be2e229a48f1334747ba413 -#+busybox-ed.78c51627a372c5b2ad3d046d0e77f341ae7c79917c4a16ca8abba284e7472cb7 -#+busybox-sed.8782396ae5c7b6e7d6bc8a93a7cff9912e6427e3d919dd5e5b00d1813ae88caf -#+busybox-vi.e661d8eb052fbeebdd3be36ff6bd27651a7e59c857dad05c8633589790caa38c -#+busybox-xxd.d2dc96e92cfdafae2c91d6fe897f42fdccae2dbc8b2d79f31eccc49d4e3a2d68 -#+busybox-process-extra.993cfd65eae2892ecb3fdfbece44b11e7ff6caa78f73e9f22bc2c97e7cd8a267 -#+busybox-procps.51ea8cb23d5eb1498f9167cc80b97c1a873758a8c1a7293079f50a2365466a71 -#+busybox-psmisc.ff1f9cf00f4c448946acb65d52b3b598e0495822af70b1504720cadf559e2090 -#+busybox-ash.7d10753f118afb2568e9f950c9cffa559b053a9b3ea516d6b46c3c73ebb6f8d8 -#+busybox-bc.c595636f103108c81f0ae55d2bf10d7cbc06ef1455a8353fcf04e42e765780a8 -#+busybox-coreutils.6b8071260ab4297f0e71013e42ac2a1a83fa99d92378d181ba49003fd349134a -#+busybox-coreutils-extra.fc1b0766c881ee461d36c386833909553fcb0c31a547bfb563a7c6a50206bdcd -#+busybox-daemontools.97aad28bbe5f38cff29db16c0f0d21e2fdc931825f683137df9bb57ef3a9b628 -#+busybox-grep.261a809c35cb58acc896143c2a81406a097f5870e02ce9906953181ef6b4c72b -#+busybox-misc.5c2c025f1b74b9243a0128cd3f10dd1577b5ae123f53244d8e6895d4bdbd161d -#+busybox-sh.25a9438d8449ade9c98af61b14af5711990dd002462a046b13b61969634c4d94 -#+busybox-util-linux-unpriv.4ea1c8c8746d7e80d36dea8924c576bc9666905b461dd543ceb5595394406c97 -#+busybox-findutils.052256c5bf9c3e7fef2e69d22f3d402d004f22113ce10b4d2c54ff417bf42622 -#+busybox-awk.f44da758ab8e737f05fb82ca4342acdf29ec44a9c2a9670cded75b04e8208058 -#+busybox-diffutils.30a803a8b8dd1d4f18bc5e5952cc4b15aea625caf2af34dd424af233786ba0d0 -#+musl-cross-make.74cd95cd7bd1db21d28d9a8579d924d588b9cbfd0f9744c0fb890188d71646aa -#+gnu-make.31d90a55d6506852f9784f6f6febf0d843f8051f63bc18795fd5275baa369f50 -#+m4.6bc8e8d5403cf05226ef517faa0f48f5e843f5eafc5f859f69e8479caa10f4a0 -#+autoconf.242ff1658dfde60fcb3557e901866db3c521b15c5c2aaa1c16a91c4b9cb06857 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. # - build script start - -autotools_config() { - prefix=/home/ccx/versions/$pthbs_package - ./configure -C \ - --prefix="$prefix" \ - --build="$(${CC:-gcc} -dumpmachine)" \ - --bindir="$prefix/command" \ - --sbindir="$prefix/command" \ - --infodir="$prefix/info" \ - --localedir="$prefix/locale" \ - --mandir="$prefix/man" \ - --libdir="$prefix/library" \ - --docdir="$prefix/doc/musl-fts" \ - --datadir="$prefix/data" \ - --datarootdir="$prefix/data" \ - --localstatedir='/var/pthbs' \ - "$@" - -} - -autotools_config_static() { - build_env_static - autotools_config "$@" --enable-static --disable-shared -} - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -check_static() { - local exe || true - exe=$pthbs_destdir'/home/ccx/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - local interp_info || true - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} - prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'musl-fts-1.2.7' -autotools_config_static - - -make -j${JOBS:-1} -l$((1+${JOBS:-1})) - -make DESTDIR="$pthbs_destdir" install +build_env_static +cat >config.h <<EOF +#define HAVE_DECL_MAX 1 +#define HAVE_DECL_UINTMAX_MAX 0 +#define HAVE_DIRFD 1 +/* #undef HAVE_DIR_DD_FD */ +/* #undef HAVE_DIR_D_FD */ +EOF +gcc -g -O2 -c fts.c -o fts.o +ar cr libfts.a fts.o +ranlib libfts.a +mkdir -p "$dest/include" "$dest/library" "$dest/man/man3" +mv libfts.a "$dest/library/" +mv fts.h "$dest/include/" +mv fts.3 "$dest/man/man3" -cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" -find -type d -o -print | awk -F/ ' -BEGIN { - x["./library/libfts.a"]=1 - x["./include/fts.h"]=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 == "config" { link($0); next } -$2 == "keys" { link($0); next } -$2 == "zsh" { link($0); next } -$2 == "env" { link($0); next } -$2 == "command" { link($0); next } -$2 == "bin" { link(s1("command", $0)); next } - -$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/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -58,7 +58,7 @@ #+s6-rc.f77621d319bb146c643a78051d81af24a0062c5c51ff074708e947714b39f689 #+s6.af31d85ebbb2bd67def86f46f702a872de0704ad1b77e1e52e5b3069f540fd54 #+zsh.08bac2dd5a59108ff97c33e090b80edb1f96413026c95358eb03d4ef039a75a9 -#+libcgroup.15a726e7c3dd1a847b6734697dfaa08dfd95588373245bbf1215d3a529b44413 +#+libcgroup.687544208a2911b0a39afe3c994598ce8db27441d252e1f793f509a3e5fcd757 #+system-config-scripts.a983668711783d5c36b32ca9859fe7c99b0cf3588bbeeb315b8ba5ca6b692831 #+logincaps.7653bc082ef61f10defc361ae21a87b2bea04b7281a5574601d76f2d0706a9c4 #+busybox.2ef5301e1fcabd1b3cd0b88f9dda6a41d4e7b432be5e555dffa5aae865334e41 diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -51,7 +51,7 @@ #+s6-portable-utils.426dcf2bc59010960533bb68ff186d36386bbea55e390d2fdb928c8bea3fc87e #+s6-linux-init.536ee3819b3687a8da33dc343408b53ea5885900c7ee4553025a38cbb71ba1a6 #+execline.5d88993134dc7d05e6124e7bd182279794ef9bac128f552aa1e98c17220e3c37 -#+system-config-rc.330401d559bea2ce98aa1d3eb0e3e620706994b189bd505191d3500168e0fbcf +#+system-config-rc.f2f9d488d43987c5ca74f807fa848a2e521867c4db83198abc96256c5f9be96f # - build script start - @@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.330401d559bea2ce98aa1d3eb0e3e620706994b189bd505191d3500168e0fbcf/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.f2f9d488d43987c5ca74f807fa848a2e521867c4db83198abc96256c5f9be96f/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//home/ccx/versions" diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc @@ -30,7 +30,7 @@ #+busybox-diffutils.30a803a8b8dd1d4f18bc5e5952cc4b15aea625caf2af34dd424af233786ba0d0 #+s6-rc.f77621d319bb146c643a78051d81af24a0062c5c51ff074708e947714b39f689 #+fileset.0e14bac5fb53f8712c33088f26d59687fb3f05f5abdafd093e94f542d5a5e76b -#+system-config.90ebbbc90f1b403d20350825e76ffbe97826c98d5998551bd2ced2e6e99c05ff +#+system-config.85ab5c75f85668a096efd4323d05e9db19da7ec26199795de33d45d20998e6bd # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.90ebbbc90f1b403d20350825e76ffbe97826c98d5998551bd2ced2e6e99c05ff/config/s6-rc-source +src=/home/ccx/versions/system-config.85ab5c75f85668a096efd4323d05e9db19da7ec26199795de33d45d20998e6bd/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/variants/root-x86_64/autoconf b/variants/root-x86_64/autoconf @@ -1,156 +0,0 @@ -#!/usr/bin/env pthbs-build -#+busybox.68f74170e6a13d2e0e3d99d29d2f02cd614667a68afec5007308ea1ece55ad64 -#+busybox-bzip2.9d87ac159c5af2abf932204167d7dd79a5e2854ec5603817b258b68b5584c07c -#+busybox-gzip.1c4e6759f305d884692ed4260879ddf1ca5b722a4b2b8995fd7ac2ff244c1318 -#+busybox-lzop.f4feb74da70e7c871444211871d0fc78da65a9e8ebb6b2d09716cda043d9559f -#+busybox-unzip.3525f1554aa628809b2af9b084dd93fe2a37c8f14dbd514faf0e888c25426073 -#+busybox-xz.ead5b695755cbb0c379db6ee22b83de1da44c6d75a5295889ae4536de2a22e58 -#+busybox-cpio.aae9207efa7aa6f41519f502d53ce4eabb45a70d339a22bf65d89f1aaf7a39de -#+busybox-dpkg.4f8487d22d56efdc91cb2d6263149840ae08d3ff07047357b04d4437f0321f2d -#+busybox-rpm.173468d54d79d9e5630360360e4479f04190c411b81fd1b1ad0139f618dd6b49 -#+busybox-tar.794822cecad4eba7d3977210cc3b83b2dc8011cc18c77d9e0ce5205098cffae8 -#+busybox-ed.afab42d8bf2060655b013c6225efcb43715780ef058e718d6a697e25de0dfa16 -#+busybox-sed.13120e3643a859180c04f69bc441a554327a643b8a8301ec412d412d3ae9e263 -#+busybox-vi.76239b7b2102b4489b0e8a0e86f19030f01d6149fa7310d00504580711d0b0f1 -#+busybox-xxd.f3350b2e6c2d9463bc4d0ac5761b2a3ca4d5b811e651c2c705d6143667656c76 -#+busybox-process-extra.4718339ba96e00c8091bf1348aef03c41cb830463fb26a943788db2c07d43509 -#+busybox-procps.d618aac5f7c813d68a26afdddd97c7989c1ccb671cfa2628642e15573944b541 -#+busybox-psmisc.8e915b0be8aa34811699584be98d8d1532c6fe91b44de921e0cbf527402859ad -#+busybox-ash.ec7c45db8ddc5ce15e4890ac76b9058759c93db13f5a7d7af554888e3c5c593f -#+busybox-bc.3e9cce6408b94240c76671a4d11bcade40182fcb5bcc1cfd1828208bef65a085 -#+busybox-coreutils.9bf9b030f85f1e2273dcd70b660827388694be93e5dbd86e8c812031195508cb -#+busybox-coreutils-extra.8eb2d3d7aee3f89bc564e0da7e1dcf67071e7e49c1ea9b9dcbdba00069d4e247 -#+busybox-daemontools.ff774454c0914cb16b18b038863c4a5a8b7c267eb2a308a9c13b740089ea5727 -#+busybox-grep.acdcecd4d05a4d1c250b30ae8925ee38ed1f787276a99b9e3514b9850159d301 -#+busybox-misc.125f4e5526de9635e0e04ddc5b6ba8c98a9a0e9e817c423b55241a0f0571e0d4 -#+busybox-sh.991f989805551e1b6bb35424114e9339163a4e7c90bb03a946ae71b980936e97 -#+busybox-util-linux-unpriv.1f8b2c8640b56685a72666365d8aece78e21f1ebc8a83b4355bb4111536b7caa -#+busybox-findutils.337e3980f5b5d2a07c3850d24ce41c9cbf70e54a3b8d3b4ed7b258756df0014e -#+busybox-awk.9b2a1cd1da22c09390e41d4448e90c4bde9610143c3d9443ca7665d5d8c42153 -#+busybox-diffutils.9b52fd5ef8d705039558ba31d05f7933c588d7fe6f2a223a2ffece523ae679a3 -#+musl-cross-make.4e31ccacab5cc8de22091926201823288206e2471d5991c3fa8db8b8f5c1b22b -#+gnu-make.f9c645bf2cec787c1273cfa3ca4f2ad9a50bf2749bc7b290c97880642c6775af -#+m4.3859e8735c004546c9033814f8f303398337ac9d15a3028a6046d7648992120f -#@untar:-z:sha256:afb181a76e1ee72832f6581c0eddf8df032b83e2e0239ef79ebedc4467d92d6e:. - - -# - build script start - - -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/autoconf" \ - --datadir="$prefix/data" \ - --datarootdir="$prefix/data" \ - --localstatedir='/var/pthbs' \ - "$@" - -} - -autotools_config_static() { - build_env_static - autotools_config "$@" --enable-static --disable-shared -} - -build_env_static() { - export LD_LIBRARY_PATH="$pthbs_build_environment/library" - export CPATH="$pthbs_build_environment/include" - export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" -} - -check_static() { - local exe || true - exe=$pthbs_destdir'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - local interp_info || true - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} - -prefix=/versions/$pthbs_package -dest=${pthbs_destdir%/}${prefix} -cd 'autoconf-2.72' - - -autotools_config_static - - -make -j${JOBS:-1} -l$((1+${JOBS:-1})) - -make DESTDIR="$pthbs_destdir" install - - - - - -cd "$pthbs_destdir/versions/$pthbs_package" -find -type d -o -print | awk -F/ ' -BEGIN { - x["./command/autotools"]=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 == "config" { link($0); next } -$2 == "keys" { link($0); next } -$2 == "zsh" { link($0); next } -$2 == "env" { link($0); next } -$2 == "command" { link($0); next } -$2 == "bin" { link(s1("command", $0)); next } - -$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/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -88,9 +88,9 @@ #+squashfs-tools.938e7e32dd335cb8ff87bc4f032ef2d043469fb907ea33f2602fd187efefbbed #+mandoc.1b22f8e455f4928966706ab2888397852cccbc8e9eb7ab45e2bed87f42ab1a65 #+tinyssh.445ba94c5bf6644a74cd6f0eaeb6c009747ee28c7646e42f21cba54eb9842546 -#+system-config.ecc3be440bac91ac805d5b89b43bc591bfa0b2d2c40fc171168bdbfb9be9b740 -#+system-config-rc.f9a63dda87967a27183d7dc6dad405f6a90a20674d58ebf92383f4fd3476909e +#+system-config.592b082ceb0e2463084aebaebb7728ec20f30c373055b8030822fedb6855b7d4 +#+system-config-rc.91914624315ac1726b70757d33ec272bd291e67d3e0a041ba6e5a0273bbb2e90 #+system-config-scripts.7d77b0deaa9d944986b14e83dd01b0eb7d9f61a87286e7c516e8f5fc4bf931be -#+system-config-init.54f0c13e379ae119b4a9a0a3992bca17910d8d6760d256226e7bc45f2e669222 +#+system-config-init.7a008a853a14d883996d0fe779e3a5915332c0e0d17122740ebe79b88f83683c #+system-config-zsh.e37469ac124ea9906e672882182d56b08ba04f68788cd9c7b14807614b2896d4 #+busybox-modutils.f424154ecd9e763d06daf39d5b6bbcd5055b977c1cfaced5b87bb7731f4a243a \ No newline at end of file diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup @@ -33,7 +33,7 @@ #+m4.3859e8735c004546c9033814f8f303398337ac9d15a3028a6046d7648992120f #+flex.99b935d9e8a1d65118e90c5310fed9d92f4497ba8e83f1098a834afd2640bf36 #+bison.1f39336996ab8687f8112c0df61fb226fd31b9e07f68d1d71a156635c6942fc1 -#+musl-fts.33ab00003d57168b4bda68bd86a761316c87bc0e0d965423c5c795920fc83912 +#+musl-fts.25fafb28bd912b68884c7ab4f4925edb6109dedce15c914f221e13cd5ffdb397 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts @@ -1,158 +1,41 @@ #!/usr/bin/env pthbs-build -#+busybox.68f74170e6a13d2e0e3d99d29d2f02cd614667a68afec5007308ea1ece55ad64 -#+busybox-bzip2.9d87ac159c5af2abf932204167d7dd79a5e2854ec5603817b258b68b5584c07c -#+busybox-gzip.1c4e6759f305d884692ed4260879ddf1ca5b722a4b2b8995fd7ac2ff244c1318 -#+busybox-lzop.f4feb74da70e7c871444211871d0fc78da65a9e8ebb6b2d09716cda043d9559f -#+busybox-unzip.3525f1554aa628809b2af9b084dd93fe2a37c8f14dbd514faf0e888c25426073 -#+busybox-xz.ead5b695755cbb0c379db6ee22b83de1da44c6d75a5295889ae4536de2a22e58 -#+busybox-cpio.aae9207efa7aa6f41519f502d53ce4eabb45a70d339a22bf65d89f1aaf7a39de -#+busybox-dpkg.4f8487d22d56efdc91cb2d6263149840ae08d3ff07047357b04d4437f0321f2d -#+busybox-rpm.173468d54d79d9e5630360360e4479f04190c411b81fd1b1ad0139f618dd6b49 -#+busybox-tar.794822cecad4eba7d3977210cc3b83b2dc8011cc18c77d9e0ce5205098cffae8 -#+busybox-ed.afab42d8bf2060655b013c6225efcb43715780ef058e718d6a697e25de0dfa16 -#+busybox-sed.13120e3643a859180c04f69bc441a554327a643b8a8301ec412d412d3ae9e263 -#+busybox-vi.76239b7b2102b4489b0e8a0e86f19030f01d6149fa7310d00504580711d0b0f1 -#+busybox-xxd.f3350b2e6c2d9463bc4d0ac5761b2a3ca4d5b811e651c2c705d6143667656c76 -#+busybox-process-extra.4718339ba96e00c8091bf1348aef03c41cb830463fb26a943788db2c07d43509 -#+busybox-procps.d618aac5f7c813d68a26afdddd97c7989c1ccb671cfa2628642e15573944b541 -#+busybox-psmisc.8e915b0be8aa34811699584be98d8d1532c6fe91b44de921e0cbf527402859ad -#+busybox-ash.ec7c45db8ddc5ce15e4890ac76b9058759c93db13f5a7d7af554888e3c5c593f -#+busybox-bc.3e9cce6408b94240c76671a4d11bcade40182fcb5bcc1cfd1828208bef65a085 -#+busybox-coreutils.9bf9b030f85f1e2273dcd70b660827388694be93e5dbd86e8c812031195508cb -#+busybox-coreutils-extra.8eb2d3d7aee3f89bc564e0da7e1dcf67071e7e49c1ea9b9dcbdba00069d4e247 -#+busybox-daemontools.ff774454c0914cb16b18b038863c4a5a8b7c267eb2a308a9c13b740089ea5727 -#+busybox-grep.acdcecd4d05a4d1c250b30ae8925ee38ed1f787276a99b9e3514b9850159d301 -#+busybox-misc.125f4e5526de9635e0e04ddc5b6ba8c98a9a0e9e817c423b55241a0f0571e0d4 -#+busybox-sh.991f989805551e1b6bb35424114e9339163a4e7c90bb03a946ae71b980936e97 -#+busybox-util-linux-unpriv.1f8b2c8640b56685a72666365d8aece78e21f1ebc8a83b4355bb4111536b7caa -#+busybox-findutils.337e3980f5b5d2a07c3850d24ce41c9cbf70e54a3b8d3b4ed7b258756df0014e -#+busybox-awk.9b2a1cd1da22c09390e41d4448e90c4bde9610143c3d9443ca7665d5d8c42153 -#+busybox-diffutils.9b52fd5ef8d705039558ba31d05f7933c588d7fe6f2a223a2ffece523ae679a3 -#+musl-cross-make.4e31ccacab5cc8de22091926201823288206e2471d5991c3fa8db8b8f5c1b22b -#+gnu-make.f9c645bf2cec787c1273cfa3ca4f2ad9a50bf2749bc7b290c97880642c6775af -#+m4.3859e8735c004546c9033814f8f303398337ac9d15a3028a6046d7648992120f -#+autoconf.f2e9e4d97dc9c287797334da7e24d007a4012c4a7512de8d037f2d12145cbc3c #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. # - build script start - -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/musl-fts" \ - --datadir="$prefix/data" \ - --datarootdir="$prefix/data" \ - --localstatedir='/var/pthbs' \ - "$@" - -} - -autotools_config_static() { - build_env_static - autotools_config "$@" --enable-static --disable-shared -} - build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -check_static() { - local exe || true - exe=$pthbs_destdir'/versions'/$pthbs_package/$1 - if ! test -f $exe; then - printf '%s\n' "Error: file '$1' doesn't exist!" - exit 1 - fi - local interp_info || true - interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi -} - prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'musl-fts-1.2.7' -autotools_config_static - - -make -j${JOBS:-1} -l$((1+${JOBS:-1})) - -make DESTDIR="$pthbs_destdir" install +build_env_static +cat >config.h <<EOF +#define HAVE_DECL_MAX 1 +#define HAVE_DECL_UINTMAX_MAX 0 +#define HAVE_DIRFD 1 +/* #undef HAVE_DIR_DD_FD */ +/* #undef HAVE_DIR_D_FD */ +EOF +gcc -g -O2 -c fts.c -o fts.o +ar cr libfts.a fts.o +ranlib libfts.a +mkdir -p "$dest/include" "$dest/library" "$dest/man/man3" +mv libfts.a "$dest/library/" +mv fts.h "$dest/include/" +mv fts.3 "$dest/man/man3" -cd "$pthbs_destdir/versions/$pthbs_package" -find -type d -o -print | awk -F/ ' -BEGIN { - x["./library/libfts.a"]=1 - x["./include/fts.h"]=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 == "config" { link($0); next } -$2 == "keys" { link($0); next } -$2 == "zsh" { link($0); next } -$2 == "env" { link($0); next } -$2 == "command" { link($0); next } -$2 == "bin" { link(s1("command", $0)); next } - -$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/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -58,7 +58,7 @@ #+s6-rc.124b4ee4dd0213ae1c8fb7f96767606661e32a3ea112c9b2d15a2a3cffeec6ca #+s6.ec4c7ce025c347bbf7c809a40b8138265d382862371e9bcabea457edd0426611 #+zsh.b0949d51b3d7ccb490ccfe5dcc09633254eb6744e865719d6a380931e2dce8aa -#+libcgroup.8ed43163eb6d832f75a4963ae072fb45f78dffa7fbd250c70e271889614a5351 +#+libcgroup.823d734e8a53d8f4f4b00aad90474699289d78ec5e2df3ee0c0ea5b8987dfd4d #+system-config-scripts.7d77b0deaa9d944986b14e83dd01b0eb7d9f61a87286e7c516e8f5fc4bf931be #+logincaps.ecc09698e14c2f8804ebd7f8df9c5c851fc48f18bcce206f9b67b4c60da58c9c #+busybox-modutils.f424154ecd9e763d06daf39d5b6bbcd5055b977c1cfaced5b87bb7731f4a243a diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -51,7 +51,7 @@ #+s6-portable-utils.bced7b4b405d52e439abe7a5e1b61758892c7a9f29e6933447965eb5fef546ea #+s6-linux-init.8a9c40c44cead5009edaee39180838b911994116ac737e3257fe3de6d2a7444e #+execline.c9b2a98b336011eab78b31558f55135fab7791d42f91af6af9bff9026401cf95 -#+system-config-rc.f9a63dda87967a27183d7dc6dad405f6a90a20674d58ebf92383f4fd3476909e +#+system-config-rc.91914624315ac1726b70757d33ec272bd291e67d3e0a041ba6e5a0273bbb2e90 # - build script start - @@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.f9a63dda87967a27183d7dc6dad405f6a90a20674d58ebf92383f4fd3476909e/config/s6-rc-db +s6rcdb=/versions/system-config-rc.91914624315ac1726b70757d33ec272bd291e67d3e0a041ba6e5a0273bbb2e90/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//versions" diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc @@ -30,7 +30,7 @@ #+busybox-diffutils.9b52fd5ef8d705039558ba31d05f7933c588d7fe6f2a223a2ffece523ae679a3 #+s6-rc.124b4ee4dd0213ae1c8fb7f96767606661e32a3ea112c9b2d15a2a3cffeec6ca #+fileset.3e5161307c504f434368b2c1318de73b3ba88b52a461f82c65f7219bc46cf239 -#+system-config.ecc3be440bac91ac805d5b89b43bc591bfa0b2d2c40fc171168bdbfb9be9b740 +#+system-config.592b082ceb0e2463084aebaebb7728ec20f30c373055b8030822fedb6855b7d4 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.ecc3be440bac91ac805d5b89b43bc591bfa0b2d2c40fc171168bdbfb9be9b740/config/s6-rc-source +src=/versions/system-config.592b082ceb0e2463084aebaebb7728ec20f30c373055b8030822fedb6855b7d4/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/"