mrrl

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

commit 53a9cbad2a48546e44eee505c91a7f3a26e98b4e
parent f92ad80e82a53f2904d50cd0b16c9a40b092eb06
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Wed,  3 Dec 2025 23:51:05 +0000

Remove libintl from packages extracted from mcm

Diffstat:
Mfilelist.sha256 | 39+++++++++++++++++++++++++++++++++++++++
Atemplates/pkg/musl | 48++++++++++++++++++++++++++++++++++++++++++++++++
Mtemplates/pkg/musl-cross-make:old | 2+-
Mvariants/ccx-x86_64/busybox:old | 2+-
Mvariants/ccx-x86_64/gnu-make:old | 2+-
Avariants/ccx-x86_64/musl | 104+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mvariants/ccx-x86_64/musl-cross-make:old | 2+-
Mvariants/ccx-x86_64/oldsystem.environment | 8++++----
Mvariants/root-x86_64/busybox:old | 2+-
Mvariants/root-x86_64/gnu-make:old | 2+-
Avariants/root-x86_64/musl | 104+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mvariants/root-x86_64/musl-cross-make:old | 2+-
Mvariants/root-x86_64/oldsystem.environment | 8++++----
13 files changed, 310 insertions(+), 15 deletions(-)

diff --git a/filelist.sha256 b/filelist.sha256 @@ -40,13 +40,52 @@ cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867 files/lh_boots 3b20df1d58f9a445785503415aea1188d33159327c2edab3d370dbd37bc4845e files/libelf.h f33d82840d1db22114e18626b64922fa1a3b539a2dee6847528ecc1b17b7b659 files/linux-6.1.34-x86_64-nossl.config 6beb4182e8815f0157ba784b932038a09f5e72d84dd1aba423a8c1a68167731e files/linux-6.1.34-x86_64.config +c19f287c2833db07a3a16852670eedfba414737ace98be61c4843ba74f033374 files/mcm-binutils-2.25.1-merged.diff +7eefc1c674448997d1e8af90606c6f99dc4e04ba24ad8beac4697aeff98d83b7 files/mcm-binutils-2.27-merged.diff +d5b86a9a3447ee9a4d83d269f3fbb5e29660a42122629597bdf8ee1e259d8c21 files/mcm-binutils-2.32-merged.diff +ff2a1109cbe7ccb3ada1afd88127b112e45674bda954d8bf8a221e3122398cb2 files/mcm-binutils-2.33.1-merged.diff adc523ae8a478119db9441e316929a2cf1bc0f6801a2a828187eb670cd4b7178 files/mcm-binutils-2.33.1.patch +a119e7e50cae23feaad160a533d69a90073a519521924da56abc74724cec65c6 files/mcm-binutils-2.44-merged.diff +b284506de8c4c8f531c05f725c3dabf503a3b1c864a96d99cece3547f49be1ea files/mcm-gcc-10.3.0-merged.diff +f10cfaed6dfe709e01ece7ec1d4e778d1756b15adf91dcdcbaff973f6caf11c3 files/mcm-gcc-11.2.0-merged.diff +9afc2d148ef5ccfa4da8508b714e6ae0e85c92ac123598ac1a2b9f0fdb6b2d67 files/mcm-gcc-11.5.0-merged.diff +b6126e4c4044d7c55cc65c5d2f3b3953ee2be654ad6999fff7401a492bfb0018 files/mcm-gcc-12.4.0-merged.diff +b52435d08802378bcd010b2dbb97641a5bbd6b281d86866b320394a106ac7aa3 files/mcm-gcc-13.3.0-merged.diff +f52a99de1e27aeac0ae53bfac104459e2b31b175303496b93ab71011733fee78 files/mcm-gcc-14.2.0-merged.diff +62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160 files/mcm-gcc-14.3.0-merged.diff +c7fd11d821dcc2d665d9acc28515c261fe400cc3194420953993cb73284208ad files/mcm-gcc-15.1.0-merged.diff +c914dd30fec2129968f9ec0223d814379c9a9984259d15ff1a10525e4c8b8cdd files/mcm-gcc-4.2.1-merged.diff +45cf221f1b4bc3dd99d0a149f370557c5b6400882cbca5e3b86d1ac903caaccd files/mcm-gcc-5.3.0-merged.diff +94edc84638cbbd715e89e6ba48d239d57cbbda0e0e014f11fb3924bff1fc2e8d files/mcm-gcc-6.5.0-merged.diff +e2da8439fcd0d95b60b026dccbd30d330064effa99ab4a8c6b8a73754e9cb513 files/mcm-gcc-7.5.0-merged.diff +ffafcefd661f026daa68841bab646a12b020dcc2337dc677be569269128d46f6 files/mcm-gcc-8.5.0-merged.diff +609d49829c4858b52a0ad20396a6faad52309370021ff873ff305ed9e4155ea2 files/mcm-gcc-9.4.0-merged.diff 05765d64025d0ba8ce102509889780a3923eb72d7b7562305cef6862fe0154de files/mcm-gcc-9.4.0.patch 14298adaa96116a4fdd75fa8a94413cf8a43d8dfc0a44db58be72639541ed7ce files/mcm-gmp-6.1.2.patch +069de2415d49ebd8f0a5a59d3750324f9b3d87c13d548c0764534bc29a98728c files/mcm-linux-4.19.90-merged.diff +6f3dcfb337626e2e7ad02971acee68fee0a93cf805933bad0d8947a503fa2d2a files/mcm-linux-5.8.5-merged.diff +fbf38776fa43b65ee4d1b5c39c69c22703757a9cdd0238d0dba883789ffeaed5 files/mcm-linux-headers-4.19.88-1-merged.diff 3ca74cf91b912122ba74d0bbe3faf4979c5c7ad0c5884a6000cb8cbc4e1bbcb2 files/mcm-linux-headers-4.19.88-1.patch 70677fc63a5f34aa12f524fe7f12bbb85d357450e8a2e7920047b90fa2a023f4 files/mcm-mpc-1.1.0.patch cc3c05b62701915ebd87a0c692f20b9c15a3593525db42a6addd2976bd2e798e files/mcm-mpfr-4.0.2.patch +6cbc7afb5c1b39f67106c6b58f68dc9f3eca94e9567d5dd3b75487d44aaffdd7 files/mcm-musl-1.1.14-merged.diff +747a8c76eb5b4076dcfed79e0b542b07317ccc33377072b012c8e6e059ca169e files/mcm-musl-1.1.15-merged.diff +856f4a042d545adae9e481aabfed86778213d06e1f0ecb9653ab5f320e681b3e files/mcm-musl-1.1.16-merged.diff +d0891860abc477952adb4e58e1778e567f54d0a3e7a77f812c87500167d464f0 files/mcm-musl-1.1.17-merged.diff +ff26e2a126a5472943d295a8bf8e8a09c964ab83a3dd80bd74cac2ebc18e1031 files/mcm-musl-1.1.18-merged.diff +2a8f6820ad1f401e559e295c26549dcee154b8841ee4290acf5912f58869badb files/mcm-musl-1.1.19-merged.diff +79fd92e9221aa29d5639e4a6e2eb0639cdd1f07c1e498875c3c8f4b354bfa012 files/mcm-musl-1.1.20-merged.diff +6d86862a8ca19940cf00f0dd5b0dce2dafc13ee54096b115a4a32e093e96f377 files/mcm-musl-1.1.21-merged.diff +c34c9ed097a46214274cae42c0dbf63cd844f347fb94fb147fb9a48085d5acd0 files/mcm-musl-1.1.22-merged.diff +d9db51521739cf9c40374d1a45d1a3f4fa54b0c328ebebde71f45ca5205a68c3 files/mcm-musl-1.1.23-merged.diff +699711f1b0e1303825eb4eee956096e9d527cb85093d32a07adc6655abf3a9ed files/mcm-musl-1.1.24-merged.diff +bd7a43edda9d542772487be55876ba04062d5abc204ac97e823ef81a8e02c886 files/mcm-musl-1.2.0-merged.diff +b7076c95ce6474668541797c0b0ee51a6ce0889f529c3505bd57e099b83a4306 files/mcm-musl-1.2.1-merged.diff +8155408ccbc1f1d8b51f942633aa95746202d1203d93aad5e1c39260d3cc2730 files/mcm-musl-1.2.2-merged.diff +a3dfd82185e02924ace8b3d3aed4e8c7cb9130d27b385eb7b9e4e00db9fe9fe7 files/mcm-musl-1.2.3-merged.diff e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/mcm-musl-1.2.3.patch +1a3a1cccd2b77623507572771316d31d66d9fd43159fd021c0a826c5d7c4fa0e files/mcm-musl-1.2.4-merged.diff +a21336df3bc3b267fbda940d9f533f66b0eacb520b8421cca3ddc943f620a791 files/mcm-musl-1.2.5-merged.diff 4213e75809588e3f32ae0fde8fb11df2dfd6e0e013762ff5ee951c3aadb7ffc0 files/mcm-no_rsync-linux-6.5.4.patch 98a8ddd1004034aeff4cc6d18e5df23f55d2869d879735c3b571594a44ba1212 files/nlist.h ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417 files/noobjtool.patch diff --git a/templates/pkg/musl b/templates/pkg/musl @@ -0,0 +1,48 @@ +{%- set pkg_version="1.2.5" -%} +{%- set pkg_source="tar.gz" -%} +{% extends "genlinks_mini" %} +{%- block template_deps %}{% endblock %} +{% block package_deps -%} +#+{{pkg_install_name("musl-cross-make:bootstrap-1")}} +#+{{pkg_install_name("gnu-make:bootstrap")}} +#+{{pkg_install_name("busybox:bootstrap")}} +{% endblock %} +{% block configure %} +mcm={{versions}}/musl-cross-make.{{pkg_sha256("musl-cross-make:bootstrap-1")}} + +./configure \ + --host=x86_64-linux-musl \ + CC="$mcm/bin/{{triplet}}-gcc" \ + CXX="$mcm/bin/{{triplet}}-g++" \ + LIBCC="$mcm/lib/gcc/{{triplet}}/14.3.0/libgcc.a" + +{%- endblock configure %} +{%- block build %} +{{make}} \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + AR="$mcm/bin/{{triplet}}-ar" \ + RANLIB="$mcm/bin/{{triplet}}-ranlib" + +{%- endblock build %} +{%- block install %} +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + AR="$mcm/bin/{{triplet}}-ar "\ + RANLIB="$mcm/bin/{{triplet}}-ranlib" \ + DESTDIR="$dest" \ + install + +{%- endblock install %} +{% block genlinks_begin %} + {{- super() }} + x["./{{dynlibdir}}/libc.so"]=1 + x["./{{dynlibdir}}/lib/ld-musl-{{triplet.split("-")[0]}}.so.1"]=1 +{% endblock %} diff --git a/templates/pkg/musl-cross-make:old b/templates/pkg/musl-cross-make:old @@ -66,7 +66,7 @@ done "$dd"'/bin/x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker grep -F "$pthbs_package" true.linker -pkgs="gmp intl mpc mpfr zlib" +pkgs="gmp mpc mpfr zlib" #pkgs="$pkgs libbacktrace libcc1 libcpp libdecnumber libiberty lto-plugin" for pkg in $pkgs; do diff --git a/variants/ccx-x86_64/busybox:old b/variants/ccx-x86_64/busybox:old @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.f5a4abf5bfeae7b350908fea7ad7ebd08beb000f82f37752535cb21fd03867a6 +#+musl-cross-make.9d3c665b9dafdda3d1d8c8a5a3d75d4cfa68d80ab5c83802fa37b071e63e43b9 #+gnu-make.4914f09b4a50c385733bf1ab720076dd22771fad7f1675c043e6c15b535965f8 #+busybox.ff42a163f10913129299f6bad062442e6efdd3422b7fd441e7f2f3845e4d317c #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config diff --git a/variants/ccx-x86_64/gnu-make:old b/variants/ccx-x86_64/gnu-make:old @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.f5a4abf5bfeae7b350908fea7ad7ebd08beb000f82f37752535cb21fd03867a6 +#+musl-cross-make.9d3c665b9dafdda3d1d8c8a5a3d75d4cfa68d80ab5c83802fa37b071e63e43b9 #+gnu-make.4914f09b4a50c385733bf1ab720076dd22771fad7f1675c043e6c15b535965f8 #+busybox.ff42a163f10913129299f6bad062442e6efdd3422b7fd441e7f2f3845e4d317c #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. diff --git a/variants/ccx-x86_64/musl b/variants/ccx-x86_64/musl @@ -0,0 +1,104 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.76cf279d5ad4a8701de2ea5025aa8e2e94f0bcbf79eee534d7e66197c6c853c1 +#+gnu-make.f2ed650e0fc6741ae940145d114a932779251b577642c9c7b42f5d3fc1b8a7cb +#+busybox.1088391ecd6b6f76bc9fcf85cdfee4899ed5d5a4265e996dd1b5ff06eef39a7e +#@untar:-z:sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:. + + +# - build script start - + +prefix=/home/ccx/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'musl-1.2.5' + + +mcm=/home/ccx/versions/musl-cross-make.76cf279d5ad4a8701de2ea5025aa8e2e94f0bcbf79eee534d7e66197c6c853c1 + +./configure \ + --host=x86_64-linux-musl \ + CC="$mcm/bin/x86_64-linux-musl-gcc" \ + CXX="$mcm/bin/x86_64-linux-musl-g++" \ + LIBCC="$mcm/lib/gcc/x86_64-linux-musl/14.3.0/libgcc.a" + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + AR="$mcm/bin/x86_64-linux-musl-ar" \ + RANLIB="$mcm/bin/x86_64-linux-musl-ranlib" +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + AR="$mcm/bin/x86_64-linux-musl-ar "\ + RANLIB="$mcm/bin/x86_64-linux-musl-ranlib" \ + DESTDIR="$dest" \ + install + + + +cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./library.so/libc.so"]=1 + x["./library.so/lib/ld-musl-x86_64.so.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 == "env" { link($0); next } +$2 == ".env-template" { link($0); next } + +$2 == "command" { link($0); next } +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } +$2 == "sbin" { 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" { link(s1("info", r1($0))); next } +$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next } +$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next } + +$2 == "config" { link($0); next } +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { 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" } + retcode = 0 + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + retcode = 3 + } + } + exit retcode +}' >.install-links.new +mv .install-links.new .install-links + diff --git a/variants/ccx-x86_64/musl-cross-make:old b/variants/ccx-x86_64/musl-cross-make:old @@ -64,7 +64,7 @@ done "$dd"'/bin/x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker grep -F "$pthbs_package" true.linker -pkgs="gmp intl mpc mpfr zlib" +pkgs="gmp mpc mpfr zlib" #pkgs="$pkgs libbacktrace libcc1 libcpp libdecnumber libiberty lto-plugin" for pkg in $pkgs; do diff --git a/variants/ccx-x86_64/oldsystem.environment b/variants/ccx-x86_64/oldsystem.environment @@ -1,4 +1,4 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.f5a4abf5bfeae7b350908fea7ad7ebd08beb000f82f37752535cb21fd03867a6 -#+busybox.4af2aa1b670555934b813030d9152ee1c058bbf7eb87cf1efea57c606d747749 -#+gnu-make.34ada7aacdbfab1b3e19b5999df9e1f8a67f2f0dccf191ccc2108f1688660458- \ No newline at end of file +#+musl-cross-make.9d3c665b9dafdda3d1d8c8a5a3d75d4cfa68d80ab5c83802fa37b071e63e43b9 +#+busybox.75d2455d407bab8011c71f7f6b23bd1c64c38c6b7c0440a721aaa25d289dd96f +#+gnu-make.de27d9f7b6653747e1d3021c8a505f480b5121c5b3750c0eb2074486757e812e+ \ No newline at end of file diff --git a/variants/root-x86_64/busybox:old b/variants/root-x86_64/busybox:old @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.5da5d45870b9b3de8b53eb841f260b8cf0d63212217dbcf23dc0a91c4cccbe3a +#+musl-cross-make.dbf1917f9978ac1bdf82352d1f81ccd9c58414ad4cd5527e52f9f32f2becf674 #+gnu-make.7e2f01c60eff218547bf81af2bc96317476ad011c923e014d89937325389077b #+busybox.0dcdccc7129012233193d592d24cd8f26263c4ab09553ba991729d67a8f44c84 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config diff --git a/variants/root-x86_64/gnu-make:old b/variants/root-x86_64/gnu-make:old @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.5da5d45870b9b3de8b53eb841f260b8cf0d63212217dbcf23dc0a91c4cccbe3a +#+musl-cross-make.dbf1917f9978ac1bdf82352d1f81ccd9c58414ad4cd5527e52f9f32f2becf674 #+gnu-make.7e2f01c60eff218547bf81af2bc96317476ad011c923e014d89937325389077b #+busybox.0dcdccc7129012233193d592d24cd8f26263c4ab09553ba991729d67a8f44c84 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. diff --git a/variants/root-x86_64/musl b/variants/root-x86_64/musl @@ -0,0 +1,104 @@ +#!/usr/bin/env pthbs-build +#+musl-cross-make.fc96c556cd0441f0bef75ae5ddbcd87d0b9b0a9cc439cf01f1d11f44dc589112 +#+gnu-make.3bf13b906d934aba6aab1bfa4cce7e2b6d42237210aaad5838dfa892b0fa6a65 +#+busybox.95c7eb9aa918180c02ac47c18a44c214bc28b3c20761fc6a9543f7a80e91aa57 +#@untar:-z:sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:. + + +# - build script start - + +prefix=/versions/$pthbs_package +dest=${pthbs_destdir%/}${prefix} +cd 'musl-1.2.5' + + +mcm=/versions/musl-cross-make.fc96c556cd0441f0bef75ae5ddbcd87d0b9b0a9cc439cf01f1d11f44dc589112 + +./configure \ + --host=x86_64-linux-musl \ + CC="$mcm/bin/x86_64-linux-musl-gcc" \ + CXX="$mcm/bin/x86_64-linux-musl-g++" \ + LIBCC="$mcm/lib/gcc/x86_64-linux-musl/14.3.0/libgcc.a" + +make -j${JOBS:-1} -l$((1+${JOBS:-1})) \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + AR="$mcm/bin/x86_64-linux-musl-ar" \ + RANLIB="$mcm/bin/x86_64-linux-musl-ranlib" +make \ + MULTILIB_OSDIRNAMES= \ + INFO_DEPS= \ + infodir= \ + ac_cv_prog_lex_root=lex.yy \ + MAKEINFO=false \ + AR="$mcm/bin/x86_64-linux-musl-ar "\ + RANLIB="$mcm/bin/x86_64-linux-musl-ranlib" \ + DESTDIR="$dest" \ + install + + + +cd "$pthbs_destdir/versions/$pthbs_package" +find -type d -o -print | awk -F/ ' +BEGIN { + x["./library.so/libc.so"]=1 + x["./library.so/lib/ld-musl-x86_64.so.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 == "env" { link($0); next } +$2 == ".env-template" { link($0); next } + +$2 == "command" { link($0); next } +$2 == "command" { link($0); next } +$2 == "bin" { link(s1("command", $0)); next } +$2 == "sbin" { 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" { link(s1("info", r1($0))); next } +$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next } +$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next } + +$2 == "config" { link($0); next } +$2 == "man" { link($0); next } +$2 == "info" { link($0); next } +$2 == "doc" { 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" } + retcode = 0 + for(fname in x) { + if(x[fname]) { + printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr" + retcode = 3 + } + } + exit retcode +}' >.install-links.new +mv .install-links.new .install-links + diff --git a/variants/root-x86_64/musl-cross-make:old b/variants/root-x86_64/musl-cross-make:old @@ -64,7 +64,7 @@ done "$dd"'/bin/x86_64-linux-musl-readelf' --string-dump=.interp true >true.linker grep -F "$pthbs_package" true.linker -pkgs="gmp intl mpc mpfr zlib" +pkgs="gmp mpc mpfr zlib" #pkgs="$pkgs libbacktrace libcc1 libcpp libdecnumber libiberty lto-plugin" for pkg in $pkgs; do diff --git a/variants/root-x86_64/oldsystem.environment b/variants/root-x86_64/oldsystem.environment @@ -1,4 +1,4 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.5da5d45870b9b3de8b53eb841f260b8cf0d63212217dbcf23dc0a91c4cccbe3a -#+busybox.b73e008fbac0c5dcc4430f716cb4e7fe8ba7266f79ab167843c04ee8c5c793bd -#+gnu-make.2c4a412843b0a12e8a964e2e1f239ff339f91ea14a37c3ae5a49ba39b7895c3a- \ No newline at end of file +#+musl-cross-make.dbf1917f9978ac1bdf82352d1f81ccd9c58414ad4cd5527e52f9f32f2becf674 +#+busybox.6740dc81acb79ee287396aa80af4f59e2d7e13e05fbad673caf0018bc8dc9d96 +#+gnu-make.e82fd7c2bef2b110c721c15b33b27c61accc997d9d250e3f4924b5a5c1331e37+ \ No newline at end of file