commit fad354123bc7dcffef1a42ce68d811894cc90687
parent a98e9c52b092628010d521035f421d0598a98228
Author: Jan Pobříslo <ccx@te2000.cz>
Date: Thu, 22 Feb 2024 12:36:23 +0100
Update static linking check
Diffstat:
18 files changed, 63 insertions(+), 57 deletions(-)
diff --git a/packages/aat b/packages/aat
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
-#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
+#+zsh.71c0c42489540c79a5d2108c0f232728ceee88f0f895e2ecd0489e3f908a6e86
+#+pthbs-banginstall.db87feb3f98a6e1a75148bc784cc8f0ed983252f36f7dab1128cd3a44f66f0be
#@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.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
-#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
+#+zsh.71c0c42489540c79a5d2108c0f232728ceee88f0f895e2ecd0489e3f908a6e86
+#+pthbs-banginstall.db87feb3f98a6e1a75148bc784cc8f0ed983252f36f7dab1128cd3a44f66f0be
#@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.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
-#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
+#+zsh.71c0c42489540c79a5d2108c0f232728ceee88f0f895e2ecd0489e3f908a6e86
+#+pthbs-banginstall.db87feb3f98a6e1a75148bc784cc8f0ed983252f36f7dab1128cd3a44f66f0be
#+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.1b284cd017241ab13a75b1f1e5f51f04254f8fc4fd339b903ea88f0407b742da
+#+diffutils.06e0520c3367d6edce0992022ede740fdeb70718c4d89c514a45e7d0f7475935
#+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
-#+aat.b308f6e6617455d6e0b547c4272b238d4d27af6ab9c82db7ec9d1e753198d056
-#+fileset.c79b59cf8321934bd9aead482751ab313fc18f2c771dc6a225e904b6d4c319dd
+#+aat.8233f61d1715c36c67efdde48aef41302d0419032633fd62b9a7b9e60674f59b
+#+fileset.73db462bbe9bca6a9e6db5ddf425e56c54a81b6acee005f46f89d532e410936f
#@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.b93273509eb8be4265ca97220d0ed322dde036749729e925c160f8ab666a6148
+#+core-system-rc.075e9cbcceb6470690c5faff47e2db727834929ab1e20c49e4029fa33a33e5f9
-s6rcdb=/home/ccx/versions/core-system-rc.b93273509eb8be4265ca97220d0ed322dde036749729e925c160f8ab666a6148/s6-rc-db
+s6rcdb=/home/ccx/versions/core-system-rc.075e9cbcceb6470690c5faff47e2db727834929ab1e20c49e4029fa33a33e5f9/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.c79b59cf8321934bd9aead482751ab313fc18f2c771dc6a225e904b6d4c319dd
-#+core-system-conf.c455f637187354317e28cb392f9143c0fe54530fae11b4295b7c36e20c16a80e
+#+fileset.73db462bbe9bca6a9e6db5ddf425e56c54a81b6acee005f46f89d532e410936f
+#+core-system-conf.ba4f1bf1a9d209505cd665a1f5181947ed1cdbbfb0cc796d50724aff0261454b
-conf=/home/ccx/versions/core-system-conf.c455f637187354317e28cb392f9143c0fe54530fae11b4295b7c36e20c16a80e/core-system-conf
+conf=/home/ccx/versions/core-system-conf.ba4f1bf1a9d209505cd665a1f5181947ed1cdbbfb0cc796d50724aff0261454b/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.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
-#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
+#+zsh.71c0c42489540c79a5d2108c0f232728ceee88f0f895e2ecd0489e3f908a6e86
+#+pthbs-banginstall.db87feb3f98a6e1a75148bc784cc8f0ed983252f36f7dab1128cd3a44f66f0be
#@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.1b284cd017241ab13a75b1f1e5f51f04254f8fc4fd339b903ea88f0407b742da
+#+diffutils.06e0520c3367d6edce0992022ede740fdeb70718c4d89c514a45e7d0f7475935
#+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
#+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
#+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
@@ -15,16 +15,16 @@
#+mdevd.32195ae02573003700555ca2c0cda4b79c370d8d0c127b14890059ff82b550ac
#+s6-dns.d7819bac3ebafcb2b51b49b8b4fe141701341204271cb1b1de126d20f7b0d0af
#+s6-networking.fc977bc089cde121c95b471eed756105fc57c11ed0d169d2d59cfd48196912a8
-#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
-#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
-#+aat.b308f6e6617455d6e0b547c4272b238d4d27af6ab9c82db7ec9d1e753198d056
-#+confz.52ffbe07dff731f19e9422fa37b1297942edce177c3b417ba365ff2fbe3be7ec
-#+containers.d04d3cd58c6e80451df1b62e348c4aaa72f95e3b537f9a334a3ba2e73a21f327
-#+fileset.c79b59cf8321934bd9aead482751ab313fc18f2c771dc6a225e904b6d4c319dd
-#+logincaps.6f01393354c478d85e09e15a7f693839366e1b41a839c0f07936bc906a3903df
-#+snaprep.6bb16a48cfcf687090a1beadc86d3d372a653fd87e01ac9716b572e6968fe306
-#+core-system-conf.c455f637187354317e28cb392f9143c0fe54530fae11b4295b7c36e20c16a80e
-#+core-system-rc.b93273509eb8be4265ca97220d0ed322dde036749729e925c160f8ab666a6148
-#+core-system-scripts.8072a7dae2b254cbec10683d37ab32cad3be3f97ff809f6957070bbab853cf89
-#+core-system-init.956eeb22377c8a6a8f9e7064afa1ff652f99e6a857cc16dff2c3105468c5ba6b
-#+linux.d7f4e617a03dcb3e5692304aea530a69945a02e5c363ab48fea15b5bb6c58040-
\ No newline at end of file
+#+zsh.71c0c42489540c79a5d2108c0f232728ceee88f0f895e2ecd0489e3f908a6e86
+#+pthbs-banginstall.db87feb3f98a6e1a75148bc784cc8f0ed983252f36f7dab1128cd3a44f66f0be
+#+aat.8233f61d1715c36c67efdde48aef41302d0419032633fd62b9a7b9e60674f59b
+#+confz.131001267ee854fee717e177f600fa42a6547405906a97e92d9f89f56fe0dc68
+#+containers.844bb2a984f1d42eceabdcd423c0f22af23f011882a6e57dbabce92b968cf9c6
+#+fileset.73db462bbe9bca6a9e6db5ddf425e56c54a81b6acee005f46f89d532e410936f
+#+logincaps.67c04b2de6a76dc91c08ccb20ef83bbb8ad045dac6f58608317fe279d1c85313
+#+snaprep.8178a4e306755233b06a49a85675dae6e68744dcd112eaf973c1f0c5169adaf4
+#+core-system-conf.ba4f1bf1a9d209505cd665a1f5181947ed1cdbbfb0cc796d50724aff0261454b
+#+core-system-rc.075e9cbcceb6470690c5faff47e2db727834929ab1e20c49e4029fa33a33e5f9
+#+core-system-scripts.b90092ccd999b7b741abfa6d3d419f2c01cb57a50f3da6b5f73f2f05b6c1ceaf
+#+core-system-init.eba512953c706df9bde7d323859c430cd6b017beb1a6a88b9dbb1b157ac24775
+#+linux.dc67f8e4b4fa80adf55fea32de8669433c127a3a6c1090b76a0ec5acfcdae098+
\ No newline at end of file
diff --git a/packages/diffutils b/packages/diffutils
@@ -59,6 +59,7 @@ check_static() {
}
check_static command/diff
+check_static command/cmp
diff --git a/packages/fileset b/packages/fileset
@@ -1,7 +1,7 @@
#!/usr/bin/env pthbs-build
#+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
-#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
+#+zsh.71c0c42489540c79a5d2108c0f232728ceee88f0f895e2ecd0489e3f908a6e86
+#+pthbs-banginstall.db87feb3f98a6e1a75148bc784cc8f0ed983252f36f7dab1128cd3a44f66f0be
#@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.1b284cd017241ab13a75b1f1e5f51f04254f8fc4fd339b903ea88f0407b742da
+#+diffutils.06e0520c3367d6edce0992022ede740fdeb70718c4d89c514a45e7d0f7475935
#+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.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
-#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
+#+zsh.71c0c42489540c79a5d2108c0f232728ceee88f0f895e2ecd0489e3f908a6e86
+#+pthbs-banginstall.db87feb3f98a6e1a75148bc784cc8f0ed983252f36f7dab1128cd3a44f66f0be
#+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.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
+#+zsh.71c0c42489540c79a5d2108c0f232728ceee88f0f895e2ecd0489e3f908a6e86
#@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.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
-#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
+#+zsh.71c0c42489540c79a5d2108c0f232728ceee88f0f895e2ecd0489e3f908a6e86
+#+pthbs-banginstall.db87feb3f98a6e1a75148bc784cc8f0ed983252f36f7dab1128cd3a44f66f0be
#@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.1b284cd017241ab13a75b1f1e5f51f04254f8fc4fd339b903ea88f0407b742da
+#+diffutils.06e0520c3367d6edce0992022ede740fdeb70718c4d89c514a45e7d0f7475935
#+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
#+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
#+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
@@ -15,15 +15,15 @@
#+mdevd.32195ae02573003700555ca2c0cda4b79c370d8d0c127b14890059ff82b550ac
#+s6-dns.d7819bac3ebafcb2b51b49b8b4fe141701341204271cb1b1de126d20f7b0d0af
#+s6-networking.fc977bc089cde121c95b471eed756105fc57c11ed0d169d2d59cfd48196912a8
-#+zsh.0e7e8f5fb7a3e3d83aabc533909816a2984bf590540ad27164f61a8da918b627
-#+pthbs-banginstall.c21e9a08e2ea12d67ca017972ebd5a50dfb6504271aafc80cc58220622bd1108
-#+aat.b308f6e6617455d6e0b547c4272b238d4d27af6ab9c82db7ec9d1e753198d056
-#+confz.52ffbe07dff731f19e9422fa37b1297942edce177c3b417ba365ff2fbe3be7ec
-#+containers.d04d3cd58c6e80451df1b62e348c4aaa72f95e3b537f9a334a3ba2e73a21f327
-#+fileset.c79b59cf8321934bd9aead482751ab313fc18f2c771dc6a225e904b6d4c319dd
-#+logincaps.6f01393354c478d85e09e15a7f693839366e1b41a839c0f07936bc906a3903df
-#+snaprep.6bb16a48cfcf687090a1beadc86d3d372a653fd87e01ac9716b572e6968fe306
-#+core-system-conf.c455f637187354317e28cb392f9143c0fe54530fae11b4295b7c36e20c16a80e
-#+core-system-rc.b93273509eb8be4265ca97220d0ed322dde036749729e925c160f8ab666a6148
-#+core-system-scripts.8072a7dae2b254cbec10683d37ab32cad3be3f97ff809f6957070bbab853cf89
-#+core-system-init.956eeb22377c8a6a8f9e7064afa1ff652f99e6a857cc16dff2c3105468c5ba6b-
\ No newline at end of file
+#+zsh.71c0c42489540c79a5d2108c0f232728ceee88f0f895e2ecd0489e3f908a6e86
+#+pthbs-banginstall.db87feb3f98a6e1a75148bc784cc8f0ed983252f36f7dab1128cd3a44f66f0be
+#+aat.8233f61d1715c36c67efdde48aef41302d0419032633fd62b9a7b9e60674f59b
+#+confz.131001267ee854fee717e177f600fa42a6547405906a97e92d9f89f56fe0dc68
+#+containers.844bb2a984f1d42eceabdcd423c0f22af23f011882a6e57dbabce92b968cf9c6
+#+fileset.73db462bbe9bca6a9e6db5ddf425e56c54a81b6acee005f46f89d532e410936f
+#+logincaps.67c04b2de6a76dc91c08ccb20ef83bbb8ad045dac6f58608317fe279d1c85313
+#+snaprep.8178a4e306755233b06a49a85675dae6e68744dcd112eaf973c1f0c5169adaf4
+#+core-system-conf.ba4f1bf1a9d209505cd665a1f5181947ed1cdbbfb0cc796d50724aff0261454b
+#+core-system-rc.075e9cbcceb6470690c5faff47e2db727834929ab1e20c49e4029fa33a33e5f9
+#+core-system-scripts.b90092ccd999b7b741abfa6d3d419f2c01cb57a50f3da6b5f73f2f05b6c1ceaf
+#+core-system-init.eba512953c706df9bde7d323859c430cd6b017beb1a6a88b9dbb1b157ac24775+
\ No newline at end of file
diff --git a/packages/zsh b/packages/zsh
@@ -48,11 +48,13 @@ export LDFLAGS="-L$pthbs_build_environment/library"
autotools zsh-5.9 --disable-dynamic --disable-locale
check_static() {
- if ! test -f $pthbs_destdir/$1; then
+ local exe || true
+ exe=$pthbs_destdir/'/home/ccx/versions'/$pthbs_package/$1
+ if ! test -f $exe; then
printf '%s\n' "Error: file '$1' doesn't exist!"
exit 1
fi
- interp_info=$(readelf --string-dump=.interp $pthbs_destdir/$1) || exit $?
+ interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
if test x '!=' "x$interp_info"; then
printf '%s\n' "Error: '$1' is a dynamic binary!"
exit 1
diff --git a/templates/pkg/diffutils b/templates/pkg/diffutils
@@ -21,6 +21,7 @@ check_static() {
}
check_static command/diff
+check_static command/cmp
{% endblock %}
{% block genlinks_begin %}
diff --git a/templates/pkg/zsh b/templates/pkg/zsh
@@ -10,11 +10,13 @@ export LDFLAGS="-L$pthbs_build_environment/library"
autotools zsh-5.9 --disable-dynamic --disable-locale
check_static() {
- if ! test -f $pthbs_destdir/$1; then
+ local exe || true
+ exe=$pthbs_destdir/'{{versions}}'/$pthbs_package/$1
+ if ! test -f $exe; then
printf '%s\n' "Error: file '$1' doesn't exist!"
exit 1
fi
- interp_info=$(readelf --string-dump=.interp $pthbs_destdir/$1) || exit $?
+ interp_info=$(readelf --string-dump=.interp "$exe") || exit $?
if test x '!=' "x$interp_info"; then
printf '%s\n' "Error: '$1' is a dynamic binary!"
exit 1