commit d61a9689558d65043dc4b1f600eaa30f2ce96eff parent 50ad0675e9c4d8068a09fe4ca277300ece5eab96 Author: Jan Pobrislo <ccx@te2000.cz> Date: Wed, 30 Apr 2025 20:02:00 +0000 Add shebangs to environment packages Diffstat:
18 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/templates/pkg/bootstrap.environment b/templates/pkg/bootstrap.environment @@ -1,3 +1,4 @@ +{{ shebang }} #+{{pkg_install_name("busybox:bootstrap")}} #+{{pkg_install_name("gnu-make:bootstrap")}} #+{{pkg_install_name("musl-cross-make:bootstrap-1")}} diff --git a/templates/pkg/containers.environment b/templates/pkg/containers.environment @@ -1,3 +1,4 @@ +{{ shebang }} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("busybox-diffutils")}} #+{{pkg_install_name("execline")}} diff --git a/templates/pkg/default.environment b/templates/pkg/default.environment @@ -1,7 +1,8 @@ +{% include "pkg/userspace.environment" %} #+{{pkg_install_name("system-config")}} #+{{pkg_install_name("system-config-rc")}} #+{{pkg_install_name("system-config-scripts")}} #+{{pkg_install_name("system-config-init")}} -#+{{pkg_install_name("system-config-zsh")}} -{% include "pkg/userspace.environment" %}{# +#+{{pkg_install_name("system-config-zsh")}}{# +#+{{pkg_install_name("userspace.environment")}} {% include "pkg/kernel.environment" %} #} diff --git a/templates/pkg/kernel.environment b/templates/pkg/kernel.environment @@ -1 +1,2 @@ +{{ shebang }} #+{{pkg_install_name("linux")}} diff --git a/templates/pkg/mdevd.environment b/templates/pkg/mdevd.environment @@ -1,3 +1,4 @@ +{{ shebang }} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("execline")}} #+{{pkg_install_name("s6")}} diff --git a/templates/pkg/userspace.environment b/templates/pkg/userspace.environment @@ -1,3 +1,4 @@ +{{ shebang }} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("musl-cross-make")}} diff --git a/variants/ccx-x86_64/bootstrap.environment b/variants/ccx-x86_64/bootstrap.environment @@ -1,3 +1,4 @@ +#!/usr/bin/env pthbs-build #+busybox.98e093a9944b8b50cd7822e1d49484b6e0fab3976e23ff2c6c7a6f9110bd9b8a #+gnu-make.4e7ff4ad6d9b4f6633a2aed2993748d465f18ffee42cbe26d5db8eafcc30f2c7 #+musl-cross-make.63ab1a1e9dbbb93a1295c33b1a652fb16cbe3e5f95b8b60bee3dd618991ed097 \ No newline at end of file diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -1,3 +1,4 @@ +#!/usr/bin/env pthbs-build #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -1,8 +1,4 @@ -#+system-config.f10ffa35e9efe8978d7946359541b06073f70eb53a5deec7df802e6660472939 -#+system-config-rc.e20c10f59b82e0bef21f3ff620feba0e0fcbfbad07cf73cee0b2b3d3eb3acc71 -#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d -#+system-config-init.8d4a53628092661c15807e5cb86ab74ffad4e919b0832db088248890df3c5a44 -#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309 +#!/usr/bin/env pthbs-build #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b #+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 @@ -39,4 +35,9 @@ #+libcap.4b28b26ba2d2086e58476a4629bc9bc939bd7326eae233dd9066fbec00a93aca #+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514 #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114 -#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8- \ No newline at end of file +#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8 +#+system-config.f10ffa35e9efe8978d7946359541b06073f70eb53a5deec7df802e6660472939 +#+system-config-rc.e20c10f59b82e0bef21f3ff620feba0e0fcbfbad07cf73cee0b2b3d3eb3acc71 +#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d +#+system-config-init.8d4a53628092661c15807e5cb86ab74ffad4e919b0832db088248890df3c5a44 +#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309+ \ No newline at end of file diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment @@ -1 +1,2 @@ +#!/usr/bin/env pthbs-build #+linux.883a71167d522abbb5b8c86a8e46cf585ed634096c96026c53cda7e0686d2450 \ No newline at end of file diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -1,3 +1,4 @@ +#!/usr/bin/env pthbs-build #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f #+s6.087ce2658d9f8b1c38f8f6999d2cfef0bf3b53afaf07f01495091883c154899e diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -1,3 +1,4 @@ +#!/usr/bin/env pthbs-build #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b #+musl-cross-make.98979eb41109d371f19d0637d51116db18c7aeef61fbf804a68094c22a302a78 diff --git a/variants/root-x86_64/bootstrap.environment b/variants/root-x86_64/bootstrap.environment @@ -1,3 +1,4 @@ +#!/usr/bin/env pthbs-build #+busybox.40c4c01bd9c0817673dceb9645c01c31733d950119f972c2549f4727292ec6a5 #+gnu-make.4a32aa4cdf63aaa58ea27e250f18ee034174cbe12838b6d49e01734d296a50e0 #+musl-cross-make.87153c0d352ab6464c7cf36689811ac4736e07f9f81e050e2af17504cbbec794 \ No newline at end of file diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -1,3 +1,4 @@ +#!/usr/bin/env pthbs-build #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -1,8 +1,4 @@ -#+system-config.367b44e116525512392947a408ef5da9bf23cf478d0786d0da4c4bf8fbba2e07 -#+system-config-rc.60e723415e63cd223b89d06e18421755579381d86f662661c9341fa66a4691e6 -#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378 -#+system-config-init.abb5f06ff2f5d6a33c17daca669f290f3a82bf81a690e09b84ffced431a2fbb4 -#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f +#!/usr/bin/env pthbs-build #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 #+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc @@ -39,4 +35,9 @@ #+libcap.66ba1f95782e8619e1ec2189653a79f3105901a0c25a4ad2ed3694f0bbe292ea #+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8 #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac -#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca- \ No newline at end of file +#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca +#+system-config.367b44e116525512392947a408ef5da9bf23cf478d0786d0da4c4bf8fbba2e07 +#+system-config-rc.60e723415e63cd223b89d06e18421755579381d86f662661c9341fa66a4691e6 +#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378 +#+system-config-init.abb5f06ff2f5d6a33c17daca669f290f3a82bf81a690e09b84ffced431a2fbb4 +#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f+ \ No newline at end of file diff --git a/variants/root-x86_64/kernel.environment b/variants/root-x86_64/kernel.environment @@ -1 +1,2 @@ +#!/usr/bin/env pthbs-build #+linux.127dba0e90f84b5759fecbae1dac44d3d74106970f7a464a3561fdd9004eb98a \ No newline at end of file diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -1,3 +1,4 @@ +#!/usr/bin/env pthbs-build #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9 #+s6.43f7ad2aaeb2646da287c5bddf7c29c44d3f7b68a976beee75b60da44b54759e diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -1,3 +1,4 @@ +#!/usr/bin/env pthbs-build #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 #+musl-cross-make.d0431fc0def788be03da43136972361827de52c8e6f0a6f3890dc57fe32e8ecc