mrrl

commit 739ef51b0d975fe15b7ccb983bee78db41ed375e
parent 1929bf8b72c85755d9080e3da355f4b26ca49c9f
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sun, 12 Oct 2025 13:00:10 +0000

system-config-init has scripts, not binaries; remove checks

Diffstat:
M
templates/pkg/system-config-init
 | 
9
---------
M
variants/ccx-x86_64/default.environment
 | 
2
+-
M
variants/ccx-x86_64/system-config-init
 | 
19
-------------------
M
variants/root-x86_64/default.environment
 | 
2
+-
M
variants/root-x86_64/system-config-init
 | 
19
-------------------

5 files changed, 2 insertions(+), 49 deletions(-)
diff --git a/templates/pkg/system-config-init b/templates/pkg/system-config-init
@@ -7,7 +7,6 @@
 #+{{pkg_install_name("s6-linux-init")}}
 #+{{pkg_install_name("execline")}}
 #+{{pkg_install_name("system-config-rc")}}
-#+{{pkg_install_name("musl-cross-make")}}{# for readelf #}
 {% endblock %}
 {% block build_and_install -%}
 {% include "functions/q" %}
@@ -103,14 +102,6 @@ EOF
 s6-chmod 755 "${dest}/run-image/service/console-log-tail/run" exit $?
 
 {% endblock %}
-{% block check -%}
-{% include "functions/check_static" %}
-check_static bin/init
-check_static bin/halt
-check_static bin/poweroff
-check_static bin/reboot
-
-{% endblock -%}
 {% block genlinks_begin %}
 	x["./bin/init"]=1
 	x["./bin/halt"]=1
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -43,5 +43,5 @@
 #+system-config.8a3b6b805729a2f92deb6d7d12f23351f123673efbb8fe1b84b9191daeaa5f62
 #+system-config-rc.9e7d1a576cf722cce1c65e9a28d0d795b228728c7b1d0705771d04efeef15ae8
 #+system-config-scripts.a54759d4f335bd14d0739a8b91412f1ce5302d65013e587018ec1bcf5363b16a
-#+system-config-init.bfb2ff97423631ea544f1ddd4194a9679030ffd4399e8e5bd6c00961f41cad99
+#+system-config-init.d5e6401a2682b1ebc95b34435825a919c512a0f53e8c682b9f6f4d7e6d438302
 #+system-config-zsh.3f24324efe84089cac74c52a6324952a793cd304f29ea46e4f28fb00c8c35df7 
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -8,7 +8,6 @@
 #+s6-linux-init.370b116a128899247e59ff60d4a636090b81361b7abb0ec9b5d0e5aeb567d075
 #+execline.e7a749921b4a04631cc69f2189ac67401545d9873cdeb7813aa392e8ebd11558
 #+system-config-rc.9e7d1a576cf722cce1c65e9a28d0d795b228728c7b1d0705771d04efeef15ae8
-#+musl-cross-make.1047ba507930d3bb4139073c872c1e856d7d9f4c542bb22dd0af05422d475054
 
 
 # - build script start -
@@ -121,24 +120,6 @@ EOF
 s6-chmod 755 "${dest}/run-image/service/console-log-tail/run" exit $?
 
 
-check_static() {
-	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 "$exe") || exit $?
-	if test x '!=' "x$interp_info"; then
-		printf '%s\n' "Error: '$1' is a dynamic binary!"
-		exit 1
-	fi
-}
-check_static bin/init
-check_static bin/halt
-check_static bin/poweroff
-check_static bin/reboot
-
 
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -43,5 +43,5 @@
 #+system-config.5aab04c62c5f380a071c1b891e333fddf57b5c65f098cd6ffd8285d367f61c56
 #+system-config-rc.4c93478687fc9d24c056964e988eb0f91514a9196bd1898356cc916d0654554c
 #+system-config-scripts.5ade8006267d5dd6f2fa7be80dc04f8396ed6e6da6abd1d23eaaee1f237ba341
-#+system-config-init.5780577d9b3c31914f8e7c1f1c1ada0acbafa3d59c5beffd317d4d19c0b97ee4
+#+system-config-init.39392f7e27eeb5f476087d061051039747c6442c358a0894900232e6596f9ee4
 #+system-config-zsh.2f424f7007ce63719a484ba88a797dba7ae43a63408eb4ebd0dc8d7b252fccc1 
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -8,7 +8,6 @@
 #+s6-linux-init.b686a32f757913770efafac4666d1be98cea4a76838f7d79e646dd63ac67d507
 #+execline.12affe71ab57cb7af1ded3d020f86f17da85e43f90ba29f285bdc99b4033b709
 #+system-config-rc.4c93478687fc9d24c056964e988eb0f91514a9196bd1898356cc916d0654554c
-#+musl-cross-make.73b05cc53eb90f3881270d6a6cb7fe89b148029d6233f164737a24b2093d0d81
 
 
 # - build script start -
@@ -121,24 +120,6 @@ EOF
 s6-chmod 755 "${dest}/run-image/service/console-log-tail/run" exit $?
 
 
-check_static() {
-	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 "$exe") || exit $?
-	if test x '!=' "x$interp_info"; then
-		printf '%s\n' "Error: '$1' is a dynamic binary!"
-		exit 1
-	fi
-}
-check_static bin/init
-check_static bin/halt
-check_static bin/poweroff
-check_static bin/reboot
-
 
 cd "$pthbs_destdir/versions/$pthbs_package"
 find -type d -o -print | awk -F/ '