commit 70957b5603029d48a4e709863acb5f7c056811d2 parent 7b0d8defc590dc7190099b44c13eef0be2aed738 Author: Jan Pobrislo <ccx@te2000.cz> Date: Sun, 12 Oct 2025 10:58:42 +0000 Update regexp in genlinks Diffstat:
195 files changed, 1553 insertions(+), 1553 deletions(-)
diff --git a/templates/genlinks b/templates/genlinks @@ -39,7 +39,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 -#+pthbs-banginstall.33a2a1540423a89b403d1963cca27c181fcb70e9c37d228c4879db86189d0892 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 +#+pthbs-banginstall.9536da8e7dc87417678e25aaefc3df45d2b2d833865d15a0204213ce7ab55995 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat @@ -72,7 +72,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco @@ -91,7 +91,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/acl b/variants/ccx-x86_64/acl @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a -#+attr.47b57d14f7eb8e251ee7be025570c4d38f2f67daaa4136722e916cd76305ea88 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 +#+attr.093c947315799beb55e1f07e26dad62cc4370597f613d993bd49f67f856f5880 #@untar:-z:sha256:5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c:. @@ -109,7 +109,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/alpine-keys b/variants/ccx-x86_64/alpine-keys @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys @@ -51,7 +51,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+patch.51de61405f80dd71c74dd66dc7c97833138819e4fdd78bb602d7d6a37e49de0e -#+libressl.4903279cae354038b843858499d622441a5f5d513ef112a433426aabd13d2681 -#+zstd.aac484e44794778f679bce88460e328d01fd19c989144210a657574b5e5db32d -#+pkgconf-pkg-config.25de9633be5d2988c4d3c857305fdeab61f86776b8879b8266bca089142001ad +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+patch.4055a017949d32dbc736b8a178978f4948592fd13226d035a8319dd40170d9b4 +#+libressl.8465375c196087e8b2ec425e547945d71dc1caa34fb53f877a7f069aaeff48c5 +#+zstd.fb6bd1a9eba927d7ee35a507808b993dd8770092d918032a84eb20063a389582 +#+pkgconf-pkg-config.96ec770fd5cf9fc74c11255c4ca98a870e72d0a78bf4cbb6730272c8a932fc39 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools @@ -89,7 +89,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec -#+libcap.a01cff17b2d9964d6d5aa9db7bcecc5ed178fd3a8aa6a2881078ace26f9be2f7 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662 +#+libcap.0a528305b0ca0d6c395669122225c000e4de2b64f163fdd289f280ecb5ebdd04 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c @@ -78,7 +78,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:. #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0 @@ -90,7 +90,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/attr b/variants/ccx-x86_64/attr @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:. @@ -108,7 +108,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/bison b/variants/ccx-x86_64/bison @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a -#+flex.a088c11e6bdc6eb3d56de355f2d5c82cab0e1e791fede489c16d43435c45b227 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 +#+flex.585551ef03ef21633805c7c771e128d08c4dc727cf8a570e79adbf17c6d41867 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. @@ -110,7 +110,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/bootstrap.environment b/variants/ccx-x86_64/bootstrap.environment @@ -1,4 +1,4 @@ #!/usr/bin/env pthbs-build -#+busybox.96b5ea8576db14a0ea4fc6d29920b5df14afb4e2ff9284c2f6a5c5e64e88254e -#+gnu-make.9ac4f3e6b810118c62fb86ab044f161165fdb7b8ba478bf2adf5951ac07bff86 -#+musl-cross-make.11f47b24c2e41269f1c999eebb1d46eea9a72e2becc4099b9e12ab192180eae7- \ No newline at end of file +#+busybox.bd093637a8f9e586d075075f125b67ac1ae885c800bc663a42ab1d9922efdc7e +#+gnu-make.93969e294652417a6eb54972a84670c2bacb5707d4e6c6ce01e53171c378803e +#+musl-cross-make.e07e4304c738517e3c70d24323904d5fa72f5c8f3c210d1b4db79cab8d591750+ \ No newline at end of file diff --git a/variants/ccx-x86_64/busybox b/variants/ccx-x86_64/busybox @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.9ac4f3e6b810118c62fb86ab044f161165fdb7b8ba478bf2adf5951ac07bff86 -#+busybox.96b5ea8576db14a0ea4fc6d29920b5df14afb4e2ff9284c2f6a5c5e64e88254e +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.93969e294652417a6eb54972a84670c2bacb5707d4e6c6ce01e53171c378803e +#+busybox.bd093637a8f9e586d075075f125b67ac1ae885c800bc663a42ab1d9922efdc7e #@sha256:c7e5b4ba3b5021a7b06935fbc949c723216f0f018caf48862171146d68299283:busybox/.config #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox diff --git a/variants/ccx-x86_64/busybox-awk b/variants/ccx-x86_64/busybox-awk @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-diffutils b/variants/ccx-x86_64/busybox-diffutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-findutils b/variants/ccx-x86_64/busybox-findutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-kbd b/variants/ccx-x86_64/busybox-kbd @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-login b/variants/ccx-x86_64/busybox-login @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox-modutils b/variants/ccx-x86_64/busybox-modutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/busybox:bootstrap b/variants/ccx-x86_64/busybox:bootstrap @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.11f47b24c2e41269f1c999eebb1d46eea9a72e2becc4099b9e12ab192180eae7 -#+gnu-make.9ac4f3e6b810118c62fb86ab044f161165fdb7b8ba478bf2adf5951ac07bff86 +#+musl-cross-make.e07e4304c738517e3c70d24323904d5fa72f5c8f3c210d1b4db79cab8d591750 +#+gnu-make.93969e294652417a6eb54972a84670c2bacb5707d4e6c6ce01e53171c378803e #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config -mcm=/home/ccx/versions/musl-cross-make.11f47b24c2e41269f1c999eebb1d46eea9a72e2becc4099b9e12ab192180eae7 -make=/home/ccx/versions/gnu-make.9ac4f3e6b810118c62fb86ab044f161165fdb7b8ba478bf2adf5951ac07bff86 +mcm=/home/ccx/versions/musl-cross-make.e07e4304c738517e3c70d24323904d5fa72f5c8f3c210d1b4db79cab8d591750 +make=/home/ccx/versions/gnu-make.93969e294652417a6eb54972a84670c2bacb5707d4e6c6ce01e53171c378803e export PATH="$mcm/bin:$make/command:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+linux.288fbf869e7c0fd0d0b7d3a4f8d9b711702786ca30e63e8baf62e78eba64fd3c -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 +#+linux.640a1cea14e46b94ef5fea3be3a8f96d71e485a1ac461746f5d129c338aeb7b3 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 #@sha256:ccb459010923e1a9b49cb39d45bc93d0fc8749acea6efd7b19cfb00e76a5562e:busybox/.config #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox @@ -19,7 +19,7 @@ export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.288fbf869e7c0fd0d0b7d3a4f8d9b711702786ca30e63e8baf62e78eba64fd3c" +CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.640a1cea14e46b94ef5fea3be3a8f96d71e485a1ac461746f5d129c338aeb7b3" EOF make oldconfig cat .config diff --git a/variants/ccx-x86_64/ca-certificates-wip-donotuse b/variants/ccx-x86_64/ca-certificates-wip-donotuse @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+certdata2pem.f564b1fe69ec754908792727ed9f64348e179271ec8c911f30eef4976879ae50 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+certdata2pem.3dc59ce01020382e15d22a9e84dbfbb45b9d1beb52b1b99c77b90b5af751036c #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. @@ -60,7 +60,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec -#+s6.604b12a6fd49b7ff2919bfaafa8ee6b132ad71343c986e51e4eb08d90fbca77d +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662 +#+s6.d536aa86641f3d719388c5af9de0f69d71eb08b57201fe960834bf7cdce3598c #@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils @@ -107,7 +107,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c @@ -76,7 +76,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 -#+pthbs-banginstall.33a2a1540423a89b403d1963cca27c181fcb70e9c37d228c4879db86189d0892 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 +#+pthbs-banginstall.9536da8e7dc87417678e25aaefc3df45d2b2d833865d15a0204213ce7ab55995 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz @@ -69,7 +69,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -1,15 +1,15 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+busybox-login.344e8b6a0af8ae005193114cdf7eb7456a59021e254ceef3e25805066f5bc6dc -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+s6.604b12a6fd49b7ff2919bfaafa8ee6b132ad71343c986e51e4eb08d90fbca77d -#+ccx-utils.8427f4e5ebd84aa95ba1b3efd4830bccd9d779c9bb606116f37484d1754705a7 -#+applyuidgid-caps.06d7d77af1b58a73df341ec85abe60c0e44c5db36221d0dede6094ae2a06a56c -#+easyseccomp.af84beb50c33e6d8b1f23ee4a97d72f0125cbb5e9d13d25e7b58383db704eac0 -#+mlog.c0d5e836f8984a8b0585f733803406a55af721d2c6a801c258c12d6f018ff265 -#+abduco.26a66d072630a994a1b65b6f04564e4e5fd528f45f904be72100d339e4d4e20c -#+nawk.95266c0a77df6e3d349e21ff3abeeb5fe592e709b68d404d309ae2354f1d88dc +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+busybox-login.9f9b905220296cda44af072ff5e5583eb2e3b918e0aed65771beb974d5f209e3 +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 +#+s6.d536aa86641f3d719388c5af9de0f69d71eb08b57201fe960834bf7cdce3598c +#+ccx-utils.4a941b3b2d3e47131f56f6915169d5f18e7642e7f31abbbf06fd1cfbe3715262 +#+applyuidgid-caps.ec52c5c747e86719fd38c96c132f97b26f8f6afce95e5e2d06ba3b870f8c8ac4 +#+easyseccomp.2f76b2e812f2059a37ee905c4c921decccce321b83939f49740208e2b1c0b95b +#+mlog.59b017186f7a2b3e40e01fcd70e8b5a976b45625f2409efd3250665cb5f7b0f6 +#+abduco.fe9067ba5ed364817f34d13ea7816b51eaab14e10b574bc9b9b9fcab11c6504b +#+nawk.62c128091e339b99172fe1fa4afcfa302a1900b029c10daa46f1f8765bd4b19f #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp img="$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image" diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 -#+pthbs-banginstall.33a2a1540423a89b403d1963cca27c181fcb70e9c37d228c4879db86189d0892 -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+alpine-keys.58bebde51040883604dce6835fa612726a30edbc1e2316a56978844b4f4ae2b9 -#+apk-tools.03fd78fe7f2e530cb1f31747d4312993234a5dee49b774e4dbe8d8b7fca52497 -#+xbps.d273af22a950cf03d2a50e6467e154e675d36158048084c9ade06058397769d5 -#+container-bin-image.3cabde59ef75c3edb7a0735eaecb70ebba75b5ca7479acfeb64f941e8a8202e9 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 +#+pthbs-banginstall.9536da8e7dc87417678e25aaefc3df45d2b2d833865d15a0204213ce7ab55995 +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 +#+alpine-keys.311297fd83da544fabb7b79d000517d680ab3f2fde738d00a960c26f0b4c62c2 +#+apk-tools.cae96406bfd7e1d1b5401ba877921215783cbb5bf956726d5f66874b163f0750 +#+xbps.d33b91e062212dcf5f713a9a348e2949ee70f93a8ec2d5c1c61a7b123024cc08 +#+container-bin-image.cb0b24cf476be30e66708c9ae543e5519658f2ae58967760d4ff60fd137fc608 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -50,10 +50,10 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "${dest}/deps/command" -ln -sf '/home/ccx/versions/apk-tools.03fd78fe7f2e530cb1f31747d4312993234a5dee49b774e4dbe8d8b7fca52497/command/apk.static' "${dest}/deps/command/" -ln -sf '/home/ccx/versions/xbps.d273af22a950cf03d2a50e6467e154e675d36158048084c9ade06058397769d5/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.cae96406bfd7e1d1b5401ba877921215783cbb5bf956726d5f66874b163f0750/command/apk.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/xbps.d33b91e062212dcf5f713a9a348e2949ee70f93a8ec2d5c1c61a7b123024cc08/command/xbps-install.static' "${dest}/deps/command/" -for f in '/home/ccx/versions/alpine-keys.58bebde51040883604dce6835fa612726a30edbc1e2316a56978844b4f4ae2b9'/keys/alpine/*/*; do +for f in '/home/ccx/versions/alpine-keys.311297fd83da544fabb7b79d000517d680ab3f2fde738d00a960c26f0b4c62c2'/keys/alpine/*/*; do test -f "$f" d=$(basename "${f%/*}") mkdir -p "${dest}/deps/keys/alpine/$d" @@ -61,13 +61,13 @@ for f in '/home/ccx/versions/alpine-keys.58bebde51040883604dce6835fa612726a30edb done mkdir -p "${dest}/deps/keys/void" -for f in '/home/ccx/versions/xbps.d273af22a950cf03d2a50e6467e154e675d36158048084c9ade06058397769d5'/keys/void/*; do +for f in '/home/ccx/versions/xbps.d33b91e062212dcf5f713a9a348e2949ee70f93a8ec2d5c1c61a7b123024cc08'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.3cabde59ef75c3edb7a0735eaecb70ebba75b5ca7479acfeb64f941e8a8202e9/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.3cabde59ef75c3edb7a0735eaecb70ebba75b5ca7479acfeb64f941e8a8202e9/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.3cabde59ef75c3edb7a0735eaecb70ebba75b5ca7479acfeb64f941e8a8202e9/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.cb0b24cf476be30e66708c9ae543e5519658f2ae58967760d4ff60fd137fc608/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.cb0b24cf476be30e66708c9ae543e5519658f2ae58967760d4ff60fd137fc608/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.cb0b24cf476be30e66708c9ae543e5519658f2ae58967760d4ff60fd137fc608/container-bin-image' "${dest}/deps/" @@ -111,7 +111,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+s6.604b12a6fd49b7ff2919bfaafa8ee6b132ad71343c986e51e4eb08d90fbca77d -#+s6-portable-utils.c4de6cbd4f1c6423c883663e39ecea5379676a6bce756a8e088b2da0eef103ea -#+s6-linux-utils.4a323d35432e0053a85d533ec7287651d09cefdd8a120123f28c033a554c78a4 -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 -#+confz.155a70ee2503a664d69bb4b237d8429774222dc16775acc84ea5384f8af5e9bc -#+containers.c7f96184008258b9cceaf47cb26f21d3121148a427fafc65c4a07b7fffa4146f -#+xbps.d273af22a950cf03d2a50e6467e154e675d36158048084c9ade06058397769d5 -#+zstd.aac484e44794778f679bce88460e328d01fd19c989144210a657574b5e5db32d -#+apk-tools.03fd78fe7f2e530cb1f31747d4312993234a5dee49b774e4dbe8d8b7fca52497 -#+alpine-keys.58bebde51040883604dce6835fa612726a30edbc1e2316a56978844b4f4ae2b9 -#+getent.2ed14ca50a6155cee02f698436375d17f661f8c45c12f578263ccb6f27a4b145 -#+fileset.8f2bf3aa13d26cdff360771ebf76140ce518eb7fb4df6608779ab62c7ce136a0 -#+ccx-utils.8427f4e5ebd84aa95ba1b3efd4830bccd9d779c9bb606116f37484d1754705a7 -#+easyseccomp.af84beb50c33e6d8b1f23ee4a97d72f0125cbb5e9d13d25e7b58383db704eac0- \ No newline at end of file +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 +#+s6.d536aa86641f3d719388c5af9de0f69d71eb08b57201fe960834bf7cdce3598c +#+s6-portable-utils.cba8c8f926d0d41b3301abb0cb7599000490688d83af89d63476a9eec12cb744 +#+s6-linux-utils.23a1a78ffc9fcfaee678a7ee906896bb8e19dd94728b80e3c7b6cb9d2b4da0f2 +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 +#+confz.da065b541b2d2a227f6983ea8fb614b6640a1c6195401be0298eebb45f455cab +#+containers.e218da3bbc1861a5a7b181173fc2697ce28cbcd78098d068d924a8290976f885 +#+xbps.d33b91e062212dcf5f713a9a348e2949ee70f93a8ec2d5c1c61a7b123024cc08 +#+zstd.fb6bd1a9eba927d7ee35a507808b993dd8770092d918032a84eb20063a389582 +#+apk-tools.cae96406bfd7e1d1b5401ba877921215783cbb5bf956726d5f66874b163f0750 +#+alpine-keys.311297fd83da544fabb7b79d000517d680ab3f2fde738d00a960c26f0b4c62c2 +#+getent.b0ff1fa68989f2c00f0bf84192c85bd7be9414932344c41020f68b85ca8db992 +#+fileset.c6117ee0622f67ebce77ff14b6bff37f92d6a20e2af861f4027cb902a255d183 +#+ccx-utils.4a941b3b2d3e47131f56f6915169d5f18e7642e7f31abbbf06fd1cfbe3715262 +#+easyseccomp.2f76b2e812f2059a37ee905c4c921decccce321b83939f49740208e2b1c0b95b+ \ No newline at end of file diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a -#+libressl.4903279cae354038b843858499d622441a5f5d513ef112a433426aabd13d2681 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 +#+libressl.8465375c196087e8b2ec425e547945d71dc1caa34fb53f877a7f069aaeff48c5 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. @@ -129,7 +129,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -1,45 +1,45 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+diffutils.4273707f1ef6903fb328305fe3043863e7c69175aafd80009e9049c06f04f376 -#+patch.51de61405f80dd71c74dd66dc7c97833138819e4fdd78bb602d7d6a37e49de0e -#+flex.a088c11e6bdc6eb3d56de355f2d5c82cab0e1e791fede489c16d43435c45b227 -#+bison.71b7638246cfc2a542d940b5fc0f57bcc2007e69ba1f08e8822c56669a39716b -#+rsync.2e238c424d15e48d3ce9d2d0af370f8dab33847437e1612ab265f9f578f48bf5 -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+s6.604b12a6fd49b7ff2919bfaafa8ee6b132ad71343c986e51e4eb08d90fbca77d -#+s6-rc.feef6fa41ea7d394f1cf64f84116d4caac4f21e98961bc19271d32b00e6a5e83 -#+s6-portable-utils.c4de6cbd4f1c6423c883663e39ecea5379676a6bce756a8e088b2da0eef103ea -#+s6-linux-utils.4a323d35432e0053a85d533ec7287651d09cefdd8a120123f28c033a554c78a4 -#+s6-linux-init.de4539871eeacffb12c5e8fbf676d8dba59f1105d40e8626fd096ba532aeb7df -#+mdevd.6bbdbe0816713e1d3fd8efa7b0e0feea81f1e0f7fb16094f1d865c1d7ea7f8c9 -#+s6-dns.8f09d287747ae55185a48e9de63cb33302e4efea112ec8f7a44d42ccaa7a57ab -#+libressl.4903279cae354038b843858499d622441a5f5d513ef112a433426aabd13d2681 -#+s6-networking.801d125d73e4e25132ba1f175e2e1f9c2a0a7b2609bb9c3233c0c8920ea970a6 -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 -#+pthbs-banginstall.33a2a1540423a89b403d1963cca27c181fcb70e9c37d228c4879db86189d0892 -#+aat.b2d63f4c4fc9aa8c9e26d55490a23f4ca0e4b3ddfcb1caac749c11992488987a -#+confz.155a70ee2503a664d69bb4b237d8429774222dc16775acc84ea5384f8af5e9bc -#+containers.c7f96184008258b9cceaf47cb26f21d3121148a427fafc65c4a07b7fffa4146f -#+fileset.8f2bf3aa13d26cdff360771ebf76140ce518eb7fb4df6608779ab62c7ce136a0 -#+logincaps.b503228b40715b83d9e660b86afe1232d3f18cdd736cec1a0fc22f0735c0f5ae -#+snaprep.8c2e1749125f85d962312a28719227e643c8ead2da1f85f1931906b97ad3be7d -#+curl.cfa068c3877992afcef6aa1c61f794df79dc8cde997a3665be1fc71f9c127b27 -#+git.490048a9c13175ade708bbadbb6b2c5719f0cb2d30741bf5fbdb6bf2fd8181e3 -#+xbps.d273af22a950cf03d2a50e6467e154e675d36158048084c9ade06058397769d5 -#+apk-tools.03fd78fe7f2e530cb1f31747d4312993234a5dee49b774e4dbe8d8b7fca52497 -#+getent.2ed14ca50a6155cee02f698436375d17f661f8c45c12f578263ccb6f27a4b145 -#+getconf.a06d696bcfc496fccdc3a812afa6a3783dab6c73b1cda25a5bd8f838106db871 -#+iconv.bff7e90e5fc3a6e6ee3f1ec9d1103eea2bbcf840389e8a5ae68963339290e7c2 -#+libcap.a01cff17b2d9964d6d5aa9db7bcecc5ed178fd3a8aa6a2881078ace26f9be2f7 -#+applyuidgid-caps.06d7d77af1b58a73df341ec85abe60c0e44c5db36221d0dede6094ae2a06a56c -#+ccx-utils.8427f4e5ebd84aa95ba1b3efd4830bccd9d779c9bb606116f37484d1754705a7 -#+user-env.afd6b4b0140d1bd1e26e22bd700c793045818dfdbb25c245e5595ad9fbc415c9 -#+strace.009594fb6e828f679dd3ad05928dccf1e8dcb46e84eaa221cc167715f84e8b5c -#+mlog.c0d5e836f8984a8b0585f733803406a55af721d2c6a801c258c12d6f018ff265 -#+system-config.c8ffc5b64c94698a8cd745a64b4740423ae4ed4ab3646a8b2109650cb2db3db6 -#+system-config-rc.9463c34811873b9483799cc641855646d1eeb1e783724139dc07f97209c77b82 -#+system-config-scripts.17fd9ae700758b49dbd9bfa9bca824e0ee457b7f2aa919d0c2ab3020510b63c9 -#+system-config-init.46feb8142d8ed04f9deecde4d752d03cd76807cbdf099ea7a4a1350d502821e1 -#+system-config-zsh.d8ec2fff713aea297e5f64367a0f15fc534611ecfe04a8d177ac11ab06c395dc- \ No newline at end of file +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+diffutils.30896e7b5531624faa44a44e3c60c4ee7758452fd040ec250c5aff7e6780beab +#+patch.4055a017949d32dbc736b8a178978f4948592fd13226d035a8319dd40170d9b4 +#+flex.585551ef03ef21633805c7c771e128d08c4dc727cf8a570e79adbf17c6d41867 +#+bison.b0017ac14b9dcfaa414c423bdf04791727b85c47942dc95351e7971240876025 +#+rsync.24ab4ff3227de67945f59c9f722fc58a0a4c11c7fdc3bccf32c1c5c07f042dfd +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 +#+s6.d536aa86641f3d719388c5af9de0f69d71eb08b57201fe960834bf7cdce3598c +#+s6-rc.2d08f2309865d89dd7f9e671bfb9c4bbad5774f458193a1450847d7442f33ecd +#+s6-portable-utils.cba8c8f926d0d41b3301abb0cb7599000490688d83af89d63476a9eec12cb744 +#+s6-linux-utils.23a1a78ffc9fcfaee678a7ee906896bb8e19dd94728b80e3c7b6cb9d2b4da0f2 +#+s6-linux-init.59d8bc7a58de07d6b7f2e6c1be420e291632fe695fa1f293847ea26e03beaae6 +#+mdevd.3f50799ed9cb321de6622ed027af96228f9097f5646d49575049a5845d165a93 +#+s6-dns.59fd98b5cca2da3921b26e29028534eee09be0f444bb221b9d08a7dd86501273 +#+libressl.8465375c196087e8b2ec425e547945d71dc1caa34fb53f877a7f069aaeff48c5 +#+s6-networking.88bd8aecd93cc9c448289c22bd02213110581db68399968e8a8fca9ae8c9956f +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 +#+pthbs-banginstall.9536da8e7dc87417678e25aaefc3df45d2b2d833865d15a0204213ce7ab55995 +#+aat.efd88745974822bd7d99d0ff6f4da982a011f3a1640691047f140b866f60f15e +#+confz.da065b541b2d2a227f6983ea8fb614b6640a1c6195401be0298eebb45f455cab +#+containers.e218da3bbc1861a5a7b181173fc2697ce28cbcd78098d068d924a8290976f885 +#+fileset.c6117ee0622f67ebce77ff14b6bff37f92d6a20e2af861f4027cb902a255d183 +#+logincaps.68331639e43ea35dcf057947d284175b766b6926ba262b52c659d15e19d9332b +#+snaprep.60df922dbcaf4b24f3e41de5d630a9721bf2acabcf3f873fefac6805f5b557c7 +#+curl.2dfe93b8296993f110178e7cba62c54dfe587bcc5f59495b431473b211ca3a03 +#+git.2338e237376f0cdc3fdcc89e1389be902d188e0c1e05ae59fa63af93cc6f0494 +#+xbps.d33b91e062212dcf5f713a9a348e2949ee70f93a8ec2d5c1c61a7b123024cc08 +#+apk-tools.cae96406bfd7e1d1b5401ba877921215783cbb5bf956726d5f66874b163f0750 +#+getent.b0ff1fa68989f2c00f0bf84192c85bd7be9414932344c41020f68b85ca8db992 +#+getconf.0dab702cf424ac6b412a34374e0fe21aea2564116faf57933331b02864d7da2c +#+iconv.53c064d4b361cf1990ca6fa14d749386c993340a03763900de7e0ac18bcef9eb +#+libcap.0a528305b0ca0d6c395669122225c000e4de2b64f163fdd289f280ecb5ebdd04 +#+applyuidgid-caps.ec52c5c747e86719fd38c96c132f97b26f8f6afce95e5e2d06ba3b870f8c8ac4 +#+ccx-utils.4a941b3b2d3e47131f56f6915169d5f18e7642e7f31abbbf06fd1cfbe3715262 +#+user-env.07c7f2e458cf16cb7d60da49df44b219e8d57f11fbb5eb5a9ee445fe21726c71 +#+strace.0c5381c5f102e5f1d288f03fc415312d25edbfb369aef5c86d1e43afede1d29f +#+mlog.59b017186f7a2b3e40e01fcd70e8b5a976b45625f2409efd3250665cb5f7b0f6 +#+system-config.8556bff6c2eb16d1f997a009f4a113b9def6b398eeaa9dd26371962895ec535d +#+system-config-rc.bb48bb47823dea940a3531d102d6303911d61a57bf67804f8e2a6f2eefb397f9 +#+system-config-scripts.20fc02cb49fb9aff01a00f07a076304c1bfcec74d7ce81d7fe2747946a586b52 +#+system-config-init.474c311c53ddcec151558efe36d7f5b9e5f987e596c9bcb25ea81a69277c414b +#+system-config-zsh.681a6527489870ba108e44757f342d94a401cc92c6a0900bb6c991714d5693ab+ \ No newline at end of file diff --git a/variants/ccx-x86_64/diffutils b/variants/ccx-x86_64/diffutils @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. @@ -106,7 +106,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a -#+patch.51de61405f80dd71c74dd66dc7c97833138819e4fdd78bb602d7d6a37e49de0e -#+flex.a088c11e6bdc6eb3d56de355f2d5c82cab0e1e791fede489c16d43435c45b227 -#+bison.71b7638246cfc2a542d940b5fc0f57bcc2007e69ba1f08e8822c56669a39716b -#+libseccomp.de982096b0ce0b253734d1b249e0869e576036c9e4989e4a0c0b3a8cc7a31577 -#+error-standalone.25b79cca0fbc21ffeb049e25b7e275ff5e6cfde4ebc8a4332042ae6dd91564e7 -#+argp-standalone.31881335498953e83fd72619462a05fcd36de58619a5b75e03cd347823c594e8 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 +#+patch.4055a017949d32dbc736b8a178978f4948592fd13226d035a8319dd40170d9b4 +#+flex.585551ef03ef21633805c7c771e128d08c4dc727cf8a570e79adbf17c6d41867 +#+bison.b0017ac14b9dcfaa414c423bdf04791727b85c47942dc95351e7971240876025 +#+libseccomp.d1c07df8e4f9f43fcf1afe7274570f63641400e6585af13a7596cada3fba4cd9 +#+error-standalone.aacd9669c4a4a58c5ffff1e073cd8068644a18f107ab37be7d66a1d8287a9d48 +#+argp-standalone.8cbed6b444c91dad04eed47798bff4e1aa71d14dc5f5e2a8e5b5a2f64dc3832c #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp @@ -111,7 +111,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:. @@ -61,7 +61,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline @@ -20,7 +20,7 @@ cd 'execline' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -72,7 +72,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 -#+pthbs-banginstall.33a2a1540423a89b403d1963cca27c181fcb70e9c37d228c4879db86189d0892 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 +#+pthbs-banginstall.9536da8e7dc87417678e25aaefc3df45d2b2d833865d15a0204213ce7ab55995 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset @@ -71,7 +71,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/findutils b/variants/ccx-x86_64/findutils @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:. @@ -115,7 +115,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/flex b/variants/ccx-x86_64/flex @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. @@ -110,7 +110,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c @@ -74,7 +74,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c @@ -74,7 +74,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a -#+libressl.4903279cae354038b843858499d622441a5f5d513ef112a433426aabd13d2681 -#+curl.cfa068c3877992afcef6aa1c61f794df79dc8cde997a3665be1fc71f9c127b27 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 +#+libressl.8465375c196087e8b2ec425e547945d71dc1caa34fb53f877a7f069aaeff48c5 +#+curl.2dfe93b8296993f110178e7cba62c54dfe587bcc5f59495b431473b211ca3a03 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. @@ -85,7 +85,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/gnu-make b/variants/ccx-x86_64/gnu-make @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.9ac4f3e6b810118c62fb86ab044f161165fdb7b8ba478bf2adf5951ac07bff86 -#+busybox.96b5ea8576db14a0ea4fc6d29920b5df14afb4e2ff9284c2f6a5c5e64e88254e +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.93969e294652417a6eb54972a84670c2bacb5707d4e6c6ce01e53171c378803e +#+busybox.bd093637a8f9e586d075075f125b67ac1ae885c800bc663a42ab1d9922efdc7e #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. @@ -101,7 +101,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/gnu-make:bootstrap b/variants/ccx-x86_64/gnu-make:bootstrap @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.11f47b24c2e41269f1c999eebb1d46eea9a72e2becc4099b9e12ab192180eae7 +#+musl-cross-make.e07e4304c738517e3c70d24323904d5fa72f5c8f3c210d1b4db79cab8d591750 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. @@ -36,7 +36,7 @@ cd 'make-4.4.1' -mcm=/home/ccx/versions/musl-cross-make.11f47b24c2e41269f1c999eebb1d46eea9a72e2becc4099b9e12ab192180eae7 +mcm=/home/ccx/versions/musl-cross-make.e07e4304c738517e3c70d24323904d5fa72f5c8f3c210d1b4db79cab8d591750 export PATH="$mcm/bin:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" @@ -87,7 +87,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:. @@ -103,7 +103,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c @@ -74,7 +74,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/kbd b/variants/ccx-x86_64/kbd @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. @@ -109,7 +109,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment @@ -1,3 +1,3 @@ #!/usr/bin/env pthbs-build -#+linux.288fbf869e7c0fd0d0b7d3a4f8d9b711702786ca30e63e8baf62e78eba64fd3c -#+busybox.bddb3b4d750834713312e21156792d5a07b86383539ee3c0d45da80eae2f6e48- \ No newline at end of file +#+linux.640a1cea14e46b94ef5fea3be3a8f96d71e485a1ac461746f5d129c338aeb7b3 +#+busybox.5bf8063254bd8eb907431300dc3aa212637d172d3ee77cc273a21c4565e5d44d+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libarchive b/variants/ccx-x86_64/libarchive @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:. @@ -108,7 +108,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a -#+libmd.12a2cda093d56816a07b0b24a5b1fede6b4579b03a10f57773cd819b7b01eb20 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 +#+libmd.bf97b43c99f4a33db0d808cb401e1dc1a4cf660d833dce839dcdcea362c31b3f #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:. @@ -104,7 +104,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+pkgconf-pkg-config.25de9633be5d2988c4d3c857305fdeab61f86776b8879b8266bca089142001ad +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+pkgconf-pkg-config.96ec770fd5cf9fc74c11255c4ca98a870e72d0a78bf4cbb6730272c8a932fc39 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. @@ -99,7 +99,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a -#+flex.a088c11e6bdc6eb3d56de355f2d5c82cab0e1e791fede489c16d43435c45b227 -#+bison.71b7638246cfc2a542d940b5fc0f57bcc2007e69ba1f08e8822c56669a39716b -#+musl-fts.a4b77b22c5964feecc91b0081be0e2afaf126be2048d93c7fbe82b9e1ae28574 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 +#+flex.585551ef03ef21633805c7c771e128d08c4dc727cf8a570e79adbf17c6d41867 +#+bison.b0017ac14b9dcfaa414c423bdf04791727b85c47942dc95351e7971240876025 +#+musl-fts.7e5652ad277abc7c2d25b6b937d09512bf4b6bba5629a5a326eae0dd931cd4f1 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. @@ -108,7 +108,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+zstd.aac484e44794778f679bce88460e328d01fd19c989144210a657574b5e5db32d +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+zstd.fb6bd1a9eba927d7ee35a507808b993dd8770092d918032a84eb20063a389582 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf @@ -80,7 +80,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/libmd b/variants/ccx-x86_64/libmd @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:. @@ -104,7 +104,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a -#+ca-certificates-wip-donotuse.00d8cbdc9bb0e020fd1da70ceeaab2986e84e1a8d2fa4a48f8e699c53157eaf9 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 +#+ca-certificates-wip-donotuse.1cf7031a2051b5d97d44e1d4fca16f8229c72475d6d3b5ec1a2dfede3a7cf58d #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. @@ -73,7 +73,7 @@ make DESTDIR="$pthbs_destdir" install cd .. gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto -cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.00d8cbdc9bb0e020fd1da70ceeaab2986e84e1a8d2fa4a48f8e699c53157eaf9/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.1cf7031a2051b5d97d44e1d4fca16f8229c72475d6d3b5ec1a2dfede3a7cf58d/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" ./c_rehash "$pthbs_destdir/$prefix/config/ssl/certs/" cd "$pthbs_destdir/$prefix/config/ssl/" mv cert.pem libressl-cert.pem @@ -131,7 +131,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/libretls b/variants/ccx-x86_64/libretls @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-z:sha256:3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5:. @@ -107,7 +107,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a -#+pkgconf-pkg-config.25de9633be5d2988c4d3c857305fdeab61f86776b8879b8266bca089142001ad -#+gperf.62fd2529f8cf51ed22612253cf87c7da24fa81bc20a4b8a658f3479c8c20dc3e +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 +#+pkgconf-pkg-config.96ec770fd5cf9fc74c11255c4ca98a870e72d0a78bf4cbb6730272c8a932fc39 +#+gperf.d7ab769bd03b09073259a7c7137e96464ccea940b133069be72becb4a08b9868 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:. @@ -109,7 +109,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:. @@ -109,7 +109,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-modutils.648459adb6a69ea46f350630845f61848c76cb11c2d6d592d283bc0c43bb7897 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+findutils.06320fd0c10eb8705b0af9c7820d23d1790ef4218dc6a0672b5c64b711b3fdac -#+diffutils.4273707f1ef6903fb328305fe3043863e7c69175aafd80009e9049c06f04f376 -#+patch.51de61405f80dd71c74dd66dc7c97833138819e4fdd78bb602d7d6a37e49de0e -#+flex.a088c11e6bdc6eb3d56de355f2d5c82cab0e1e791fede489c16d43435c45b227 -#+bison.71b7638246cfc2a542d940b5fc0f57bcc2007e69ba1f08e8822c56669a39716b -#+rsync.2e238c424d15e48d3ce9d2d0af370f8dab33847437e1612ab265f9f578f48bf5 -#+zstd.aac484e44794778f679bce88460e328d01fd19c989144210a657574b5e5db32d -#+libelf.7e79bec411a1c99de9e57086076af58805b8c952fd53c618d724b156970511b4 -#+pkgconf-pkg-config.25de9633be5d2988c4d3c857305fdeab61f86776b8879b8266bca089142001ad -#+nawk.95266c0a77df6e3d349e21ff3abeeb5fe592e709b68d404d309ae2354f1d88dc +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-modutils.54dd64f809d3f46155f4e9aa91e19e44e948c5e5ea25cbddc08edeafcb17cf51 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+findutils.e149cb8dfe22b6cb7cc6db014c11d7aae95c9812643b22771647470accb90bf4 +#+diffutils.30896e7b5531624faa44a44e3c60c4ee7758452fd040ec250c5aff7e6780beab +#+patch.4055a017949d32dbc736b8a178978f4948592fd13226d035a8319dd40170d9b4 +#+flex.585551ef03ef21633805c7c771e128d08c4dc727cf8a570e79adbf17c6d41867 +#+bison.b0017ac14b9dcfaa414c423bdf04791727b85c47942dc95351e7971240876025 +#+rsync.24ab4ff3227de67945f59c9f722fc58a0a4c11c7fdc3bccf32c1c5c07f042dfd +#+zstd.fb6bd1a9eba927d7ee35a507808b993dd8770092d918032a84eb20063a389582 +#+libelf.85f9d8067aa4dc473b7d391ab800fac280996e6614e39de15d9c008f2ac67f4e +#+pkgconf-pkg-config.96ec770fd5cf9fc74c11255c4ca98a870e72d0a78bf4cbb6730272c8a932fc39 +#+nawk.62c128091e339b99172fe1fa4afcfa302a1900b029c10daa46f1f8765bd4b19f #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config @@ -107,7 +107,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-modutils.648459adb6a69ea46f350630845f61848c76cb11c2d6d592d283bc0c43bb7897 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+findutils.06320fd0c10eb8705b0af9c7820d23d1790ef4218dc6a0672b5c64b711b3fdac -#+diffutils.4273707f1ef6903fb328305fe3043863e7c69175aafd80009e9049c06f04f376 -#+patch.51de61405f80dd71c74dd66dc7c97833138819e4fdd78bb602d7d6a37e49de0e -#+flex.a088c11e6bdc6eb3d56de355f2d5c82cab0e1e791fede489c16d43435c45b227 -#+bison.71b7638246cfc2a542d940b5fc0f57bcc2007e69ba1f08e8822c56669a39716b -#+rsync.2e238c424d15e48d3ce9d2d0af370f8dab33847437e1612ab265f9f578f48bf5 -#+zstd.aac484e44794778f679bce88460e328d01fd19c989144210a657574b5e5db32d -#+libelf.7e79bec411a1c99de9e57086076af58805b8c952fd53c618d724b156970511b4 -#+pkgconf-pkg-config.25de9633be5d2988c4d3c857305fdeab61f86776b8879b8266bca089142001ad -#+nawk.95266c0a77df6e3d349e21ff3abeeb5fe592e709b68d404d309ae2354f1d88dc +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-modutils.54dd64f809d3f46155f4e9aa91e19e44e948c5e5ea25cbddc08edeafcb17cf51 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+findutils.e149cb8dfe22b6cb7cc6db014c11d7aae95c9812643b22771647470accb90bf4 +#+diffutils.30896e7b5531624faa44a44e3c60c4ee7758452fd040ec250c5aff7e6780beab +#+patch.4055a017949d32dbc736b8a178978f4948592fd13226d035a8319dd40170d9b4 +#+flex.585551ef03ef21633805c7c771e128d08c4dc727cf8a570e79adbf17c6d41867 +#+bison.b0017ac14b9dcfaa414c423bdf04791727b85c47942dc95351e7971240876025 +#+rsync.24ab4ff3227de67945f59c9f722fc58a0a4c11c7fdc3bccf32c1c5c07f042dfd +#+zstd.fb6bd1a9eba927d7ee35a507808b993dd8770092d918032a84eb20063a389582 +#+libelf.85f9d8067aa4dc473b7d391ab800fac280996e6614e39de15d9c008f2ac67f4e +#+pkgconf-pkg-config.96ec770fd5cf9fc74c11255c4ca98a870e72d0a78bf4cbb6730272c8a932fc39 +#+nawk.62c128091e339b99172fe1fa4afcfa302a1900b029c10daa46f1f8765bd4b19f #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch @@ -105,7 +105,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 -#+pthbs-banginstall.33a2a1540423a89b403d1963cca27c181fcb70e9c37d228c4879db86189d0892 -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+ccx-utils.8427f4e5ebd84aa95ba1b3efd4830bccd9d779c9bb606116f37484d1754705a7 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 +#+pthbs-banginstall.9536da8e7dc87417678e25aaefc3df45d2b2d833865d15a0204213ce7ab55995 +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+ccx-utils.4a941b3b2d3e47131f56f6915169d5f18e7642e7f31abbbf06fd1cfbe3715262 #@git:52261504e78293b651e73a518834c5c75d0b3bf6:logincaps @@ -103,7 +103,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/m4 b/variants/ccx-x86_64/m4 @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. @@ -103,7 +103,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 -#+pthbs-banginstall.33a2a1540423a89b403d1963cca27c181fcb70e9c37d228c4879db86189d0892 +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 +#+pthbs-banginstall.9536da8e7dc87417678e25aaefc3df45d2b2d833865d15a0204213ce7ab55995 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts @@ -48,7 +48,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662 +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd @@ -21,7 +21,7 @@ cd 'mdevd' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -65,7 +65,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+s6.604b12a6fd49b7ff2919bfaafa8ee6b132ad71343c986e51e4eb08d90fbca77d -#+mdev-scripts.900e3997309f54dac05be77dd2a1ebf069a8912131208832a930077a0b1cba6e -#+mdevd.6bbdbe0816713e1d3fd8efa7b0e0feea81f1e0f7fb16094f1d865c1d7ea7f8c9- \ No newline at end of file +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 +#+s6.d536aa86641f3d719388c5af9de0f69d71eb08b57201fe960834bf7cdce3598c +#+mdev-scripts.f3aff4b028d11063d9ee74a27c60f89885c4b1ec565384de3c83c6ad26706c73 +#+mdevd.3f50799ed9cb321de6622ed027af96228f9097f5646d49575049a5845d165a93+ \ No newline at end of file diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog @@ -75,7 +75,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/musl-cross-make b/variants/ccx-x86_64/musl-cross-make @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.11f47b24c2e41269f1c999eebb1d46eea9a72e2becc4099b9e12ab192180eae7 -#+gnu-make.9ac4f3e6b810118c62fb86ab044f161165fdb7b8ba478bf2adf5951ac07bff86 -#+busybox.96b5ea8576db14a0ea4fc6d29920b5df14afb4e2ff9284c2f6a5c5e64e88254e +#+musl-cross-make.e07e4304c738517e3c70d24323904d5fa72f5c8f3c210d1b4db79cab8d591750 +#+gnu-make.93969e294652417a6eb54972a84670c2bacb5707d4e6c6ce01e53171c378803e +#+busybox.bd093637a8f9e586d075075f125b67ac1ae885c800bc663a42ab1d9922efdc7e #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -135,7 +135,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/musl-cross-make:bootstrap-0 b/variants/ccx-x86_64/musl-cross-make:bootstrap-0 @@ -84,7 +84,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/musl-cross-make:bootstrap-1 b/variants/ccx-x86_64/musl-cross-make:bootstrap-1 @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.0823f13b9bffb7f83d122e22a33bdd35b6c212e81c03ddb73e9779f00d4f3db5 +#+musl-cross-make.bc89f0c49ce8c197165040a15d51f9cf1c90ea58c2954c5925692db71da30e58 #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -18,7 +18,7 @@ prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' -bootstrap=/home/ccx/versions/musl-cross-make.0823f13b9bffb7f83d122e22a33bdd35b6c212e81c03ddb73e9779f00d4f3db5 +bootstrap=/home/ccx/versions/musl-cross-make.bc89f0c49ce8c197165040a15d51f9cf1c90ea58c2954c5925692db71da30e58 "$bootstrap/bin/x86_64-linux-musl-gcc" --version # For validating the compiler @@ -93,7 +93,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. @@ -103,7 +103,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/nawk b/variants/ccx-x86_64/nawk @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+bison.71b7638246cfc2a542d940b5fc0f57bcc2007e69ba1f08e8822c56669a39716b -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+bison.b0017ac14b9dcfaa414c423bdf04791727b85c47942dc95351e7971240876025 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:. @@ -54,7 +54,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/netbsd-curses b/variants/ccx-x86_64/netbsd-curses @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses @@ -67,7 +67,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/openssl b/variants/ccx-x86_64/openssl @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 #@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. @@ -67,7 +67,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/patch b/variants/ccx-x86_64/patch @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. @@ -104,7 +104,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/patchelf:bootstrap b/variants/ccx-x86_64/patchelf:bootstrap @@ -98,7 +98,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:. @@ -105,7 +105,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/pkgconf-pkg-config b/variants/ccx-x86_64/pkgconf-pkg-config @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+pkgconf.d94a1c5d56bea6614c5a12b9ab0bae959ef38047287a8adce3a560a3b9a44ba1 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+pkgconf.0c3c3d901877e9f2659a4f240f1b2eaf57b553aa0501883d2e9055220e16a4b3 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/popt b/variants/ccx-x86_64/popt @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. @@ -103,7 +103,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/pthbs-banginstall b/variants/ccx-x86_64/pthbs-banginstall @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall @@ -49,7 +49,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a -#+nawk.95266c0a77df6e3d349e21ff3abeeb5fe592e709b68d404d309ae2354f1d88dc -#+popt.1e9593ce9879a8ae8a460d9c15e1d1c5326d010db4bf4719b1621ba91ac8c954 -#+libressl.4903279cae354038b843858499d622441a5f5d513ef112a433426aabd13d2681 -#+zstd.aac484e44794778f679bce88460e328d01fd19c989144210a657574b5e5db32d +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 +#+nawk.62c128091e339b99172fe1fa4afcfa302a1900b029c10daa46f1f8765bd4b19f +#+popt.bd9538fffe7585d0ef0d88958665791500395f1e3b4560228fe6e2a4c420b5b3 +#+libressl.8465375c196087e8b2ec425e547945d71dc1caa34fb53f877a7f069aaeff48c5 +#+zstd.fb6bd1a9eba927d7ee35a507808b993dd8770092d918032a84eb20063a389582 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. @@ -113,7 +113,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6 @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662 +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 @@ -21,7 +21,7 @@ cd 's6' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -65,7 +65,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/s6-dns b/variants/ccx-x86_64/s6-dns @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns @@ -20,7 +20,7 @@ cd 's6-dns' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -64,7 +64,7 @@ $2 == "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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/s6-linux-init b/variants/ccx-x86_64/s6-linux-init @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+s6.604b12a6fd49b7ff2919bfaafa8ee6b132ad71343c986e51e4eb08d90fbca77d +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662 +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 +#+s6.d536aa86641f3d719388c5af9de0f69d71eb08b57201fe960834bf7cdce3598c #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init @@ -22,7 +22,7 @@ cd 's6-linux-init' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -66,7 +66,7 @@ $2 == "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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/s6-linux-utils b/variants/ccx-x86_64/s6-linux-utils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils @@ -20,7 +20,7 @@ cd 's6-linux-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -64,7 +64,7 @@ $2 == "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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+s6.604b12a6fd49b7ff2919bfaafa8ee6b132ad71343c986e51e4eb08d90fbca77d -#+s6-dns.8f09d287747ae55185a48e9de63cb33302e4efea112ec8f7a44d42ccaa7a57ab -#+libressl.4903279cae354038b843858499d622441a5f5d513ef112a433426aabd13d2681 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662 +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 +#+s6.d536aa86641f3d719388c5af9de0f69d71eb08b57201fe960834bf7cdce3598c +#+s6-dns.59fd98b5cca2da3921b26e29028534eee09be0f444bb221b9d08a7dd86501273 +#+libressl.8465375c196087e8b2ec425e547945d71dc1caa34fb53f877a7f069aaeff48c5 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking @@ -24,7 +24,7 @@ cd 's6-networking' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -73,7 +73,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/s6-portable-utils b/variants/ccx-x86_64/s6-portable-utils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils @@ -20,7 +20,7 @@ cd 's6-portable-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -64,7 +64,7 @@ $2 == "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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/s6-rc b/variants/ccx-x86_64/s6-rc @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+s6.604b12a6fd49b7ff2919bfaafa8ee6b132ad71343c986e51e4eb08d90fbca77d +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662 +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 +#+s6.d536aa86641f3d719388c5af9de0f69d71eb08b57201fe960834bf7cdce3598c #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc @@ -22,7 +22,7 @@ cd 's6-rc' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.5667cdadc44e710640d546840975769aaf3ce52821b92081b7c493c12ee9b1ec/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.387a74d75c7775da3b97e5d57192b72598903d70dba85111f44121a107a7e662/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -66,7 +66,7 @@ $2 == "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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/skalibs b/variants/ccx-x86_64/skalibs @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs @@ -66,7 +66,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 -#+pthbs-banginstall.33a2a1540423a89b403d1963cca27c181fcb70e9c37d228c4879db86189d0892 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 +#+pthbs-banginstall.9536da8e7dc87417678e25aaefc3df45d2b2d833865d15a0204213ce7ab55995 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep @@ -70,7 +70,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a -#+patch.51de61405f80dd71c74dd66dc7c97833138819e4fdd78bb602d7d6a37e49de0e -#+libunwind.0e624ffa7136fb996977d1f78333ec9136f864ff7a00b6991202669cd8c540f6 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 +#+patch.4055a017949d32dbc736b8a178978f4948592fd13226d035a8319dd40170d9b4 +#+libunwind.0a2b2a6cc466d65f0c441cd638226f03c9523b102d301974810e9c09d01e2c6c #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. @@ -112,7 +112,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -1,21 +1,21 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+diffutils.4273707f1ef6903fb328305fe3043863e7c69175aafd80009e9049c06f04f376 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+aat.b2d63f4c4fc9aa8c9e26d55490a23f4ca0e4b3ddfcb1caac749c11992488987a -#+fileset.8f2bf3aa13d26cdff360771ebf76140ce518eb7fb4df6608779ab62c7ce136a0 -#+rsync.2e238c424d15e48d3ce9d2d0af370f8dab33847437e1612ab265f9f578f48bf5 -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+kbd.5f600808cccceeb968817c54462379debe666d0c059f96e5c37db3721232e4b5 -#+mdevd.6bbdbe0816713e1d3fd8efa7b0e0feea81f1e0f7fb16094f1d865c1d7ea7f8c9 -#+s6-linux-utils.4a323d35432e0053a85d533ec7287651d09cefdd8a120123f28c033a554c78a4 -#+s6-rc.feef6fa41ea7d394f1cf64f84116d4caac4f21e98961bc19271d32b00e6a5e83 -#+s6.604b12a6fd49b7ff2919bfaafa8ee6b132ad71343c986e51e4eb08d90fbca77d -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 -#+system-config-scripts.17fd9ae700758b49dbd9bfa9bca824e0ee457b7f2aa919d0c2ab3020510b63c9 -#+logincaps.b503228b40715b83d9e660b86afe1232d3f18cdd736cec1a0fc22f0735c0f5ae +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+diffutils.30896e7b5531624faa44a44e3c60c4ee7758452fd040ec250c5aff7e6780beab +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+aat.efd88745974822bd7d99d0ff6f4da982a011f3a1640691047f140b866f60f15e +#+fileset.c6117ee0622f67ebce77ff14b6bff37f92d6a20e2af861f4027cb902a255d183 +#+rsync.24ab4ff3227de67945f59c9f722fc58a0a4c11c7fdc3bccf32c1c5c07f042dfd +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 +#+kbd.d6e4fdca5b6eedd7d5235876f45be1449c16f9fbfe88f8a20355bed4f65aaeca +#+mdevd.3f50799ed9cb321de6622ed027af96228f9097f5646d49575049a5845d165a93 +#+s6-linux-utils.23a1a78ffc9fcfaee678a7ee906896bb8e19dd94728b80e3c7b6cb9d2b4da0f2 +#+s6-rc.2d08f2309865d89dd7f9e671bfb9c4bbad5774f458193a1450847d7442f33ecd +#+s6.d536aa86641f3d719388c5af9de0f69d71eb08b57201fe960834bf7cdce3598c +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 +#+system-config-scripts.20fc02cb49fb9aff01a00f07a076304c1bfcec74d7ce81d7fe2747946a586b52 +#+logincaps.68331639e43ea35dcf057947d284175b766b6926ba262b52c659d15e19d9332b #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config @@ -51,8 +51,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/home/ccx/versions/env.5b9167386d0855572e0e2b3ec92d142dc53ebbcb9bc525e5509a896c7aef39d9' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.46c818a59c028a927c18e0b3899e2df04f031e6df49b5fd7989a5edf98ad5b06' \ + 'pthbs_path_containers=/home/ccx/versions/env.4f746ff153accbf7c6136eea17008e1968dea49c2b81ec5947b03169d8b92eff' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.f54c66f71c4837bbad7caeca626d7850e1d38a0a4c940a8be1a7fc58c7080417' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do @@ -112,7 +112,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+s6.604b12a6fd49b7ff2919bfaafa8ee6b132ad71343c986e51e4eb08d90fbca77d -#+s6-rc.feef6fa41ea7d394f1cf64f84116d4caac4f21e98961bc19271d32b00e6a5e83 -#+s6-portable-utils.c4de6cbd4f1c6423c883663e39ecea5379676a6bce756a8e088b2da0eef103ea -#+s6-linux-init.de4539871eeacffb12c5e8fbf676d8dba59f1105d40e8626fd096ba532aeb7df -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+system-config-rc.9463c34811873b9483799cc641855646d1eeb1e783724139dc07f97209c77b82 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+s6.d536aa86641f3d719388c5af9de0f69d71eb08b57201fe960834bf7cdce3598c +#+s6-rc.2d08f2309865d89dd7f9e671bfb9c4bbad5774f458193a1450847d7442f33ecd +#+s6-portable-utils.cba8c8f926d0d41b3301abb0cb7599000490688d83af89d63476a9eec12cb744 +#+s6-linux-init.59d8bc7a58de07d6b7f2e6c1be420e291632fe695fa1f293847ea26e03beaae6 +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 +#+system-config-rc.bb48bb47823dea940a3531d102d6303911d61a57bf67804f8e2a6f2eefb397f9 # - build script start - @@ -30,7 +30,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/home/ccx/versions/system-config-rc.9463c34811873b9483799cc641855646d1eeb1e783724139dc07f97209c77b82/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.bb48bb47823dea940a3531d102d6303911d61a57bf67804f8e2a6f2eefb397f9/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//home/ccx/versions" @@ -174,7 +174,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+s6-rc.feef6fa41ea7d394f1cf64f84116d4caac4f21e98961bc19271d32b00e6a5e83 -#+fileset.8f2bf3aa13d26cdff360771ebf76140ce518eb7fb4df6608779ab62c7ce136a0 -#+system-config.c8ffc5b64c94698a8cd745a64b4740423ae4ed4ab3646a8b2109650cb2db3db6 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+s6-rc.2d08f2309865d89dd7f9e671bfb9c4bbad5774f458193a1450847d7442f33ecd +#+fileset.c6117ee0622f67ebce77ff14b6bff37f92d6a20e2af861f4027cb902a255d183 +#+system-config.8556bff6c2eb16d1f997a009f4a113b9def6b398eeaa9dd26371962895ec535d # - build script start - @@ -14,7 +14,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/home/ccx/versions/system-config.c8ffc5b64c94698a8cd745a64b4740423ae4ed4ab3646a8b2109650cb2db3db6/config/s6-rc-source +src=/home/ccx/versions/system-config.8556bff6c2eb16d1f997a009f4a113b9def6b398eeaa9dd26371962895ec535d/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" @@ -51,7 +51,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/system-config-scripts b/variants/ccx-x86_64/system-config-scripts @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 -#+pthbs-banginstall.33a2a1540423a89b403d1963cca27c181fcb70e9c37d228c4879db86189d0892 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 +#+pthbs-banginstall.9536da8e7dc87417678e25aaefc3df45d2b2d833865d15a0204213ce7ab55995 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts @@ -70,7 +70,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/system-config-zsh b/variants/ccx-x86_64/system-config-zsh @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh @@ -47,7 +47,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+pthbs-banginstall.33a2a1540423a89b403d1963cca27c181fcb70e9c37d228c4879db86189d0892 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 +#+pthbs-banginstall.9536da8e7dc87417678e25aaefc3df45d2b2d833865d15a0204213ce7ab55995 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env @@ -51,7 +51,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -1,40 +1,40 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+diffutils.4273707f1ef6903fb328305fe3043863e7c69175aafd80009e9049c06f04f376 -#+patch.51de61405f80dd71c74dd66dc7c97833138819e4fdd78bb602d7d6a37e49de0e -#+flex.a088c11e6bdc6eb3d56de355f2d5c82cab0e1e791fede489c16d43435c45b227 -#+bison.71b7638246cfc2a542d940b5fc0f57bcc2007e69ba1f08e8822c56669a39716b -#+rsync.2e238c424d15e48d3ce9d2d0af370f8dab33847437e1612ab265f9f578f48bf5 -#+execline.886324e30aae24b01340da9959dc1ed4e98bf49fe79c9a68a7990f7531a6bfdd -#+s6.604b12a6fd49b7ff2919bfaafa8ee6b132ad71343c986e51e4eb08d90fbca77d -#+s6-rc.feef6fa41ea7d394f1cf64f84116d4caac4f21e98961bc19271d32b00e6a5e83 -#+s6-portable-utils.c4de6cbd4f1c6423c883663e39ecea5379676a6bce756a8e088b2da0eef103ea -#+s6-linux-utils.4a323d35432e0053a85d533ec7287651d09cefdd8a120123f28c033a554c78a4 -#+s6-linux-init.de4539871eeacffb12c5e8fbf676d8dba59f1105d40e8626fd096ba532aeb7df -#+mdevd.6bbdbe0816713e1d3fd8efa7b0e0feea81f1e0f7fb16094f1d865c1d7ea7f8c9 -#+s6-dns.8f09d287747ae55185a48e9de63cb33302e4efea112ec8f7a44d42ccaa7a57ab -#+libressl.4903279cae354038b843858499d622441a5f5d513ef112a433426aabd13d2681 -#+s6-networking.801d125d73e4e25132ba1f175e2e1f9c2a0a7b2609bb9c3233c0c8920ea970a6 -#+zsh.9ca246fa5cc5bba449c526cad9cd6b2c0501b172c3edb37a36f84afff20420c3 -#+pthbs-banginstall.33a2a1540423a89b403d1963cca27c181fcb70e9c37d228c4879db86189d0892 -#+aat.b2d63f4c4fc9aa8c9e26d55490a23f4ca0e4b3ddfcb1caac749c11992488987a -#+confz.155a70ee2503a664d69bb4b237d8429774222dc16775acc84ea5384f8af5e9bc -#+containers.c7f96184008258b9cceaf47cb26f21d3121148a427fafc65c4a07b7fffa4146f -#+fileset.8f2bf3aa13d26cdff360771ebf76140ce518eb7fb4df6608779ab62c7ce136a0 -#+logincaps.b503228b40715b83d9e660b86afe1232d3f18cdd736cec1a0fc22f0735c0f5ae -#+snaprep.8c2e1749125f85d962312a28719227e643c8ead2da1f85f1931906b97ad3be7d -#+curl.cfa068c3877992afcef6aa1c61f794df79dc8cde997a3665be1fc71f9c127b27 -#+git.490048a9c13175ade708bbadbb6b2c5719f0cb2d30741bf5fbdb6bf2fd8181e3 -#+xbps.d273af22a950cf03d2a50e6467e154e675d36158048084c9ade06058397769d5 -#+apk-tools.03fd78fe7f2e530cb1f31747d4312993234a5dee49b774e4dbe8d8b7fca52497 -#+getent.2ed14ca50a6155cee02f698436375d17f661f8c45c12f578263ccb6f27a4b145 -#+getconf.a06d696bcfc496fccdc3a812afa6a3783dab6c73b1cda25a5bd8f838106db871 -#+iconv.bff7e90e5fc3a6e6ee3f1ec9d1103eea2bbcf840389e8a5ae68963339290e7c2 -#+libcap.a01cff17b2d9964d6d5aa9db7bcecc5ed178fd3a8aa6a2881078ace26f9be2f7 -#+applyuidgid-caps.06d7d77af1b58a73df341ec85abe60c0e44c5db36221d0dede6094ae2a06a56c -#+ccx-utils.8427f4e5ebd84aa95ba1b3efd4830bccd9d779c9bb606116f37484d1754705a7 -#+user-env.afd6b4b0140d1bd1e26e22bd700c793045818dfdbb25c245e5595ad9fbc415c9 -#+strace.009594fb6e828f679dd3ad05928dccf1e8dcb46e84eaa221cc167715f84e8b5c -#+mlog.c0d5e836f8984a8b0585f733803406a55af721d2c6a801c258c12d6f018ff265- \ No newline at end of file +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+diffutils.30896e7b5531624faa44a44e3c60c4ee7758452fd040ec250c5aff7e6780beab +#+patch.4055a017949d32dbc736b8a178978f4948592fd13226d035a8319dd40170d9b4 +#+flex.585551ef03ef21633805c7c771e128d08c4dc727cf8a570e79adbf17c6d41867 +#+bison.b0017ac14b9dcfaa414c423bdf04791727b85c47942dc95351e7971240876025 +#+rsync.24ab4ff3227de67945f59c9f722fc58a0a4c11c7fdc3bccf32c1c5c07f042dfd +#+execline.fdc296937d46e01d7d77d16fc27ca664db5b770b5d8c677f861854e906521310 +#+s6.d536aa86641f3d719388c5af9de0f69d71eb08b57201fe960834bf7cdce3598c +#+s6-rc.2d08f2309865d89dd7f9e671bfb9c4bbad5774f458193a1450847d7442f33ecd +#+s6-portable-utils.cba8c8f926d0d41b3301abb0cb7599000490688d83af89d63476a9eec12cb744 +#+s6-linux-utils.23a1a78ffc9fcfaee678a7ee906896bb8e19dd94728b80e3c7b6cb9d2b4da0f2 +#+s6-linux-init.59d8bc7a58de07d6b7f2e6c1be420e291632fe695fa1f293847ea26e03beaae6 +#+mdevd.3f50799ed9cb321de6622ed027af96228f9097f5646d49575049a5845d165a93 +#+s6-dns.59fd98b5cca2da3921b26e29028534eee09be0f444bb221b9d08a7dd86501273 +#+libressl.8465375c196087e8b2ec425e547945d71dc1caa34fb53f877a7f069aaeff48c5 +#+s6-networking.88bd8aecd93cc9c448289c22bd02213110581db68399968e8a8fca9ae8c9956f +#+zsh.43deed4f337bb2537bd6afe750cf96d8fa1ce57ff68908ac0e23261e55aa2e64 +#+pthbs-banginstall.9536da8e7dc87417678e25aaefc3df45d2b2d833865d15a0204213ce7ab55995 +#+aat.efd88745974822bd7d99d0ff6f4da982a011f3a1640691047f140b866f60f15e +#+confz.da065b541b2d2a227f6983ea8fb614b6640a1c6195401be0298eebb45f455cab +#+containers.e218da3bbc1861a5a7b181173fc2697ce28cbcd78098d068d924a8290976f885 +#+fileset.c6117ee0622f67ebce77ff14b6bff37f92d6a20e2af861f4027cb902a255d183 +#+logincaps.68331639e43ea35dcf057947d284175b766b6926ba262b52c659d15e19d9332b +#+snaprep.60df922dbcaf4b24f3e41de5d630a9721bf2acabcf3f873fefac6805f5b557c7 +#+curl.2dfe93b8296993f110178e7cba62c54dfe587bcc5f59495b431473b211ca3a03 +#+git.2338e237376f0cdc3fdcc89e1389be902d188e0c1e05ae59fa63af93cc6f0494 +#+xbps.d33b91e062212dcf5f713a9a348e2949ee70f93a8ec2d5c1c61a7b123024cc08 +#+apk-tools.cae96406bfd7e1d1b5401ba877921215783cbb5bf956726d5f66874b163f0750 +#+getent.b0ff1fa68989f2c00f0bf84192c85bd7be9414932344c41020f68b85ca8db992 +#+getconf.0dab702cf424ac6b412a34374e0fe21aea2564116faf57933331b02864d7da2c +#+iconv.53c064d4b361cf1990ca6fa14d749386c993340a03763900de7e0ac18bcef9eb +#+libcap.0a528305b0ca0d6c395669122225c000e4de2b64f163fdd289f280ecb5ebdd04 +#+applyuidgid-caps.ec52c5c747e86719fd38c96c132f97b26f8f6afce95e5e2d06ba3b870f8c8ac4 +#+ccx-utils.4a941b3b2d3e47131f56f6915169d5f18e7642e7f31abbbf06fd1cfbe3715262 +#+user-env.07c7f2e458cf16cb7d60da49df44b219e8d57f11fbb5eb5a9ee445fe21726c71 +#+strace.0c5381c5f102e5f1d288f03fc415312d25edbfb369aef5c86d1e43afede1d29f +#+mlog.59b017186f7a2b3e40e01fcd70e8b5a976b45625f2409efd3250665cb5f7b0f6+ \ No newline at end of file diff --git a/variants/ccx-x86_64/vm.environment b/variants/ccx-x86_64/vm.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+linux-qemu-guest.324deec9db10d19cf23d69d0f009f95bd3c0d8b82542e1aa95614ecb48f682f5- \ No newline at end of file +#+linux-qemu-guest.d8d2d625005859ae7503012b349e3b315539b9026f5d9447a4e7c3ba2898ee04+ \ No newline at end of file diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+libarchive.6ebf25ed4ab288fdb8c283cdded2f4ecd4133d0c4dd77ea1ad06099710d1584d -#+libressl.4903279cae354038b843858499d622441a5f5d513ef112a433426aabd13d2681 -#+pkgconf-pkg-config.25de9633be5d2988c4d3c857305fdeab61f86776b8879b8266bca089142001ad +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+libarchive.944abc006a231a1e28724ee6057f8cfc093f0507f0d968e2296d9baca781c3a9 +#+libressl.8465375c196087e8b2ec425e547945d71dc1caa34fb53f877a7f069aaeff48c5 +#+pkgconf-pkg-config.96ec770fd5cf9fc74c11255c4ca98a870e72d0a78bf4cbb6730272c8a932fc39 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. @@ -107,7 +107,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+m4.341a8fac01308bf53604a8fe4fbc82dca04e479fb3790d60733086adef3d831a -#+netbsd-curses.e2ebd95b902b0da9b1f8f834d9a1e41d850e8888ddc49be18ef8d837751d2842 -#+libbsd.3074fadb892facb36609035c0c3bea0e0c10dc80ee2e7e91fcec1524fbfcd003 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+m4.e8667815f50ae96df4e3f2464e291e6098bddee7c61775b749416f798e297625 +#+netbsd-curses.c79b5d457c8e3c8c22422041d4743fbf00cfc398d82c49a39f720b2730647293 +#+libbsd.d8d3b802bb612bd44fd2c38a4c18471f6530c0e1b69bf0511b703095fd73ea0f #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. @@ -130,7 +130,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.1eedf1a8118c6aebc2754e0431aa82eb14f91168808a1c7585d11e0778837cc4 -#+busybox-findutils.e41e539c8834eefb4cff5fd18af8cb8d3a1eaf2554fd0b615ac03e7349587d6b -#+busybox-awk.278620fd162a1e25d7a6e1115fff807ab842799c61695d4bbf1aa971f79c3a3a -#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510 -#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0 -#+busybox-diffutils.ea437e39e69502feac824bbb05a722300bdc621ec95ebebbc0080248782eee57 +#+busybox.4f0d14cf72588251428265434a9f44317fb91d2216045bb17c8e611c09e205b4 +#+busybox-findutils.bb72ed28f7d91f7ad56789f717b4e4e7a83806f7eed92d24603c731d2e1c4b14 +#+busybox-awk.78704c021d1207fd8bfc7864e067b656046b45055f455b4c8495006e66f4a555 +#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054 +#+gnu-make.55eb259e0f312d10457a458d9323e532dda3d8a934982a307b5298d7711bb299 +#+busybox-diffutils.465e4d027e10e6712724e57324827aac1c3cdc551bb172a091480cdd49b0fc10 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. @@ -80,7 +80,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 -#+pthbs-banginstall.03c21a68212dceab1d32648c357ac5a54dd0f8a32bdbc4096be43f5f83d4e112 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b +#+pthbs-banginstall.dbb97e40f20a650ef32de84f49e2e7ad4bbe769c227b2d02e5ea96acc44787db #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat @@ -72,7 +72,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco @@ -91,7 +91,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/acl b/variants/root-x86_64/acl @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de -#+attr.613cc4e864b6b1771b4b567118346237f60ec3737ed3b0482e9b1fb4eafc7a82 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b +#+attr.78ef0ab4b0f138714f5e5e5daf08284a1490b7f5c9566abc5a32a66e8fb0a190 #@untar:-z:sha256:5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c:. @@ -109,7 +109,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/alpine-keys b/variants/root-x86_64/alpine-keys @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys @@ -51,7 +51,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+patch.25b984e8ff99f7a5947a292dc3e93e47267a22d5fea8fd87625b8490b1716b0d -#+libressl.8937d3785f0dcacc7501cbcd3dcee7f402d52e4932a9ed50837f00162a93ae5c -#+zstd.e93db0a4cfbbf41f96814ef6d3b312631b3cc387dac4b6fbe7d92510a77464e8 -#+pkgconf-pkg-config.08a039239431e2258a55fb75f79700c49900da61f0a8a85665bfc6831b7ee225 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+patch.f50b958c0a9c92d6ecc6444647f5aa96562644bab1d10700d7a0278eaed0f2a7 +#+libressl.452bf416d8376e879ef68cff9773d676c7b5759b1fdff3bb995e8ee05046c0e9 +#+zstd.eaa0d132827836777d5cbdee8aa5510277e6ad44c798cfbe638619de3053d06d +#+pkgconf-pkg-config.9de0da77a4cb8781fef70a2a7d4cece68f908ed43fa545504badbc3a0a8f93bd #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools @@ -89,7 +89,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622 -#+libcap.18dd8d2de8334ba3bdb05211aae9e47cec2f252e28207151d9f086a84d8fbf2a +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b +#+libcap.857c371bdd538ba921cbfd57afba2d2edfc6d1143eb64285385dd7a7ced1ea54 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c @@ -78,7 +78,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/argp-standalone b/variants/root-x86_64/argp-standalone @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:. #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0 @@ -90,7 +90,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/attr b/variants/root-x86_64/attr @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:. @@ -108,7 +108,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/bison b/variants/root-x86_64/bison @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de -#+flex.08bfdd6921a0b95c720d067c85006daca6cc9ae3bc582399a05d02ccfe0af4bb +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b +#+flex.4e8f2dc4075608eddd783f20d0394c1babd17b3a5df35601008c17e818a9876f #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. @@ -110,7 +110,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/bootstrap.environment b/variants/root-x86_64/bootstrap.environment @@ -1,4 +1,4 @@ #!/usr/bin/env pthbs-build -#+busybox.8d31de4bbd63c77b80d66e932d3b8465e91fa53f5f2451ca8d182e649945f672 -#+gnu-make.e8491664984e42d3397bbaafe44057c5b8aefdbe708a91acef331c4bcc3b90a8 -#+musl-cross-make.ca6ebbfaa2cd42b4edd81db03a6ef0364841589e0de1dabdf31c2dd97aad75be- \ No newline at end of file +#+busybox.5e01885d9a22ec536126310d0e54ef31c15af4332111d74eabdf578a3788a693 +#+gnu-make.f61ed1f2e8a7ae0c037fdcee9c08195872c2f00242b3457e872678b5cd273886 +#+musl-cross-make.ce940a4988a25f86e589f70e17f077daf441092d21ae22c67325e869acd879cc+ \ No newline at end of file diff --git a/variants/root-x86_64/busybox b/variants/root-x86_64/busybox @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.e8491664984e42d3397bbaafe44057c5b8aefdbe708a91acef331c4bcc3b90a8 -#+busybox.8d31de4bbd63c77b80d66e932d3b8465e91fa53f5f2451ca8d182e649945f672 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.f61ed1f2e8a7ae0c037fdcee9c08195872c2f00242b3457e872678b5cd273886 +#+busybox.5e01885d9a22ec536126310d0e54ef31c15af4332111d74eabdf578a3788a693 #@sha256:c7e5b4ba3b5021a7b06935fbc949c723216f0f018caf48862171146d68299283:busybox/.config #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox diff --git a/variants/root-x86_64/busybox-awk b/variants/root-x86_64/busybox-awk @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-diffutils b/variants/root-x86_64/busybox-diffutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-findutils b/variants/root-x86_64/busybox-findutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-kbd b/variants/root-x86_64/busybox-kbd @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-login b/variants/root-x86_64/busybox-login @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox-modutils b/variants/root-x86_64/busybox-modutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/busybox:bootstrap b/variants/root-x86_64/busybox:bootstrap @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.ca6ebbfaa2cd42b4edd81db03a6ef0364841589e0de1dabdf31c2dd97aad75be -#+gnu-make.e8491664984e42d3397bbaafe44057c5b8aefdbe708a91acef331c4bcc3b90a8 +#+musl-cross-make.ce940a4988a25f86e589f70e17f077daf441092d21ae22c67325e869acd879cc +#+gnu-make.f61ed1f2e8a7ae0c037fdcee9c08195872c2f00242b3457e872678b5cd273886 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config -mcm=/versions/musl-cross-make.ca6ebbfaa2cd42b4edd81db03a6ef0364841589e0de1dabdf31c2dd97aad75be -make=/versions/gnu-make.e8491664984e42d3397bbaafe44057c5b8aefdbe708a91acef331c4bcc3b90a8 +mcm=/versions/musl-cross-make.ce940a4988a25f86e589f70e17f077daf441092d21ae22c67325e869acd879cc +make=/versions/gnu-make.f61ed1f2e8a7ae0c037fdcee9c08195872c2f00242b3457e872678b5cd273886 export PATH="$mcm/bin:$make/command:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" diff --git a/variants/root-x86_64/busybox:modutils b/variants/root-x86_64/busybox:modutils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+linux.9b34bb4ddcc3c62a84044d57212a9009834ba5e699b293c68ba9f3150b465b49 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 +#+linux.1677188d47bf55c95de557bb9a61487ce483db140b7f5fd6df24dcd0fe1021aa +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 #@sha256:ccb459010923e1a9b49cb39d45bc93d0fc8749acea6efd7b19cfb00e76a5562e:busybox/.config #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox @@ -19,7 +19,7 @@ export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/versions/linux.9b34bb4ddcc3c62a84044d57212a9009834ba5e699b293c68ba9f3150b465b49" +CONFIG_DEFAULT_MODULES_DIR="/versions/linux.1677188d47bf55c95de557bb9a61487ce483db140b7f5fd6df24dcd0fe1021aa" EOF make oldconfig cat .config diff --git a/variants/root-x86_64/ca-certificates-wip-donotuse b/variants/root-x86_64/ca-certificates-wip-donotuse @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+certdata2pem.506a45e914b11744a4e89f8ffaceea40da2bca36eab73464d401a8e804c61c4a +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+certdata2pem.8f33788b0a5ba2d7d4486d28f34a093c967d7b06bdfce6557bef92b0acce6bbe #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. @@ -60,7 +60,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622 -#+s6.306b870f8a592df29be4fb55361fa57aa0ca47f0eae4c7fade76fb3d621d174a +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b +#+s6.752370fc6972898e9ddfe3af776a82caaf9295467ea3dbd5091bd207745ef746 #@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils @@ -107,7 +107,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c @@ -76,7 +76,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 -#+pthbs-banginstall.03c21a68212dceab1d32648c357ac5a54dd0f8a32bdbc4096be43f5f83d4e112 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b +#+pthbs-banginstall.dbb97e40f20a650ef32de84f49e2e7ad4bbe769c227b2d02e5ea96acc44787db #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz @@ -69,7 +69,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -1,15 +1,15 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+busybox-login.a145b861e30a1e221898e93d6374e8c8805508d7afb82a737265932d7a57bc28 -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+s6.306b870f8a592df29be4fb55361fa57aa0ca47f0eae4c7fade76fb3d621d174a -#+ccx-utils.02e5e9ea91364fa46227ef8b91f79cbde94f89216c5cfaf1d02e4d44942c2807 -#+applyuidgid-caps.a766e9a3bc59fb6acc4468826dd0a7453ac4ed4c3f9fd33c63c6255e850ce29b -#+easyseccomp.5b93c8d724fe8a50d55bb36ed1e937340493f5c476fe3532d23a1eb72ffc3d1d -#+mlog.c48f05cded0201d5691b18c8b0e9aff7519f56fe46f179be9a435b04882b5385 -#+abduco.07fe16db834dfa2c6237b919de40137f178af691f0200bd3d2f1627c2985d926 -#+nawk.e1fac420282f395b24353ae0989a34f026c69d207ecf2a2f06cd1c1dec994b0c +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+busybox-login.f113ffef1dcababde4a67da9087a34cf6b68c753e5f900c3286936000cce6775 +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 +#+s6.752370fc6972898e9ddfe3af776a82caaf9295467ea3dbd5091bd207745ef746 +#+ccx-utils.a2885ae9b60defdb7f6287076f2df9998734e0a462b2c932c8002f6a7ae62603 +#+applyuidgid-caps.cbb6c8bbdd67d806b3ae1aaccbeaac8f86be860c95cf99b567f75a3bf6b45ce4 +#+easyseccomp.72d8d25e4cdf609def398bbd6a1d8fe5b15a60f67356e0ef623d0d1e7fa16dca +#+mlog.4deacf22aa7e8fc24c50d361799f4a1e83d0d475603f2a9f300c361e4e2135d2 +#+abduco.081cb72bbb1a166cc96541f811c4167b6f0f2b8e3694271d6fb7aae25df05c18 +#+nawk.5ce7155c39144755e6216ce341e0fd45e61cc0ad50538dbb7361aef89cf57108 #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp img="$pthbs_destdir/versions/$pthbs_package/container-bin-image" diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 -#+pthbs-banginstall.03c21a68212dceab1d32648c357ac5a54dd0f8a32bdbc4096be43f5f83d4e112 -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+alpine-keys.dd8a17f274c1167c3a382e55053b4d0726754566a6f3a23bbdb759154d37fb19 -#+apk-tools.3b13432e779174066e5f021a0f2c1b69ba49ef0c630d73cb3aaae0e7872bc0f3 -#+xbps.85431302b073baea8affa1e2db18beef1527085fccf2ea337e992a6ad0add57e -#+container-bin-image.616bee27ca218e742dc8601cb31523b4053b4d856038856e3a3fd3915522a750 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b +#+pthbs-banginstall.dbb97e40f20a650ef32de84f49e2e7ad4bbe769c227b2d02e5ea96acc44787db +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 +#+alpine-keys.0e92b4f941d94afaaa4eddc497c05d72b3b24fc25b4eaab99104f6eba9eb2e5f +#+apk-tools.ad37b47b4eb47e8e61d7561a7b683a13fe94ff20bbd2673b44a610360b353c23 +#+xbps.282e44bf4d6b4a1957bafc55ea526e35298377095d83216521c9e96a5e2a9963 +#+container-bin-image.8eff628d0762f9a4b63ef669758ccdb61f8d840f22459aa665c3f6e4b731aa6a #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -50,10 +50,10 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "${dest}/deps/command" -ln -sf '/versions/apk-tools.3b13432e779174066e5f021a0f2c1b69ba49ef0c630d73cb3aaae0e7872bc0f3/command/apk.static' "${dest}/deps/command/" -ln -sf '/versions/xbps.85431302b073baea8affa1e2db18beef1527085fccf2ea337e992a6ad0add57e/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/versions/apk-tools.ad37b47b4eb47e8e61d7561a7b683a13fe94ff20bbd2673b44a610360b353c23/command/apk.static' "${dest}/deps/command/" +ln -sf '/versions/xbps.282e44bf4d6b4a1957bafc55ea526e35298377095d83216521c9e96a5e2a9963/command/xbps-install.static' "${dest}/deps/command/" -for f in '/versions/alpine-keys.dd8a17f274c1167c3a382e55053b4d0726754566a6f3a23bbdb759154d37fb19'/keys/alpine/*/*; do +for f in '/versions/alpine-keys.0e92b4f941d94afaaa4eddc497c05d72b3b24fc25b4eaab99104f6eba9eb2e5f'/keys/alpine/*/*; do test -f "$f" d=$(basename "${f%/*}") mkdir -p "${dest}/deps/keys/alpine/$d" @@ -61,13 +61,13 @@ for f in '/versions/alpine-keys.dd8a17f274c1167c3a382e55053b4d0726754566a6f3a23b done mkdir -p "${dest}/deps/keys/void" -for f in '/versions/xbps.85431302b073baea8affa1e2db18beef1527085fccf2ea337e992a6ad0add57e'/keys/void/*; do +for f in '/versions/xbps.282e44bf4d6b4a1957bafc55ea526e35298377095d83216521c9e96a5e2a9963'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.616bee27ca218e742dc8601cb31523b4053b4d856038856e3a3fd3915522a750/container-bin-image' -test -f '/versions/container-bin-image.616bee27ca218e742dc8601cb31523b4053b4d856038856e3a3fd3915522a750/container-bin-image/if' -ln -sf '/versions/container-bin-image.616bee27ca218e742dc8601cb31523b4053b4d856038856e3a3fd3915522a750/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.8eff628d0762f9a4b63ef669758ccdb61f8d840f22459aa665c3f6e4b731aa6a/container-bin-image' +test -f '/versions/container-bin-image.8eff628d0762f9a4b63ef669758ccdb61f8d840f22459aa665c3f6e4b731aa6a/container-bin-image/if' +ln -sf '/versions/container-bin-image.8eff628d0762f9a4b63ef669758ccdb61f8d840f22459aa665c3f6e4b731aa6a/container-bin-image' "${dest}/deps/" @@ -111,7 +111,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+s6.306b870f8a592df29be4fb55361fa57aa0ca47f0eae4c7fade76fb3d621d174a -#+s6-portable-utils.4d82247fe3c1350dfe9e4fc89f2f17c7458acc78e2856a10d9554c17c2ce6cd3 -#+s6-linux-utils.e4f5091500532a84cf1d68cf4df5be3b704001d361b04e095e2ab84a1f95d5f7 -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 -#+confz.76415f9081e61265f1fbeb9734e2c474f3f8ca8c82cdf61abcbb1914f786e6cb -#+containers.9decf07ad14724d4a176e14bebeba182c776cd55f0ea1432099c4beec34cab3b -#+xbps.85431302b073baea8affa1e2db18beef1527085fccf2ea337e992a6ad0add57e -#+zstd.e93db0a4cfbbf41f96814ef6d3b312631b3cc387dac4b6fbe7d92510a77464e8 -#+apk-tools.3b13432e779174066e5f021a0f2c1b69ba49ef0c630d73cb3aaae0e7872bc0f3 -#+alpine-keys.dd8a17f274c1167c3a382e55053b4d0726754566a6f3a23bbdb759154d37fb19 -#+getent.c962311d698814220e6f5643bf960a8fb04fd1943924d87bab5af32bfdb72d48 -#+fileset.ecc4de9de12b9899c248dfb9489237b78aa7fbc41ef37e17e818fe72af8d5a1e -#+ccx-utils.02e5e9ea91364fa46227ef8b91f79cbde94f89216c5cfaf1d02e4d44942c2807 -#+easyseccomp.5b93c8d724fe8a50d55bb36ed1e937340493f5c476fe3532d23a1eb72ffc3d1d- \ No newline at end of file +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 +#+s6.752370fc6972898e9ddfe3af776a82caaf9295467ea3dbd5091bd207745ef746 +#+s6-portable-utils.2d847e737311622d8e8265a6c67ce20a3f2c7b8bcee84b01fc2c35dd65ff3791 +#+s6-linux-utils.b54e237d22d0b22e7cff9be08223cf750b10bd1ffbf7c20632209bc221536f26 +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b +#+confz.7886f64397e19f97708d6a9a086961b1a85ee3159f9d817e15852cb706d4a3a8 +#+containers.82f02998cb518f3a1c47515b3db8d9adaee9f5bb2bdc681c6eee43bcfb57d050 +#+xbps.282e44bf4d6b4a1957bafc55ea526e35298377095d83216521c9e96a5e2a9963 +#+zstd.eaa0d132827836777d5cbdee8aa5510277e6ad44c798cfbe638619de3053d06d +#+apk-tools.ad37b47b4eb47e8e61d7561a7b683a13fe94ff20bbd2673b44a610360b353c23 +#+alpine-keys.0e92b4f941d94afaaa4eddc497c05d72b3b24fc25b4eaab99104f6eba9eb2e5f +#+getent.c36318388ba8844eaa4774eab3bffdda85ea405dd18160da532c84f4e1e33075 +#+fileset.92f81d82f5c5291b0fe45bf3095eb241de1db84c859e345bd47db6fae85e07b4 +#+ccx-utils.a2885ae9b60defdb7f6287076f2df9998734e0a462b2c932c8002f6a7ae62603 +#+easyseccomp.72d8d25e4cdf609def398bbd6a1d8fe5b15a60f67356e0ef623d0d1e7fa16dca+ \ No newline at end of file diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de -#+libressl.8937d3785f0dcacc7501cbcd3dcee7f402d52e4932a9ed50837f00162a93ae5c +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b +#+libressl.452bf416d8376e879ef68cff9773d676c7b5759b1fdff3bb995e8ee05046c0e9 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. @@ -129,7 +129,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -1,45 +1,45 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+diffutils.c6da5c38b727d5efb2ba5d2be7da73f3c01b9e024dccea2542a9e829b9a6532a -#+patch.25b984e8ff99f7a5947a292dc3e93e47267a22d5fea8fd87625b8490b1716b0d -#+flex.08bfdd6921a0b95c720d067c85006daca6cc9ae3bc582399a05d02ccfe0af4bb -#+bison.c93caecb278b5de0c40a62b0db11b5d6d8c9f3245dffff8e704b657838988e64 -#+rsync.80c7d5df6da1dff4a4c76a08a26488117bb589bfe3252863a07459eebdc2df97 -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+s6.306b870f8a592df29be4fb55361fa57aa0ca47f0eae4c7fade76fb3d621d174a -#+s6-rc.ecb2d1c093f53f53f75b156f0c35b9c6294af4ab33fee572c9d2acef6f00ebdd -#+s6-portable-utils.4d82247fe3c1350dfe9e4fc89f2f17c7458acc78e2856a10d9554c17c2ce6cd3 -#+s6-linux-utils.e4f5091500532a84cf1d68cf4df5be3b704001d361b04e095e2ab84a1f95d5f7 -#+s6-linux-init.96d69d113f1b0d8549ee3d0a40c96721f5600be1c29f7c4a5baa0eb1c7419baf -#+mdevd.1bccea6d481d077964a03f9afc681b0bdcd7ed93383de4d5abef9cd0c1e8bb63 -#+s6-dns.2e5dd1eedae77199fdcedb89c5058d437fb398a140684202a651ee7072f843c9 -#+libressl.8937d3785f0dcacc7501cbcd3dcee7f402d52e4932a9ed50837f00162a93ae5c -#+s6-networking.0b94b5c8ada80f843f862359c41e403f09288aa1483c412b09cfbf98813e9418 -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 -#+pthbs-banginstall.03c21a68212dceab1d32648c357ac5a54dd0f8a32bdbc4096be43f5f83d4e112 -#+aat.5a89398ac400dae8001f1dc5a9f6985725031680d80479de3e0c8f0df5e3a8a6 -#+confz.76415f9081e61265f1fbeb9734e2c474f3f8ca8c82cdf61abcbb1914f786e6cb -#+containers.9decf07ad14724d4a176e14bebeba182c776cd55f0ea1432099c4beec34cab3b -#+fileset.ecc4de9de12b9899c248dfb9489237b78aa7fbc41ef37e17e818fe72af8d5a1e -#+logincaps.4d3b3b039757c80c41631ce703bcc807012dc04cd1208df78affb27855094c27 -#+snaprep.e917df6685526517ebadb25b973ab11450146219be491a1aa74de59f6da7198c -#+curl.bce081159f80fe5c9162e6419f96d6b60783deb4e0d58b374797dba590d74e52 -#+git.02f97b28409221d77712c5bc4332234c0f368d7d300cad9e11d5038e4b4aab78 -#+xbps.85431302b073baea8affa1e2db18beef1527085fccf2ea337e992a6ad0add57e -#+apk-tools.3b13432e779174066e5f021a0f2c1b69ba49ef0c630d73cb3aaae0e7872bc0f3 -#+getent.c962311d698814220e6f5643bf960a8fb04fd1943924d87bab5af32bfdb72d48 -#+getconf.afb751b2e00fe710ebf86f569136160ed68b6120f7fe7545aeb8048713bfa24c -#+iconv.6d153b4567d630cfdd9f81956efa71f99e988100a632b2f86b634d11487bdd87 -#+libcap.18dd8d2de8334ba3bdb05211aae9e47cec2f252e28207151d9f086a84d8fbf2a -#+applyuidgid-caps.a766e9a3bc59fb6acc4468826dd0a7453ac4ed4c3f9fd33c63c6255e850ce29b -#+ccx-utils.02e5e9ea91364fa46227ef8b91f79cbde94f89216c5cfaf1d02e4d44942c2807 -#+user-env.d9f705e45905a235a71e8b3904a8c6db4f88ad60c6c1be98fdca2630ab67d92e -#+strace.b1b6f36c338b219b442b8d8845717028677bb12becac6ffbc785d8cd35770ae6 -#+mlog.c48f05cded0201d5691b18c8b0e9aff7519f56fe46f179be9a435b04882b5385 -#+system-config.9a1d8f8163f1eab41a2ff9c62bc32589ca519afbdddd57a4a365343246fe9ef3 -#+system-config-rc.fca674fad7bbd87b264b2bd15306bc1f575295770ccc81c177da82cd68fd1ffe -#+system-config-scripts.97f2fd113bc99e2cf0ed333678567c348af9a90b64c1b8ef68a808a57919314f -#+system-config-init.03c5bea5839ecb984d99dd32f3a9d4a393781a0960da01ddf02160bd7b5328b4 -#+system-config-zsh.3f77f2ea795e3b6063cf31610edd4cd3ae7c682a2f329341df6fc910729fa517- \ No newline at end of file +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+diffutils.5f8ecd5d2ac078380d43957b81597c624db7cc6feae350bf5c73e4a39d4c6693 +#+patch.f50b958c0a9c92d6ecc6444647f5aa96562644bab1d10700d7a0278eaed0f2a7 +#+flex.4e8f2dc4075608eddd783f20d0394c1babd17b3a5df35601008c17e818a9876f +#+bison.b98170c7c5f25f476d71c04acf774db8dde7a08663d859e87cb0c7cbe345ab9a +#+rsync.7f08aef6edd932e613f2be88f076bad9673293e2efa3dc6d23bed1bc64b16b34 +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 +#+s6.752370fc6972898e9ddfe3af776a82caaf9295467ea3dbd5091bd207745ef746 +#+s6-rc.ae4640d2f840b2e4237e11bf96cfcf0bcf09bef3668f6f506f644c2300cb80a0 +#+s6-portable-utils.2d847e737311622d8e8265a6c67ce20a3f2c7b8bcee84b01fc2c35dd65ff3791 +#+s6-linux-utils.b54e237d22d0b22e7cff9be08223cf750b10bd1ffbf7c20632209bc221536f26 +#+s6-linux-init.41d0b96b27f3c8a73d6359aca07f13eefac1d3982246f5b19b01496c24037690 +#+mdevd.6705e49a158b45f548d5c9e7298f3280982ba896904d22b1785301932ce46f76 +#+s6-dns.bb8bc61599b5a80fe39cae1c4dd1cfba72daa585f7ee77699aaf8ffe19b97b97 +#+libressl.452bf416d8376e879ef68cff9773d676c7b5759b1fdff3bb995e8ee05046c0e9 +#+s6-networking.d803b1c0b34d863d9b8a1cf8735d79a95c8be0de798d3abd484f468ee53776af +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b +#+pthbs-banginstall.dbb97e40f20a650ef32de84f49e2e7ad4bbe769c227b2d02e5ea96acc44787db +#+aat.2128bbd670873ecb87e4a6cbce7be905beb182778eb6eac92f47b8574308a1ed +#+confz.7886f64397e19f97708d6a9a086961b1a85ee3159f9d817e15852cb706d4a3a8 +#+containers.82f02998cb518f3a1c47515b3db8d9adaee9f5bb2bdc681c6eee43bcfb57d050 +#+fileset.92f81d82f5c5291b0fe45bf3095eb241de1db84c859e345bd47db6fae85e07b4 +#+logincaps.fd2df0da0d022521c8ef73df90ddd85f7affdd378427b09dc6a05082b8f640ae +#+snaprep.2f77684b776e3b7e63de543f8ed35ac71521fa24962f3b432ba9dc0225c699ca +#+curl.af94b1b15ed51fec9541e761a1ba9fb8f74406201a22583227f04c90e6e3daf9 +#+git.12552778e1b84767e0be1e25c178e0c3d6ea9d02c9c092036884e46384bb2db2 +#+xbps.282e44bf4d6b4a1957bafc55ea526e35298377095d83216521c9e96a5e2a9963 +#+apk-tools.ad37b47b4eb47e8e61d7561a7b683a13fe94ff20bbd2673b44a610360b353c23 +#+getent.c36318388ba8844eaa4774eab3bffdda85ea405dd18160da532c84f4e1e33075 +#+getconf.b1dfe4055dc3255646b654ebaaba7885ff9889b4418d6c18a4bde4e24f10ac95 +#+iconv.3fcd8403c0967479f8ad915b5aedd8ad8f1b0dfb996008c4eb05d9c2341ecf0b +#+libcap.857c371bdd538ba921cbfd57afba2d2edfc6d1143eb64285385dd7a7ced1ea54 +#+applyuidgid-caps.cbb6c8bbdd67d806b3ae1aaccbeaac8f86be860c95cf99b567f75a3bf6b45ce4 +#+ccx-utils.a2885ae9b60defdb7f6287076f2df9998734e0a462b2c932c8002f6a7ae62603 +#+user-env.55f88acbaacbf0d6ebf2d248caebd8cf2e8fb9fbc0a7513d1c79b11d8291ae05 +#+strace.b3d6cb60548fcd1fae8c2214421655c5112f1f56a063e20e0371b80d6adf4042 +#+mlog.4deacf22aa7e8fc24c50d361799f4a1e83d0d475603f2a9f300c361e4e2135d2 +#+system-config.faf2c7c191a555a7affcdf7dc4d56f3dbeabfca20b03f0bf7863225d4c683ebe +#+system-config-rc.f64a768b6bf91e27c158f3c4f8049d4a222364b9c970488056e42b3f6e9b97f0 +#+system-config-scripts.719207c6ec679e69633e9a4cb291953d31676e60b14a721151ecc0877c3c9be7 +#+system-config-init.c8479eb479a2ad8c721a80f33f3c45c90cf6680cfb5c1e478dde4d8528356adf +#+system-config-zsh.40c16a1c45f763387c95c5552eea77eea0b20cebbb24d1a0685de762bddc8be0+ \ No newline at end of file diff --git a/variants/root-x86_64/diffutils b/variants/root-x86_64/diffutils @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. @@ -106,7 +106,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp @@ -1,17 +1,17 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de -#+patch.25b984e8ff99f7a5947a292dc3e93e47267a22d5fea8fd87625b8490b1716b0d -#+flex.08bfdd6921a0b95c720d067c85006daca6cc9ae3bc582399a05d02ccfe0af4bb -#+bison.c93caecb278b5de0c40a62b0db11b5d6d8c9f3245dffff8e704b657838988e64 -#+libseccomp.fa902f7a4afeb25999120cde723f8414c261d0324c03739bb6772f1d97cc1e03 -#+error-standalone.310a632f6012ec78febb99e3347e3d919d470bbbb76159acc0c0ded2070dbd2d -#+argp-standalone.f0d43a1152f9c6cd6f3775f608cd8c819ee323022a60d12a08e34447e135808e +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b +#+patch.f50b958c0a9c92d6ecc6444647f5aa96562644bab1d10700d7a0278eaed0f2a7 +#+flex.4e8f2dc4075608eddd783f20d0394c1babd17b3a5df35601008c17e818a9876f +#+bison.b98170c7c5f25f476d71c04acf774db8dde7a08663d859e87cb0c7cbe345ab9a +#+libseccomp.c0332dc0f85a157f763cb7cf9784e3323882984ddb14ecd2b0117152ac1e7896 +#+error-standalone.caa1d8410e2b8212a202ce6beb688aab7e1e5911d0c1501e69f8b0febbd774ea +#+argp-standalone.22380c7c0feac2ec48d8ea587e5f9e273bf57c5cc2b785cb7551e62ad8e1d787 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp @@ -111,7 +111,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:. @@ -61,7 +61,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline @@ -20,7 +20,7 @@ cd 'execline' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622/sysdeps' \ + --with-sysdeps='/versions/skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -72,7 +72,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 -#+pthbs-banginstall.03c21a68212dceab1d32648c357ac5a54dd0f8a32bdbc4096be43f5f83d4e112 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b +#+pthbs-banginstall.dbb97e40f20a650ef32de84f49e2e7ad4bbe769c227b2d02e5ea96acc44787db #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset @@ -71,7 +71,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/findutils b/variants/root-x86_64/findutils @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:. @@ -115,7 +115,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/flex b/variants/root-x86_64/flex @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. @@ -110,7 +110,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c @@ -74,7 +74,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c @@ -74,7 +74,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de -#+libressl.8937d3785f0dcacc7501cbcd3dcee7f402d52e4932a9ed50837f00162a93ae5c -#+curl.bce081159f80fe5c9162e6419f96d6b60783deb4e0d58b374797dba590d74e52 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b +#+libressl.452bf416d8376e879ef68cff9773d676c7b5759b1fdff3bb995e8ee05046c0e9 +#+curl.af94b1b15ed51fec9541e761a1ba9fb8f74406201a22583227f04c90e6e3daf9 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. @@ -85,7 +85,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/gnu-make b/variants/root-x86_64/gnu-make @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.e8491664984e42d3397bbaafe44057c5b8aefdbe708a91acef331c4bcc3b90a8 -#+busybox.8d31de4bbd63c77b80d66e932d3b8465e91fa53f5f2451ca8d182e649945f672 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.f61ed1f2e8a7ae0c037fdcee9c08195872c2f00242b3457e872678b5cd273886 +#+busybox.5e01885d9a22ec536126310d0e54ef31c15af4332111d74eabdf578a3788a693 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. @@ -101,7 +101,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/gnu-make:bootstrap b/variants/root-x86_64/gnu-make:bootstrap @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.ca6ebbfaa2cd42b4edd81db03a6ef0364841589e0de1dabdf31c2dd97aad75be +#+musl-cross-make.ce940a4988a25f86e589f70e17f077daf441092d21ae22c67325e869acd879cc #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:. @@ -36,7 +36,7 @@ cd 'make-4.4.1' -mcm=/versions/musl-cross-make.ca6ebbfaa2cd42b4edd81db03a6ef0364841589e0de1dabdf31c2dd97aad75be +mcm=/versions/musl-cross-make.ce940a4988a25f86e589f70e17f077daf441092d21ae22c67325e869acd879cc export PATH="$mcm/bin:$PATH" export CC="$mcm/bin/x86_64-linux-musl-gcc" @@ -87,7 +87,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:. @@ -103,7 +103,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c @@ -74,7 +74,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/kbd b/variants/root-x86_64/kbd @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. @@ -109,7 +109,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/kernel.environment b/variants/root-x86_64/kernel.environment @@ -1,3 +1,3 @@ #!/usr/bin/env pthbs-build -#+linux.9b34bb4ddcc3c62a84044d57212a9009834ba5e699b293c68ba9f3150b465b49 -#+busybox.c6a2ffb6dccfad438916b8f0f8f28c201b1cca249f557ab3ecb96d3dd18b4f83- \ No newline at end of file +#+linux.1677188d47bf55c95de557bb9a61487ce483db140b7f5fd6df24dcd0fe1021aa +#+busybox.65de38ebbd95fae4bca180780ca6a4105871fe5ba1ac78b4e54cca7ad950e794+ \ No newline at end of file diff --git a/variants/root-x86_64/libarchive b/variants/root-x86_64/libarchive @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:. @@ -108,7 +108,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de -#+libmd.3f1b8aad30da51131b9429ba9196b4db3bdf78121f405c868b4cbe877f38e495 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b +#+libmd.9163779a3aa25f75b406d857fffb54b96df04c9c71ad1dce64e24109c809bdeb #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:. @@ -104,7 +104,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+pkgconf-pkg-config.08a039239431e2258a55fb75f79700c49900da61f0a8a85665bfc6831b7ee225 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+pkgconf-pkg-config.9de0da77a4cb8781fef70a2a7d4cece68f908ed43fa545504badbc3a0a8f93bd #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. @@ -99,7 +99,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de -#+flex.08bfdd6921a0b95c720d067c85006daca6cc9ae3bc582399a05d02ccfe0af4bb -#+bison.c93caecb278b5de0c40a62b0db11b5d6d8c9f3245dffff8e704b657838988e64 -#+musl-fts.2891bc69f70591d6b84a20b4a62d2dff91c7b2b1bc8ab7ea88a2cafb6ec6a67f +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b +#+flex.4e8f2dc4075608eddd783f20d0394c1babd17b3a5df35601008c17e818a9876f +#+bison.b98170c7c5f25f476d71c04acf774db8dde7a08663d859e87cb0c7cbe345ab9a +#+musl-fts.4198f85ee04fce8e87246f1d6fbe1573cb5735aadf8dd3d46fab55ae9b1dee61 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. @@ -108,7 +108,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+zstd.e93db0a4cfbbf41f96814ef6d3b312631b3cc387dac4b6fbe7d92510a77464e8 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+zstd.eaa0d132827836777d5cbdee8aa5510277e6ad44c798cfbe638619de3053d06d #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf @@ -80,7 +80,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/libmd b/variants/root-x86_64/libmd @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:. @@ -104,7 +104,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de -#+ca-certificates-wip-donotuse.8cf56c65f77afc64f32664a584033161aca1ad71a3ec6dc6d394fc58e5c8b264 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b +#+ca-certificates-wip-donotuse.618d99bca8aec842d837ceef00e6e8d9775fed818c5230e1c239687f37117936 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. @@ -73,7 +73,7 @@ make DESTDIR="$pthbs_destdir" install cd .. gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto -cp -vs '/versions/ca-certificates-wip-donotuse.8cf56c65f77afc64f32664a584033161aca1ad71a3ec6dc6d394fc58e5c8b264/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/versions/ca-certificates-wip-donotuse.618d99bca8aec842d837ceef00e6e8d9775fed818c5230e1c239687f37117936/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" ./c_rehash "$pthbs_destdir/$prefix/config/ssl/certs/" cd "$pthbs_destdir/$prefix/config/ssl/" mv cert.pem libressl-cert.pem @@ -131,7 +131,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/libretls b/variants/root-x86_64/libretls @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-z:sha256:3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5:. @@ -107,7 +107,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de -#+pkgconf-pkg-config.08a039239431e2258a55fb75f79700c49900da61f0a8a85665bfc6831b7ee225 -#+gperf.b813e7a054fc666381322d35ea54f3d5d72c9163fba978ddf7f8fe49ee29b8b3 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b +#+pkgconf-pkg-config.9de0da77a4cb8781fef70a2a7d4cece68f908ed43fa545504badbc3a0a8f93bd +#+gperf.de9a475ae23c353322e816a55354b0aad8aa70a4535d2c0ade9d0cef1cacbc77 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:. @@ -109,7 +109,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:. @@ -109,7 +109,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-modutils.0812e77d2a9b693333cb5747e94ea6ea595952bcad95712aebe09af73291149f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+findutils.1004928c66cdc610904bfeefd20b297eeb7624d2ea90bb1b584a34ee1f712e80 -#+diffutils.c6da5c38b727d5efb2ba5d2be7da73f3c01b9e024dccea2542a9e829b9a6532a -#+patch.25b984e8ff99f7a5947a292dc3e93e47267a22d5fea8fd87625b8490b1716b0d -#+flex.08bfdd6921a0b95c720d067c85006daca6cc9ae3bc582399a05d02ccfe0af4bb -#+bison.c93caecb278b5de0c40a62b0db11b5d6d8c9f3245dffff8e704b657838988e64 -#+rsync.80c7d5df6da1dff4a4c76a08a26488117bb589bfe3252863a07459eebdc2df97 -#+zstd.e93db0a4cfbbf41f96814ef6d3b312631b3cc387dac4b6fbe7d92510a77464e8 -#+libelf.014dcdeaf3576b2f2555d1be7c3ed1b08cc0f8cac19f8615c135f47b1fe99af2 -#+pkgconf-pkg-config.08a039239431e2258a55fb75f79700c49900da61f0a8a85665bfc6831b7ee225 -#+nawk.e1fac420282f395b24353ae0989a34f026c69d207ecf2a2f06cd1c1dec994b0c +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-modutils.fa6225906e8a078ad38ded817fb4c7e31000e10e187f18e1b452bcf9eac70e48 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+findutils.35df3fe4bf14cbc3b5c1dadc9e7c2e062e2a0e34c1fd9b5813aa2122a72414b5 +#+diffutils.5f8ecd5d2ac078380d43957b81597c624db7cc6feae350bf5c73e4a39d4c6693 +#+patch.f50b958c0a9c92d6ecc6444647f5aa96562644bab1d10700d7a0278eaed0f2a7 +#+flex.4e8f2dc4075608eddd783f20d0394c1babd17b3a5df35601008c17e818a9876f +#+bison.b98170c7c5f25f476d71c04acf774db8dde7a08663d859e87cb0c7cbe345ab9a +#+rsync.7f08aef6edd932e613f2be88f076bad9673293e2efa3dc6d23bed1bc64b16b34 +#+zstd.eaa0d132827836777d5cbdee8aa5510277e6ad44c798cfbe638619de3053d06d +#+libelf.080ab14235f5d18a09dbea0cf93636e4fd6a3cafa10f3e938d71d7f78d24bf2b +#+pkgconf-pkg-config.9de0da77a4cb8781fef70a2a7d4cece68f908ed43fa545504badbc3a0a8f93bd +#+nawk.5ce7155c39144755e6216ce341e0fd45e61cc0ad50538dbb7361aef89cf57108 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config @@ -107,7 +107,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-modutils.0812e77d2a9b693333cb5747e94ea6ea595952bcad95712aebe09af73291149f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+findutils.1004928c66cdc610904bfeefd20b297eeb7624d2ea90bb1b584a34ee1f712e80 -#+diffutils.c6da5c38b727d5efb2ba5d2be7da73f3c01b9e024dccea2542a9e829b9a6532a -#+patch.25b984e8ff99f7a5947a292dc3e93e47267a22d5fea8fd87625b8490b1716b0d -#+flex.08bfdd6921a0b95c720d067c85006daca6cc9ae3bc582399a05d02ccfe0af4bb -#+bison.c93caecb278b5de0c40a62b0db11b5d6d8c9f3245dffff8e704b657838988e64 -#+rsync.80c7d5df6da1dff4a4c76a08a26488117bb589bfe3252863a07459eebdc2df97 -#+zstd.e93db0a4cfbbf41f96814ef6d3b312631b3cc387dac4b6fbe7d92510a77464e8 -#+libelf.014dcdeaf3576b2f2555d1be7c3ed1b08cc0f8cac19f8615c135f47b1fe99af2 -#+pkgconf-pkg-config.08a039239431e2258a55fb75f79700c49900da61f0a8a85665bfc6831b7ee225 -#+nawk.e1fac420282f395b24353ae0989a34f026c69d207ecf2a2f06cd1c1dec994b0c +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-modutils.fa6225906e8a078ad38ded817fb4c7e31000e10e187f18e1b452bcf9eac70e48 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+findutils.35df3fe4bf14cbc3b5c1dadc9e7c2e062e2a0e34c1fd9b5813aa2122a72414b5 +#+diffutils.5f8ecd5d2ac078380d43957b81597c624db7cc6feae350bf5c73e4a39d4c6693 +#+patch.f50b958c0a9c92d6ecc6444647f5aa96562644bab1d10700d7a0278eaed0f2a7 +#+flex.4e8f2dc4075608eddd783f20d0394c1babd17b3a5df35601008c17e818a9876f +#+bison.b98170c7c5f25f476d71c04acf774db8dde7a08663d859e87cb0c7cbe345ab9a +#+rsync.7f08aef6edd932e613f2be88f076bad9673293e2efa3dc6d23bed1bc64b16b34 +#+zstd.eaa0d132827836777d5cbdee8aa5510277e6ad44c798cfbe638619de3053d06d +#+libelf.080ab14235f5d18a09dbea0cf93636e4fd6a3cafa10f3e938d71d7f78d24bf2b +#+pkgconf-pkg-config.9de0da77a4cb8781fef70a2a7d4cece68f908ed43fa545504badbc3a0a8f93bd +#+nawk.5ce7155c39144755e6216ce341e0fd45e61cc0ad50538dbb7361aef89cf57108 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch @@ -105,7 +105,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 -#+pthbs-banginstall.03c21a68212dceab1d32648c357ac5a54dd0f8a32bdbc4096be43f5f83d4e112 -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+ccx-utils.02e5e9ea91364fa46227ef8b91f79cbde94f89216c5cfaf1d02e4d44942c2807 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b +#+pthbs-banginstall.dbb97e40f20a650ef32de84f49e2e7ad4bbe769c227b2d02e5ea96acc44787db +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+ccx-utils.a2885ae9b60defdb7f6287076f2df9998734e0a462b2c932c8002f6a7ae62603 #@git:52261504e78293b651e73a518834c5c75d0b3bf6:logincaps @@ -103,7 +103,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/m4 b/variants/root-x86_64/m4 @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:. @@ -103,7 +103,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 -#+pthbs-banginstall.03c21a68212dceab1d32648c357ac5a54dd0f8a32bdbc4096be43f5f83d4e112 +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b +#+pthbs-banginstall.dbb97e40f20a650ef32de84f49e2e7ad4bbe769c227b2d02e5ea96acc44787db #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts @@ -48,7 +48,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622 -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd @@ -21,7 +21,7 @@ cd 'mdevd' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622/sysdeps' \ + --with-sysdeps='/versions/skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -65,7 +65,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+s6.306b870f8a592df29be4fb55361fa57aa0ca47f0eae4c7fade76fb3d621d174a -#+mdev-scripts.648dac73de3d82ef096ef94eade41517f175c85c52b365448020925e8a8a7bef -#+mdevd.1bccea6d481d077964a03f9afc681b0bdcd7ed93383de4d5abef9cd0c1e8bb63- \ No newline at end of file +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 +#+s6.752370fc6972898e9ddfe3af776a82caaf9295467ea3dbd5091bd207745ef746 +#+mdev-scripts.4378c91f414f7b65872deb554fdb6c263ff99094167030aa44213e5e89c27c8f +#+mdevd.6705e49a158b45f548d5c9e7298f3280982ba896904d22b1785301932ce46f76+ \ No newline at end of file diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog @@ -75,7 +75,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/musl-cross-make b/variants/root-x86_64/musl-cross-make @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+musl-cross-make.ca6ebbfaa2cd42b4edd81db03a6ef0364841589e0de1dabdf31c2dd97aad75be -#+gnu-make.e8491664984e42d3397bbaafe44057c5b8aefdbe708a91acef331c4bcc3b90a8 -#+busybox.8d31de4bbd63c77b80d66e932d3b8465e91fa53f5f2451ca8d182e649945f672 +#+musl-cross-make.ce940a4988a25f86e589f70e17f077daf441092d21ae22c67325e869acd879cc +#+gnu-make.f61ed1f2e8a7ae0c037fdcee9c08195872c2f00242b3457e872678b5cd273886 +#+busybox.5e01885d9a22ec536126310d0e54ef31c15af4332111d74eabdf578a3788a693 #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -135,7 +135,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/musl-cross-make:bootstrap-0 b/variants/root-x86_64/musl-cross-make:bootstrap-0 @@ -84,7 +84,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/musl-cross-make:bootstrap-1 b/variants/root-x86_64/musl-cross-make:bootstrap-1 @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #@pragma:nosandbox #@pragma:nopath -#+musl-cross-make.6f14b5cf1ac58392ea6c27c58a55cfe6500e14b05e7a5db3b04da18f211009b8 +#+musl-cross-make.c1abb005a40ad14ca40f4f457d44d86d573a5fb523d17af4288cc855e571e078 #@sha256:ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf:musl-cross-make/sources/binutils-2.33.1.tar.xz #@sha256:75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3:musl-cross-make/sources/config.sub #@sha256:d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b:musl-cross-make/sources/gcc-11.2.0.tar.xz @@ -18,7 +18,7 @@ prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd '.' -bootstrap=/versions/musl-cross-make.6f14b5cf1ac58392ea6c27c58a55cfe6500e14b05e7a5db3b04da18f211009b8 +bootstrap=/versions/musl-cross-make.c1abb005a40ad14ca40f4f457d44d86d573a5fb523d17af4288cc855e571e078 "$bootstrap/bin/x86_64-linux-musl-gcc" --version # For validating the compiler @@ -93,7 +93,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. @@ -103,7 +103,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/nawk b/variants/root-x86_64/nawk @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+bison.c93caecb278b5de0c40a62b0db11b5d6d8c9f3245dffff8e704b657838988e64 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+bison.b98170c7c5f25f476d71c04acf774db8dde7a08663d859e87cb0c7cbe345ab9a +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:. @@ -54,7 +54,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/netbsd-curses b/variants/root-x86_64/netbsd-curses @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses @@ -67,7 +67,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/openssl b/variants/root-x86_64/openssl @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 #@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. @@ -67,7 +67,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/patch b/variants/root-x86_64/patch @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. @@ -104,7 +104,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/patchelf:bootstrap b/variants/root-x86_64/patchelf:bootstrap @@ -98,7 +98,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:. @@ -105,7 +105,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/pkgconf-pkg-config b/variants/root-x86_64/pkgconf-pkg-config @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+pkgconf.59c1e774836615dd0d3d2b45691a2155fc5db53d9dc0bae122c3acb4b33408ef +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+pkgconf.1abf1befda115a5ddadeb4de72a6682b1a6414ff750a167e060528f03728955f mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/popt b/variants/root-x86_64/popt @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. @@ -103,7 +103,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/pthbs-banginstall b/variants/root-x86_64/pthbs-banginstall @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall @@ -49,7 +49,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de -#+nawk.e1fac420282f395b24353ae0989a34f026c69d207ecf2a2f06cd1c1dec994b0c -#+popt.703053a37e8308e67d8491a7a780b3d3f1924dd8653af22f4c38c828fd85e5ef -#+libressl.8937d3785f0dcacc7501cbcd3dcee7f402d52e4932a9ed50837f00162a93ae5c -#+zstd.e93db0a4cfbbf41f96814ef6d3b312631b3cc387dac4b6fbe7d92510a77464e8 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b +#+nawk.5ce7155c39144755e6216ce341e0fd45e61cc0ad50538dbb7361aef89cf57108 +#+popt.8a27900d61a71394ca122de7a3d63f67cc90d1203d75812f6d986c61a1c08b23 +#+libressl.452bf416d8376e879ef68cff9773d676c7b5759b1fdff3bb995e8ee05046c0e9 +#+zstd.eaa0d132827836777d5cbdee8aa5510277e6ad44c798cfbe638619de3053d06d #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. @@ -113,7 +113,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6 @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622 -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 @@ -21,7 +21,7 @@ cd 's6' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622/sysdeps' \ + --with-sysdeps='/versions/skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -65,7 +65,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/s6-dns b/variants/root-x86_64/s6-dns @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns @@ -20,7 +20,7 @@ cd 's6-dns' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622/sysdeps' \ + --with-sysdeps='/versions/skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -64,7 +64,7 @@ $2 == "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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/s6-linux-init b/variants/root-x86_64/s6-linux-init @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622 -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+s6.306b870f8a592df29be4fb55361fa57aa0ca47f0eae4c7fade76fb3d621d174a +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 +#+s6.752370fc6972898e9ddfe3af776a82caaf9295467ea3dbd5091bd207745ef746 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init @@ -22,7 +22,7 @@ cd 's6-linux-init' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622/sysdeps' \ + --with-sysdeps='/versions/skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -66,7 +66,7 @@ $2 == "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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/s6-linux-utils b/variants/root-x86_64/s6-linux-utils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils @@ -20,7 +20,7 @@ cd 's6-linux-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622/sysdeps' \ + --with-sysdeps='/versions/skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -64,7 +64,7 @@ $2 == "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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking @@ -1,14 +1,14 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622 -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+s6.306b870f8a592df29be4fb55361fa57aa0ca47f0eae4c7fade76fb3d621d174a -#+s6-dns.2e5dd1eedae77199fdcedb89c5058d437fb398a140684202a651ee7072f843c9 -#+libressl.8937d3785f0dcacc7501cbcd3dcee7f402d52e4932a9ed50837f00162a93ae5c +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 +#+s6.752370fc6972898e9ddfe3af776a82caaf9295467ea3dbd5091bd207745ef746 +#+s6-dns.bb8bc61599b5a80fe39cae1c4dd1cfba72daa585f7ee77699aaf8ffe19b97b97 +#+libressl.452bf416d8376e879ef68cff9773d676c7b5759b1fdff3bb995e8ee05046c0e9 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking @@ -24,7 +24,7 @@ cd 's6-networking' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622/sysdeps' \ + --with-sysdeps='/versions/skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -73,7 +73,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/s6-portable-utils b/variants/root-x86_64/s6-portable-utils @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils @@ -20,7 +20,7 @@ cd 's6-portable-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622/sysdeps' \ + --with-sysdeps='/versions/skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -64,7 +64,7 @@ $2 == "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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/s6-rc b/variants/root-x86_64/s6-rc @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622 -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+s6.306b870f8a592df29be4fb55361fa57aa0ca47f0eae4c7fade76fb3d621d174a +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 +#+s6.752370fc6972898e9ddfe3af776a82caaf9295467ea3dbd5091bd207745ef746 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc @@ -22,7 +22,7 @@ cd 's6-rc' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.2f165e1cc06c730f7cb13d7cdcca3c7f4605b4548b5c284b3b8b9ab66d50e622/sysdeps' \ + --with-sysdeps='/versions/skalibs.3cb76b73059172dcf2511865d784bd387843c0b1ecd29f77b76f582f8040d09b/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ @@ -66,7 +66,7 @@ $2 == "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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/skalibs b/variants/root-x86_64/skalibs @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs @@ -66,7 +66,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 -#+pthbs-banginstall.03c21a68212dceab1d32648c357ac5a54dd0f8a32bdbc4096be43f5f83d4e112 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b +#+pthbs-banginstall.dbb97e40f20a650ef32de84f49e2e7ad4bbe769c227b2d02e5ea96acc44787db #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep @@ -70,7 +70,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de -#+patch.25b984e8ff99f7a5947a292dc3e93e47267a22d5fea8fd87625b8490b1716b0d -#+libunwind.a2e1ee2b3ef06cc35e447a27a4a4bbbe138eb8a749fd8aec07d768437dd90b08 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b +#+patch.f50b958c0a9c92d6ecc6444647f5aa96562644bab1d10700d7a0278eaed0f2a7 +#+libunwind.e4ec8154d9f262f7a2b0e2f3d96d3dca495a063b203603c6d0491daef56ae946 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. @@ -112,7 +112,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -1,21 +1,21 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+diffutils.c6da5c38b727d5efb2ba5d2be7da73f3c01b9e024dccea2542a9e829b9a6532a -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+aat.5a89398ac400dae8001f1dc5a9f6985725031680d80479de3e0c8f0df5e3a8a6 -#+fileset.ecc4de9de12b9899c248dfb9489237b78aa7fbc41ef37e17e818fe72af8d5a1e -#+rsync.80c7d5df6da1dff4a4c76a08a26488117bb589bfe3252863a07459eebdc2df97 -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+kbd.7398e467f358ea7054216df63b9cdc33113eb2ac6158d581591ba1e38fd99a05 -#+mdevd.1bccea6d481d077964a03f9afc681b0bdcd7ed93383de4d5abef9cd0c1e8bb63 -#+s6-linux-utils.e4f5091500532a84cf1d68cf4df5be3b704001d361b04e095e2ab84a1f95d5f7 -#+s6-rc.ecb2d1c093f53f53f75b156f0c35b9c6294af4ab33fee572c9d2acef6f00ebdd -#+s6.306b870f8a592df29be4fb55361fa57aa0ca47f0eae4c7fade76fb3d621d174a -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 -#+system-config-scripts.97f2fd113bc99e2cf0ed333678567c348af9a90b64c1b8ef68a808a57919314f -#+logincaps.4d3b3b039757c80c41631ce703bcc807012dc04cd1208df78affb27855094c27 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+diffutils.5f8ecd5d2ac078380d43957b81597c624db7cc6feae350bf5c73e4a39d4c6693 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+aat.2128bbd670873ecb87e4a6cbce7be905beb182778eb6eac92f47b8574308a1ed +#+fileset.92f81d82f5c5291b0fe45bf3095eb241de1db84c859e345bd47db6fae85e07b4 +#+rsync.7f08aef6edd932e613f2be88f076bad9673293e2efa3dc6d23bed1bc64b16b34 +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 +#+kbd.303f1e02ecb01abba6829ce7095d28504b66686702bb3b1e94540f2c38b3ce9d +#+mdevd.6705e49a158b45f548d5c9e7298f3280982ba896904d22b1785301932ce46f76 +#+s6-linux-utils.b54e237d22d0b22e7cff9be08223cf750b10bd1ffbf7c20632209bc221536f26 +#+s6-rc.ae4640d2f840b2e4237e11bf96cfcf0bcf09bef3668f6f506f644c2300cb80a0 +#+s6.752370fc6972898e9ddfe3af776a82caaf9295467ea3dbd5091bd207745ef746 +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b +#+system-config-scripts.719207c6ec679e69633e9a4cb291953d31676e60b14a721151ecc0877c3c9be7 +#+logincaps.fd2df0da0d022521c8ef73df90ddd85f7affdd378427b09dc6a05082b8f640ae #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config @@ -51,8 +51,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.1ac41d4d874d18bc405c1c1ab1f0b318fac4c416f922cd371f421425bef1eeb1' \ - 'pthbs_path_mdevd=/versions/env.88c87b81baa2869c9d908cf0b96e8fbb746f3f101e3b7a5b12a3d548753f0d74' \ + 'pthbs_path_containers=/versions/env.cdc692fa278e71bc992f3020e5c98978880f93d4334adb2ac5d8804be71edd46' \ + 'pthbs_path_mdevd=/versions/env.3960977e2919812a45719907f7f80b79c6432940c78110ee213f289f4095014f' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do @@ -112,7 +112,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+s6.306b870f8a592df29be4fb55361fa57aa0ca47f0eae4c7fade76fb3d621d174a -#+s6-rc.ecb2d1c093f53f53f75b156f0c35b9c6294af4ab33fee572c9d2acef6f00ebdd -#+s6-portable-utils.4d82247fe3c1350dfe9e4fc89f2f17c7458acc78e2856a10d9554c17c2ce6cd3 -#+s6-linux-init.96d69d113f1b0d8549ee3d0a40c96721f5600be1c29f7c4a5baa0eb1c7419baf -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+system-config-rc.fca674fad7bbd87b264b2bd15306bc1f575295770ccc81c177da82cd68fd1ffe +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+s6.752370fc6972898e9ddfe3af776a82caaf9295467ea3dbd5091bd207745ef746 +#+s6-rc.ae4640d2f840b2e4237e11bf96cfcf0bcf09bef3668f6f506f644c2300cb80a0 +#+s6-portable-utils.2d847e737311622d8e8265a6c67ce20a3f2c7b8bcee84b01fc2c35dd65ff3791 +#+s6-linux-init.41d0b96b27f3c8a73d6359aca07f13eefac1d3982246f5b19b01496c24037690 +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 +#+system-config-rc.f64a768b6bf91e27c158f3c4f8049d4a222364b9c970488056e42b3f6e9b97f0 # - build script start - @@ -30,7 +30,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/versions/system-config-rc.fca674fad7bbd87b264b2bd15306bc1f575295770ccc81c177da82cd68fd1ffe/config/s6-rc-db +s6rcdb=/versions/system-config-rc.f64a768b6bf91e27c158f3c4f8049d4a222364b9c970488056e42b3f6e9b97f0/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//versions" @@ -174,7 +174,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc @@ -1,11 +1,11 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+s6-rc.ecb2d1c093f53f53f75b156f0c35b9c6294af4ab33fee572c9d2acef6f00ebdd -#+fileset.ecc4de9de12b9899c248dfb9489237b78aa7fbc41ef37e17e818fe72af8d5a1e -#+system-config.9a1d8f8163f1eab41a2ff9c62bc32589ca519afbdddd57a4a365343246fe9ef3 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+s6-rc.ae4640d2f840b2e4237e11bf96cfcf0bcf09bef3668f6f506f644c2300cb80a0 +#+fileset.92f81d82f5c5291b0fe45bf3095eb241de1db84c859e345bd47db6fae85e07b4 +#+system-config.faf2c7c191a555a7affcdf7dc4d56f3dbeabfca20b03f0bf7863225d4c683ebe # - build script start - @@ -14,7 +14,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/versions/system-config.9a1d8f8163f1eab41a2ff9c62bc32589ca519afbdddd57a4a365343246fe9ef3/config/s6-rc-source +src=/versions/system-config.faf2c7c191a555a7affcdf7dc4d56f3dbeabfca20b03f0bf7863225d4c683ebe/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" @@ -51,7 +51,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/system-config-scripts b/variants/root-x86_64/system-config-scripts @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 -#+pthbs-banginstall.03c21a68212dceab1d32648c357ac5a54dd0f8a32bdbc4096be43f5f83d4e112 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b +#+pthbs-banginstall.dbb97e40f20a650ef32de84f49e2e7ad4bbe769c227b2d02e5ea96acc44787db #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts @@ -70,7 +70,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/system-config-zsh b/variants/root-x86_64/system-config-zsh @@ -1,8 +1,8 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh @@ -47,7 +47,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+pthbs-banginstall.03c21a68212dceab1d32648c357ac5a54dd0f8a32bdbc4096be43f5f83d4e112 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 +#+pthbs-banginstall.dbb97e40f20a650ef32de84f49e2e7ad4bbe769c227b2d02e5ea96acc44787db #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env @@ -51,7 +51,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -1,40 +1,40 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+diffutils.c6da5c38b727d5efb2ba5d2be7da73f3c01b9e024dccea2542a9e829b9a6532a -#+patch.25b984e8ff99f7a5947a292dc3e93e47267a22d5fea8fd87625b8490b1716b0d -#+flex.08bfdd6921a0b95c720d067c85006daca6cc9ae3bc582399a05d02ccfe0af4bb -#+bison.c93caecb278b5de0c40a62b0db11b5d6d8c9f3245dffff8e704b657838988e64 -#+rsync.80c7d5df6da1dff4a4c76a08a26488117bb589bfe3252863a07459eebdc2df97 -#+execline.9477c5936f98f2d780814d35dbb1c5f408ea9b4e1bafc6117e00379dd6aa3769 -#+s6.306b870f8a592df29be4fb55361fa57aa0ca47f0eae4c7fade76fb3d621d174a -#+s6-rc.ecb2d1c093f53f53f75b156f0c35b9c6294af4ab33fee572c9d2acef6f00ebdd -#+s6-portable-utils.4d82247fe3c1350dfe9e4fc89f2f17c7458acc78e2856a10d9554c17c2ce6cd3 -#+s6-linux-utils.e4f5091500532a84cf1d68cf4df5be3b704001d361b04e095e2ab84a1f95d5f7 -#+s6-linux-init.96d69d113f1b0d8549ee3d0a40c96721f5600be1c29f7c4a5baa0eb1c7419baf -#+mdevd.1bccea6d481d077964a03f9afc681b0bdcd7ed93383de4d5abef9cd0c1e8bb63 -#+s6-dns.2e5dd1eedae77199fdcedb89c5058d437fb398a140684202a651ee7072f843c9 -#+libressl.8937d3785f0dcacc7501cbcd3dcee7f402d52e4932a9ed50837f00162a93ae5c -#+s6-networking.0b94b5c8ada80f843f862359c41e403f09288aa1483c412b09cfbf98813e9418 -#+zsh.54fe3f71b36a04596c49ed68f3672768dfb1fa457bc9119fff272597ff887635 -#+pthbs-banginstall.03c21a68212dceab1d32648c357ac5a54dd0f8a32bdbc4096be43f5f83d4e112 -#+aat.5a89398ac400dae8001f1dc5a9f6985725031680d80479de3e0c8f0df5e3a8a6 -#+confz.76415f9081e61265f1fbeb9734e2c474f3f8ca8c82cdf61abcbb1914f786e6cb -#+containers.9decf07ad14724d4a176e14bebeba182c776cd55f0ea1432099c4beec34cab3b -#+fileset.ecc4de9de12b9899c248dfb9489237b78aa7fbc41ef37e17e818fe72af8d5a1e -#+logincaps.4d3b3b039757c80c41631ce703bcc807012dc04cd1208df78affb27855094c27 -#+snaprep.e917df6685526517ebadb25b973ab11450146219be491a1aa74de59f6da7198c -#+curl.bce081159f80fe5c9162e6419f96d6b60783deb4e0d58b374797dba590d74e52 -#+git.02f97b28409221d77712c5bc4332234c0f368d7d300cad9e11d5038e4b4aab78 -#+xbps.85431302b073baea8affa1e2db18beef1527085fccf2ea337e992a6ad0add57e -#+apk-tools.3b13432e779174066e5f021a0f2c1b69ba49ef0c630d73cb3aaae0e7872bc0f3 -#+getent.c962311d698814220e6f5643bf960a8fb04fd1943924d87bab5af32bfdb72d48 -#+getconf.afb751b2e00fe710ebf86f569136160ed68b6120f7fe7545aeb8048713bfa24c -#+iconv.6d153b4567d630cfdd9f81956efa71f99e988100a632b2f86b634d11487bdd87 -#+libcap.18dd8d2de8334ba3bdb05211aae9e47cec2f252e28207151d9f086a84d8fbf2a -#+applyuidgid-caps.a766e9a3bc59fb6acc4468826dd0a7453ac4ed4c3f9fd33c63c6255e850ce29b -#+ccx-utils.02e5e9ea91364fa46227ef8b91f79cbde94f89216c5cfaf1d02e4d44942c2807 -#+user-env.d9f705e45905a235a71e8b3904a8c6db4f88ad60c6c1be98fdca2630ab67d92e -#+strace.b1b6f36c338b219b442b8d8845717028677bb12becac6ffbc785d8cd35770ae6 -#+mlog.c48f05cded0201d5691b18c8b0e9aff7519f56fe46f179be9a435b04882b5385- \ No newline at end of file +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+diffutils.5f8ecd5d2ac078380d43957b81597c624db7cc6feae350bf5c73e4a39d4c6693 +#+patch.f50b958c0a9c92d6ecc6444647f5aa96562644bab1d10700d7a0278eaed0f2a7 +#+flex.4e8f2dc4075608eddd783f20d0394c1babd17b3a5df35601008c17e818a9876f +#+bison.b98170c7c5f25f476d71c04acf774db8dde7a08663d859e87cb0c7cbe345ab9a +#+rsync.7f08aef6edd932e613f2be88f076bad9673293e2efa3dc6d23bed1bc64b16b34 +#+execline.3e59058ef60811b0517c0324b5112297c4c262cb5fd101e00d1be3948f4a7196 +#+s6.752370fc6972898e9ddfe3af776a82caaf9295467ea3dbd5091bd207745ef746 +#+s6-rc.ae4640d2f840b2e4237e11bf96cfcf0bcf09bef3668f6f506f644c2300cb80a0 +#+s6-portable-utils.2d847e737311622d8e8265a6c67ce20a3f2c7b8bcee84b01fc2c35dd65ff3791 +#+s6-linux-utils.b54e237d22d0b22e7cff9be08223cf750b10bd1ffbf7c20632209bc221536f26 +#+s6-linux-init.41d0b96b27f3c8a73d6359aca07f13eefac1d3982246f5b19b01496c24037690 +#+mdevd.6705e49a158b45f548d5c9e7298f3280982ba896904d22b1785301932ce46f76 +#+s6-dns.bb8bc61599b5a80fe39cae1c4dd1cfba72daa585f7ee77699aaf8ffe19b97b97 +#+libressl.452bf416d8376e879ef68cff9773d676c7b5759b1fdff3bb995e8ee05046c0e9 +#+s6-networking.d803b1c0b34d863d9b8a1cf8735d79a95c8be0de798d3abd484f468ee53776af +#+zsh.bbcf65748725729a2be3f114b88d94249182b33794f74c7f6038945002913c0b +#+pthbs-banginstall.dbb97e40f20a650ef32de84f49e2e7ad4bbe769c227b2d02e5ea96acc44787db +#+aat.2128bbd670873ecb87e4a6cbce7be905beb182778eb6eac92f47b8574308a1ed +#+confz.7886f64397e19f97708d6a9a086961b1a85ee3159f9d817e15852cb706d4a3a8 +#+containers.82f02998cb518f3a1c47515b3db8d9adaee9f5bb2bdc681c6eee43bcfb57d050 +#+fileset.92f81d82f5c5291b0fe45bf3095eb241de1db84c859e345bd47db6fae85e07b4 +#+logincaps.fd2df0da0d022521c8ef73df90ddd85f7affdd378427b09dc6a05082b8f640ae +#+snaprep.2f77684b776e3b7e63de543f8ed35ac71521fa24962f3b432ba9dc0225c699ca +#+curl.af94b1b15ed51fec9541e761a1ba9fb8f74406201a22583227f04c90e6e3daf9 +#+git.12552778e1b84767e0be1e25c178e0c3d6ea9d02c9c092036884e46384bb2db2 +#+xbps.282e44bf4d6b4a1957bafc55ea526e35298377095d83216521c9e96a5e2a9963 +#+apk-tools.ad37b47b4eb47e8e61d7561a7b683a13fe94ff20bbd2673b44a610360b353c23 +#+getent.c36318388ba8844eaa4774eab3bffdda85ea405dd18160da532c84f4e1e33075 +#+getconf.b1dfe4055dc3255646b654ebaaba7885ff9889b4418d6c18a4bde4e24f10ac95 +#+iconv.3fcd8403c0967479f8ad915b5aedd8ad8f1b0dfb996008c4eb05d9c2341ecf0b +#+libcap.857c371bdd538ba921cbfd57afba2d2edfc6d1143eb64285385dd7a7ced1ea54 +#+applyuidgid-caps.cbb6c8bbdd67d806b3ae1aaccbeaac8f86be860c95cf99b567f75a3bf6b45ce4 +#+ccx-utils.a2885ae9b60defdb7f6287076f2df9998734e0a462b2c932c8002f6a7ae62603 +#+user-env.55f88acbaacbf0d6ebf2d248caebd8cf2e8fb9fbc0a7513d1c79b11d8291ae05 +#+strace.b3d6cb60548fcd1fae8c2214421655c5112f1f56a063e20e0371b80d6adf4042 +#+mlog.4deacf22aa7e8fc24c50d361799f4a1e83d0d475603f2a9f300c361e4e2135d2+ \ No newline at end of file diff --git a/variants/root-x86_64/vm.environment b/variants/root-x86_64/vm.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+linux-qemu-guest.6f8a93fcc1fd1d10225d48d48a515c22b8186b09890a043c37037ff644644bd1- \ No newline at end of file +#+linux-qemu-guest.2f570099bc62bacff2e0b293ea1c6848f551a5ac2787c423adab09e85ce05172+ \ No newline at end of file diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+libarchive.ac5b083d21a252b472bc005b49342a1c4e124df7c2744aaa581421beb5ee5257 -#+libressl.8937d3785f0dcacc7501cbcd3dcee7f402d52e4932a9ed50837f00162a93ae5c -#+pkgconf-pkg-config.08a039239431e2258a55fb75f79700c49900da61f0a8a85665bfc6831b7ee225 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+libarchive.41626143e1413e5660f18efe8bc9460a451a47e884c3e7af89bcfae9496d0745 +#+libressl.452bf416d8376e879ef68cff9773d676c7b5759b1fdff3bb995e8ee05046c0e9 +#+pkgconf-pkg-config.9de0da77a4cb8781fef70a2a7d4cece68f908ed43fa545504badbc3a0a8f93bd #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. @@ -107,7 +107,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh @@ -1,13 +1,13 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+m4.a4a0994bab3004809adbccfafe1efe1f82cbf88394c1b0c969d6f8b220ed98de -#+netbsd-curses.c2d3d21890c9d4349de15080f1541b60310e91dd965d5dfe3362e3c0dcf5ce18 -#+libbsd.6206fd98e8a4e90ed2a58ef9c6bc92551e5f23bc315e925e55c6e398b48aee4b +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+m4.73d135237c941d8143d243384c368be21233d3a0fef771962def92eb15c3e40b +#+netbsd-curses.60937a9c43098d44edf333e271770e11989b37539008c4cde2a6a63aefdd9b8e +#+libbsd.cba4b5f2f937549799240911bcb45f4f1281e0c9f05dfe70d831b72bffcf5811 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. @@ -130,7 +130,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next } diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd @@ -1,10 +1,10 @@ #!/usr/bin/env pthbs-build -#+busybox.f007943fa1aaf6ee6fea6eb140bd574e60d5c3f43dd528c79dae545a8f414688 -#+busybox-findutils.2be7468219ab20b601b4a4bb872b3f9f12baa05339a0cdd2e11a239900ee04f5 -#+busybox-awk.987b1984f1596ae0ebef041361e19ee9a9b5c87b31b743e96b91736995edbc7d -#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f -#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15 -#+busybox-diffutils.35f33fca69d8051d5d2884389635ffe316046e90b60f64901d3809f803003ee2 +#+busybox.b08c0111fbc8f5ba04a040c578b2649a7d77b83be76b26a2d128e7af61554b71 +#+busybox-findutils.28328aff114bd6a38574ae7f44c3245f193ddf0e9b629993aa45656670ab43b5 +#+busybox-awk.edd444df2839b425c781fd5370eb8215fd02ea23d2a31b691f341928ccd7997e +#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81 +#+gnu-make.e1f59e1987776008a08c9fe7ff91402ed39981e46614e7f4846429b4c41a7da7 +#+busybox-diffutils.1af6eb639a1c1aefbd93fc27cdd3e8b6f4c672d41978ebabb77c93ef0a02b345 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. @@ -80,7 +80,7 @@ $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 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next } $2 == "share" && $3 ~ /^(info|man|doc|icons|terminfo)$/ { link(r1($0)); next }