diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-08-08 19:46:01 +0000 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-08-08 22:39:56 +0200 |
| commit | 28b9d9d6bf304586bb4ba3529e5294047f649b73 (patch) | |
| tree | efbc6ee071643456a14134ead2a172a4f61693a6 /scripts/package-build/linux-kernel/build-kernel.sh | |
| parent | 24f6ed6ee8fa009dd7e7fbf4db8c70ef5f6ef04b (diff) | |
| download | vyos-build-28b9d9d6bf304586bb4ba3529e5294047f649b73.tar.gz vyos-build-28b9d9d6bf304586bb4ba3529e5294047f649b73.zip | |
Kernel: T9181: stop re-reading data/defaults.toml during build
build-kernel.sh parsed kernel_flavor out of defaults.toml itself via a
brittle awk one-liner, even though build.py already has that value from
its own defaults.toml read.
Pass kernel_flavor down as an env var instead, so defaults.toml is read
in exactly one place (build.py's main) and everything downstream flows
through kernel-vars or explicit parameters.
Diffstat (limited to 'scripts/package-build/linux-kernel/build-kernel.sh')
| -rwxr-xr-x | scripts/package-build/linux-kernel/build-kernel.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/package-build/linux-kernel/build-kernel.sh b/scripts/package-build/linux-kernel/build-kernel.sh index a4a4fc3c..dea71aa9 100755 --- a/scripts/package-build/linux-kernel/build-kernel.sh +++ b/scripts/package-build/linux-kernel/build-kernel.sh @@ -22,8 +22,13 @@ if [ -d /usr/lib/ccache/ ]; then export PATH=/usr/lib/ccache:$PATH fi +if [ -z "${KERNEL_FLAVOR}" ]; then + echo "E: KERNEL_FLAVOR is not set, run via ./build.py so it can be passed from data/defaults.toml" + exit 1 +fi + KERNEL_VERSION=$(make kernelversion) -KERNEL_SUFFIX=-$(awk -F "= " '/kernel_flavor/ {print $2}' ../../../../data/defaults.toml | tr -d \") +KERNEL_SUFFIX=-${KERNEL_FLAVOR} echo "I: Generate Kernel config" ARCH=$(dpkg --print-architecture) |