commit 562ab9f064b79cd39daa125fc8c1cc19ad401e2c
parent 760ff84870494551e3ba90404dfba6f42beca938
Author: Jan Pobříslo <ccx@te2000.cz>
Date: Thu, 22 Feb 2024 12:29:15 +0100
Fail on dynamic executables when we want static ones
Diffstat:
18 files changed, 111 insertions(+), 53 deletions(-)
diff --git a/packages/aat b/packages/aat
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.d412e2780c65f26026d948dbe252b503f25ed5ad260512d13983eb9211cb3b1a
-#+pthbs-banginstall.8519b2f608aefce201320e02ff249d2682c09bd9ffe2c24679bf965670c89299
+#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
+#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
#@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
: ${JOBS:=1}
diff --git a/packages/confz b/packages/confz
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.d412e2780c65f26026d948dbe252b503f25ed5ad260512d13983eb9211cb3b1a
-#+pthbs-banginstall.8519b2f608aefce201320e02ff249d2682c09bd9ffe2c24679bf965670c89299
+#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
+#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
#@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
: ${JOBS:=1}
diff --git a/packages/containers b/packages/containers
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.d412e2780c65f26026d948dbe252b503f25ed5ad260512d13983eb9211cb3b1a
-#+pthbs-banginstall.8519b2f608aefce201320e02ff249d2682c09bd9ffe2c24679bf965670c89299
+#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
+#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
#+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
#@git:e1e16c08f53d80d08f0ce9e405115fd650270e6b:containers
diff --git a/packages/core-system-conf b/packages/core-system-conf
@@ -1,9 +1,9 @@
#!/usr/bin/env pthbs-build
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+diffutils.59a2cfba235443cb1eead8ed5daa49cc2c715760303cb5fd327a76dd9f35d2cb
+#+diffutils.5da23a8b51bfaaf859e7be5155f686c24738e9cf8445bff5bef1fb54fa473eee
#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+aat.dac7e03c0094b2baceb86107ea28767c29f0d4f47199f345af67a68b6f5971b6
-#+fileset.53c8d430675a470c92c2e25a96ba3033e844896a4cd4f1a37f49f2eae85d2ab9
+#+aat.b308f6e6617455d6e0b547c4272b238d4d27af6ab9c82db7ec9d1e753198d056
+#+fileset.c79b59cf8321934bd9aead482751ab313fc18f2c771dc6a225e904b6d4c319dd
#@git:68c2ffd5f266f0c27e3d0b9038872088235659f5:core-system-conf
: ${JOBS:=1}
diff --git a/packages/core-system-init b/packages/core-system-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.e604cd8783990cd0ee387b6587f13ca703b1cb7c379604025b6f6b9cec010e42
#+s6-linux-init.e1efa661fba55d47641c4d9e25287ad4e1eb11a3fb356ba49c6e25fa00454f9f
#+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
-#+core-system-rc.7612bcf43eebe2a6c92a66b0a2d91cf7771f031916b7ffe5291c1847c673dbaf
+#+core-system-rc.962220db5c5405b23186ceb4d8ff2d53b12d8b5abfc8734e8f0cf8ff93d7891e
-s6rcdb=/home/ccx/versions/core-system-rc.7612bcf43eebe2a6c92a66b0a2d91cf7771f031916b7ffe5291c1847c673dbaf/s6-rc-db
+s6rcdb=/home/ccx/versions/core-system-rc.962220db5c5405b23186ceb4d8ff2d53b12d8b5abfc8734e8f0cf8ff93d7891e/s6-rc-db
prefix=/home/ccx/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/packages/core-system-rc b/packages/core-system-rc
@@ -2,10 +2,10 @@
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
#+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
#+s6-rc.857023dce97de954bcc54ae5e98fa6037d6ee735b11f5f9312bc98e22f88bb19
-#+fileset.53c8d430675a470c92c2e25a96ba3033e844896a4cd4f1a37f49f2eae85d2ab9
-#+core-system-conf.245243fa86deb404906a97fbd59ff1f4b497c017f6dc741d9bd86665984d17d3
+#+fileset.c79b59cf8321934bd9aead482751ab313fc18f2c771dc6a225e904b6d4c319dd
+#+core-system-conf.1daef6c1e4de7e238fcd9c8ebbe84fbffad0a2dcb566a1e4b51857f8612fc1d5
-conf=/home/ccx/versions/core-system-conf.245243fa86deb404906a97fbd59ff1f4b497c017f6dc741d9bd86665984d17d3/core-system-conf
+conf=/home/ccx/versions/core-system-conf.1daef6c1e4de7e238fcd9c8ebbe84fbffad0a2dcb566a1e4b51857f8612fc1d5/core-system-conf
prefix=/home/ccx/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
mkdir -p "$pkgdir/s6-rc-source"
diff --git a/packages/core-system-scripts b/packages/core-system-scripts
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.d412e2780c65f26026d948dbe252b503f25ed5ad260512d13983eb9211cb3b1a
-#+pthbs-banginstall.8519b2f608aefce201320e02ff249d2682c09bd9ffe2c24679bf965670c89299
+#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
+#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
#@git:98fabf6dffa7a3a7850f1797f557e181b7e8460f:core-system-scripts
: ${JOBS:=1}
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,7 +1,7 @@
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+diffutils.59a2cfba235443cb1eead8ed5daa49cc2c715760303cb5fd327a76dd9f35d2cb
+#+diffutils.5da23a8b51bfaaf859e7be5155f686c24738e9cf8445bff5bef1fb54fa473eee
#+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
#+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
#+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
@@ -15,16 +15,16 @@
#+mdevd.32195ae02573003700555ca2c0cda4b79c370d8d0c127b14890059ff82b550ac
#+s6-dns.d7819bac3ebafcb2b51b49b8b4fe141701341204271cb1b1de126d20f7b0d0af
#+s6-networking.fc977bc089cde121c95b471eed756105fc57c11ed0d169d2d59cfd48196912a8
-#+zsh.d412e2780c65f26026d948dbe252b503f25ed5ad260512d13983eb9211cb3b1a
-#+pthbs-banginstall.8519b2f608aefce201320e02ff249d2682c09bd9ffe2c24679bf965670c89299
-#+aat.dac7e03c0094b2baceb86107ea28767c29f0d4f47199f345af67a68b6f5971b6
-#+confz.368101c8900f90d8bf59acef5598267b959cc25da31467e2833b8a2906a6e18f
-#+containers.aa1f01b7e8b259d0741062d1810b6f40f0e8de9664c0c17068db258b24323440
-#+fileset.53c8d430675a470c92c2e25a96ba3033e844896a4cd4f1a37f49f2eae85d2ab9
-#+logincaps.92956247ee9e2c41db6f0d9d224291cf834068fb4fd944ee67f9c048e2885a02
-#+snaprep.f0c30481946d0ab3404518791e5790b1294ddd16dbe55354a8915e02ec96e3e4
-#+core-system-conf.245243fa86deb404906a97fbd59ff1f4b497c017f6dc741d9bd86665984d17d3
-#+core-system-rc.7612bcf43eebe2a6c92a66b0a2d91cf7771f031916b7ffe5291c1847c673dbaf
-#+core-system-scripts.fc242040077e92fe7c2a024bcee4459d580471947f88e22b7f051fe69c180a75
-#+core-system-init.73d35b07e1a29dc1fbeb5ca50e9aca0196020833156a7e2c66bfcbedaddec79a
-#+linux.12de11526aec3c18cf8c7231df2e0c12d84def3ad556589eaf1b2e821202a5ad-
\ No newline at end of file
+#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
+#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
+#+aat.b308f6e6617455d6e0b547c4272b238d4d27af6ab9c82db7ec9d1e753198d056
+#+confz.52ffbe07dff731f19e9422fa37b1297942edce177c3b417ba365ff2fbe3be7ec
+#+containers.d04d3cd58c6e80451df1b62e348c4aaa72f95e3b537f9a334a3ba2e73a21f327
+#+fileset.c79b59cf8321934bd9aead482751ab313fc18f2c771dc6a225e904b6d4c319dd
+#+logincaps.6f01393354c478d85e09e15a7f693839366e1b41a839c0f07936bc906a3903df
+#+snaprep.6bb16a48cfcf687090a1beadc86d3d372a653fd87e01ac9716b572e6968fe306
+#+core-system-conf.1daef6c1e4de7e238fcd9c8ebbe84fbffad0a2dcb566a1e4b51857f8612fc1d5
+#+core-system-rc.962220db5c5405b23186ceb4d8ff2d53b12d8b5abfc8734e8f0cf8ff93d7891e
+#+core-system-scripts.8072a7dae2b254cbec10683d37ab32cad3be3f97ff809f6957070bbab853cf89
+#+core-system-init.a06505a3bde3e537a1dc32d632c566d281841396388bd60df10f3395e457ee66
+#+linux.5aaf523258bd21174ef8a0c93e0e470b8b70e47b5e4af6b485580ee0a75727da+
\ No newline at end of file
diff --git a/packages/diffutils b/packages/diffutils
@@ -44,6 +44,21 @@ autotools() {
export LDFLAGS="-static"
autotools diffutils-3.10 --disable-nls --enable-static --disable-shared
+check_static() {
+ if ! test -f $pthbs_destdir/$1; then
+ printf '%s\n' "Error: file '$1' doesn't exist!"
+ exit 1
+ fi
+ interp_info=$(readelf --string-dump=.interp $pthbs_destdir/$1) || exit $?
+ if test x '!=' "x$interp_info"; then
+ printf '%s\n' "Error: '$1' is a dynamic binary!"
+ exit 1
+ fi
+}
+
+check_static command/diff
+
+
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
diff --git a/packages/fileset b/packages/fileset
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.d412e2780c65f26026d948dbe252b503f25ed5ad260512d13983eb9211cb3b1a
-#+pthbs-banginstall.8519b2f608aefce201320e02ff249d2682c09bd9ffe2c24679bf965670c89299
+#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
+#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
#@git:4cced2cb91b19ebb648b803cfdcc936148cd6f94:fileset
: ${JOBS:=1}
diff --git a/packages/linux b/packages/linux
@@ -2,7 +2,7 @@
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+diffutils.59a2cfba235443cb1eead8ed5daa49cc2c715760303cb5fd327a76dd9f35d2cb
+#+diffutils.5da23a8b51bfaaf859e7be5155f686c24738e9cf8445bff5bef1fb54fa473eee
#+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
#+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
#+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
diff --git a/packages/logincaps b/packages/logincaps
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.d412e2780c65f26026d948dbe252b503f25ed5ad260512d13983eb9211cb3b1a
-#+pthbs-banginstall.8519b2f608aefce201320e02ff249d2682c09bd9ffe2c24679bf965670c89299
+#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
+#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
#+execline.2b6771a97e608e8ea516f66a4a674b89756398b937095f8aaa4ae93a57361d1b
#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
#@git:b8c706e2a24a12ec3854d41e777e4b8840f98be2:logincaps
diff --git a/packages/pthbs-banginstall b/packages/pthbs-banginstall
@@ -1,6 +1,6 @@
#!/usr/bin/env pthbs-build
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.d412e2780c65f26026d948dbe252b503f25ed5ad260512d13983eb9211cb3b1a
+#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
#@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
installdir="$pthbs_destdir//home/ccx/versions/$pthbs_package"
diff --git a/packages/snaprep b/packages/snaprep
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.d412e2780c65f26026d948dbe252b503f25ed5ad260512d13983eb9211cb3b1a
-#+pthbs-banginstall.8519b2f608aefce201320e02ff249d2682c09bd9ffe2c24679bf965670c89299
+#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
+#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
#@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
: ${JOBS:=1}
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -1,7 +1,7 @@
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
#+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+diffutils.59a2cfba235443cb1eead8ed5daa49cc2c715760303cb5fd327a76dd9f35d2cb
+#+diffutils.5da23a8b51bfaaf859e7be5155f686c24738e9cf8445bff5bef1fb54fa473eee
#+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
#+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
#+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
@@ -15,15 +15,15 @@
#+mdevd.32195ae02573003700555ca2c0cda4b79c370d8d0c127b14890059ff82b550ac
#+s6-dns.d7819bac3ebafcb2b51b49b8b4fe141701341204271cb1b1de126d20f7b0d0af
#+s6-networking.fc977bc089cde121c95b471eed756105fc57c11ed0d169d2d59cfd48196912a8
-#+zsh.d412e2780c65f26026d948dbe252b503f25ed5ad260512d13983eb9211cb3b1a
-#+pthbs-banginstall.8519b2f608aefce201320e02ff249d2682c09bd9ffe2c24679bf965670c89299
-#+aat.dac7e03c0094b2baceb86107ea28767c29f0d4f47199f345af67a68b6f5971b6
-#+confz.368101c8900f90d8bf59acef5598267b959cc25da31467e2833b8a2906a6e18f
-#+containers.aa1f01b7e8b259d0741062d1810b6f40f0e8de9664c0c17068db258b24323440
-#+fileset.53c8d430675a470c92c2e25a96ba3033e844896a4cd4f1a37f49f2eae85d2ab9
-#+logincaps.92956247ee9e2c41db6f0d9d224291cf834068fb4fd944ee67f9c048e2885a02
-#+snaprep.f0c30481946d0ab3404518791e5790b1294ddd16dbe55354a8915e02ec96e3e4
-#+core-system-conf.245243fa86deb404906a97fbd59ff1f4b497c017f6dc741d9bd86665984d17d3
-#+core-system-rc.7612bcf43eebe2a6c92a66b0a2d91cf7771f031916b7ffe5291c1847c673dbaf
-#+core-system-scripts.fc242040077e92fe7c2a024bcee4459d580471947f88e22b7f051fe69c180a75
-#+core-system-init.73d35b07e1a29dc1fbeb5ca50e9aca0196020833156a7e2c66bfcbedaddec79a-
\ No newline at end of file
+#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
+#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
+#+aat.b308f6e6617455d6e0b547c4272b238d4d27af6ab9c82db7ec9d1e753198d056
+#+confz.52ffbe07dff731f19e9422fa37b1297942edce177c3b417ba365ff2fbe3be7ec
+#+containers.d04d3cd58c6e80451df1b62e348c4aaa72f95e3b537f9a334a3ba2e73a21f327
+#+fileset.c79b59cf8321934bd9aead482751ab313fc18f2c771dc6a225e904b6d4c319dd
+#+logincaps.6f01393354c478d85e09e15a7f693839366e1b41a839c0f07936bc906a3903df
+#+snaprep.6bb16a48cfcf687090a1beadc86d3d372a653fd87e01ac9716b572e6968fe306
+#+core-system-conf.1daef6c1e4de7e238fcd9c8ebbe84fbffad0a2dcb566a1e4b51857f8612fc1d5
+#+core-system-rc.962220db5c5405b23186ceb4d8ff2d53b12d8b5abfc8734e8f0cf8ff93d7891e
+#+core-system-scripts.8072a7dae2b254cbec10683d37ab32cad3be3f97ff809f6957070bbab853cf89
+#+core-system-init.a06505a3bde3e537a1dc32d632c566d281841396388bd60df10f3395e457ee66+
\ No newline at end of file
diff --git a/packages/zsh b/packages/zsh
@@ -47,6 +47,20 @@ autotools() {
export LDFLAGS="-L$pthbs_build_environment/library"
autotools zsh-5.9 --disable-dynamic --disable-locale
+check_static() {
+ if ! test -f $pthbs_destdir/$1; then
+ printf '%s\n' "Error: file '$1' doesn't exist!"
+ exit 1
+ fi
+ interp_info=$(readelf --string-dump=.interp $pthbs_destdir/$1) || exit $?
+ if test x '!=' "x$interp_info"; then
+ printf '%s\n' "Error: '$1' is a dynamic binary!"
+ exit 1
+ fi
+}
+
+check_static command/zsh
+
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/templates/pkg/diffutils b/templates/pkg/diffutils
@@ -5,6 +5,21 @@
{% block at_script %}
export LDFLAGS="-static"
autotools diffutils-3.10 --disable-nls --enable-static --disable-shared
+
+check_static() {
+ if ! test -f $pthbs_destdir/$1; then
+ printf '%s\n' "Error: file '$1' doesn't exist!"
+ exit 1
+ fi
+ interp_info=$(readelf --string-dump=.interp $pthbs_destdir/$1) || exit $?
+ if test x '!=' "x$interp_info"; then
+ printf '%s\n' "Error: '$1' is a dynamic binary!"
+ exit 1
+ fi
+}
+
+check_static command/diff
+
{% endblock %}
{% block genlinks_begin %}
x["./command/diff"]=1
diff --git a/templates/pkg/zsh b/templates/pkg/zsh
@@ -9,6 +9,20 @@
export LDFLAGS="-L$pthbs_build_environment/library"
autotools zsh-5.9 --disable-dynamic --disable-locale
+check_static() {
+ if ! test -f $pthbs_destdir/$1; then
+ printf '%s\n' "Error: file '$1' doesn't exist!"
+ exit 1
+ fi
+ interp_info=$(readelf --string-dump=.interp $pthbs_destdir/$1) || exit $?
+ if test x '!=' "x$interp_info"; then
+ printf '%s\n' "Error: '$1' is a dynamic binary!"
+ exit 1
+ fi
+}
+
+check_static command/zsh
+
{% endblock %}
{% block genlinks_begin %}
x["./command/zsh"]=1
