mrrl

commit a98e9c52b092628010d521035f421d0598a98228
parent 562ab9f064b79cd39daa125fc8c1cc19ad401e2c
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Thu, 22 Feb 2024 12:34:06 +0100

Update static linking check

Diffstat:
M
packages/core-system-conf
 | 
2
+-
M
packages/core-system-init
 | 
4
++--
M
packages/core-system-rc
 | 
4
++--
M
packages/default.environment
 | 
12
++++++------
M
packages/diffutils
 | 
6
++++--
M
packages/linux
 | 
2
+-
M
packages/userspace.environment
 | 
10
+++++-----
M
templates/pkg/diffutils
 | 
6
++++--

8 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/packages/core-system-conf b/packages/core-system-conf
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
 #+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
-#+diffutils.5da23a8b51bfaaf859e7be5155f686c24738e9cf8445bff5bef1fb54fa473eee
+#+diffutils.1b284cd017241ab13a75b1f1e5f51f04254f8fc4fd339b903ea88f0407b742da
 #+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
 #+aat.b308f6e6617455d6e0b547c4272b238d4d27af6ab9c82db7ec9d1e753198d056
 #+fileset.c79b59cf8321934bd9aead482751ab313fc18f2c771dc6a225e904b6d4c319dd
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.962220db5c5405b23186ceb4d8ff2d53b12d8b5abfc8734e8f0cf8ff93d7891e
+#+core-system-rc.b93273509eb8be4265ca97220d0ed322dde036749729e925c160f8ab666a6148
 
-s6rcdb=/home/ccx/versions/core-system-rc.962220db5c5405b23186ceb4d8ff2d53b12d8b5abfc8734e8f0cf8ff93d7891e/s6-rc-db
+s6rcdb=/home/ccx/versions/core-system-rc.b93273509eb8be4265ca97220d0ed322dde036749729e925c160f8ab666a6148/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
@@ -3,9 +3,9 @@
 #+busybox-diffutils.09a86e0926aa135f720fe2faea4a282a067037f179fcbcc3435d39fbadadbaa1
 #+s6-rc.857023dce97de954bcc54ae5e98fa6037d6ee735b11f5f9312bc98e22f88bb19
 #+fileset.c79b59cf8321934bd9aead482751ab313fc18f2c771dc6a225e904b6d4c319dd
-#+core-system-conf.1daef6c1e4de7e238fcd9c8ebbe84fbffad0a2dcb566a1e4b51857f8612fc1d5
+#+core-system-conf.c455f637187354317e28cb392f9143c0fe54530fae11b4295b7c36e20c16a80e
 
-conf=/home/ccx/versions/core-system-conf.1daef6c1e4de7e238fcd9c8ebbe84fbffad0a2dcb566a1e4b51857f8612fc1d5/core-system-conf
+conf=/home/ccx/versions/core-system-conf.c455f637187354317e28cb392f9143c0fe54530fae11b4295b7c36e20c16a80e/core-system-conf
 prefix=/home/ccx/versions/$pthbs_package
 pkgdir="$pthbs_destdir/$prefix"
 mkdir -p "$pkgdir/s6-rc-source"
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,7 +1,7 @@
 #+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
 #+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
 #+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+diffutils.5da23a8b51bfaaf859e7be5155f686c24738e9cf8445bff5bef1fb54fa473eee
+#+diffutils.1b284cd017241ab13a75b1f1e5f51f04254f8fc4fd339b903ea88f0407b742da
 #+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
 #+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
 #+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
@@ -23,8 +23,8 @@
 #+fileset.c79b59cf8321934bd9aead482751ab313fc18f2c771dc6a225e904b6d4c319dd
 #+logincaps.6f01393354c478d85e09e15a7f693839366e1b41a839c0f07936bc906a3903df
 #+snaprep.6bb16a48cfcf687090a1beadc86d3d372a653fd87e01ac9716b572e6968fe306
-#+core-system-conf.1daef6c1e4de7e238fcd9c8ebbe84fbffad0a2dcb566a1e4b51857f8612fc1d5
-#+core-system-rc.962220db5c5405b23186ceb4d8ff2d53b12d8b5abfc8734e8f0cf8ff93d7891e
+#+core-system-conf.c455f637187354317e28cb392f9143c0fe54530fae11b4295b7c36e20c16a80e
+#+core-system-rc.b93273509eb8be4265ca97220d0ed322dde036749729e925c160f8ab666a6148
 #+core-system-scripts.8072a7dae2b254cbec10683d37ab32cad3be3f97ff809f6957070bbab853cf89
-#+core-system-init.a06505a3bde3e537a1dc32d632c566d281841396388bd60df10f3395e457ee66
-#+linux.5aaf523258bd21174ef8a0c93e0e470b8b70e47b5e4af6b485580ee0a75727da-
\ No newline at end of file
+#+core-system-init.956eeb22377c8a6a8f9e7064afa1ff652f99e6a857cc16dff2c3105468c5ba6b
+#+linux.d7f4e617a03dcb3e5692304aea530a69945a02e5c363ab48fea15b5bb6c58040+
\ No newline at end of file
diff --git a/packages/diffutils b/packages/diffutils
@@ -45,11 +45,13 @@ export LDFLAGS="-static"
 autotools diffutils-3.10 --disable-nls --enable-static --disable-shared
 
 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/packages/linux b/packages/linux
@@ -2,7 +2,7 @@
 #+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
 #+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
 #+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+diffutils.5da23a8b51bfaaf859e7be5155f686c24738e9cf8445bff5bef1fb54fa473eee
+#+diffutils.1b284cd017241ab13a75b1f1e5f51f04254f8fc4fd339b903ea88f0407b742da
 #+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
 #+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
 #+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
diff --git a/packages/userspace.environment b/packages/userspace.environment
@@ -1,7 +1,7 @@
 #+busybox.cdf17cf42ffb159a89de04c3561a727bc7f25849af45afd99701fb2c6dd694c0
 #+gnu-make.bbedb14014ab588f0ab243514063e15292122dda5cdaba9d9228794cd29223e8
 #+musl-cross-make.b9db57cdb678b30c666e97c2f7cee49945285f62d7fec93faccafdfa08f888be
-#+diffutils.5da23a8b51bfaaf859e7be5155f686c24738e9cf8445bff5bef1fb54fa473eee
+#+diffutils.1b284cd017241ab13a75b1f1e5f51f04254f8fc4fd339b903ea88f0407b742da
 #+patch.0663cc31802d557caec3f961aa8a2aa5b3be801eb710422a6db5cabc98c86743
 #+flex.09185c8d98f1b3bb8c9d8ba8edeb2519432caca0b2a03ca6aaebb400b9d0c8d6
 #+bison.9b1654e6b4708f282e427b1a38361394911ef62d1a46aceedce8fd54d5a7839b
@@ -23,7 +23,7 @@
 #+fileset.c79b59cf8321934bd9aead482751ab313fc18f2c771dc6a225e904b6d4c319dd
 #+logincaps.6f01393354c478d85e09e15a7f693839366e1b41a839c0f07936bc906a3903df
 #+snaprep.6bb16a48cfcf687090a1beadc86d3d372a653fd87e01ac9716b572e6968fe306
-#+core-system-conf.1daef6c1e4de7e238fcd9c8ebbe84fbffad0a2dcb566a1e4b51857f8612fc1d5
-#+core-system-rc.962220db5c5405b23186ceb4d8ff2d53b12d8b5abfc8734e8f0cf8ff93d7891e
+#+core-system-conf.c455f637187354317e28cb392f9143c0fe54530fae11b4295b7c36e20c16a80e
+#+core-system-rc.b93273509eb8be4265ca97220d0ed322dde036749729e925c160f8ab666a6148
 #+core-system-scripts.8072a7dae2b254cbec10683d37ab32cad3be3f97ff809f6957070bbab853cf89
-#+core-system-init.a06505a3bde3e537a1dc32d632c566d281841396388bd60df10f3395e457ee66-
\ No newline at end of file
+#+core-system-init.956eeb22377c8a6a8f9e7064afa1ff652f99e6a857cc16dff2c3105468c5ba6b+
\ No newline at end of file
diff --git a/templates/pkg/diffutils b/templates/pkg/diffutils
@@ -7,11 +7,13 @@ export LDFLAGS="-static"
 autotools diffutils-3.10 --disable-nls --enable-static --disable-shared
 
 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