From 19eb1a7fe4840d546485c4ac58d648f34cf166c6 Mon Sep 17 00:00:00 2001 From: Steven Shiau Date: Fri, 8 Nov 2024 08:09:05 +0800 Subject: [PATCH] Move linux kernel name decision codes to "binary". Move linux kernel name decision codes from "binary_linux-image" to "binary" so that it can be used by other binary_* scripts. The different linux kernel name decision codes in "binary_rootfs" was dropped. --- scripts/build/binary | 11 +++++++++++ scripts/build/binary_linux-image | 10 ---------- scripts/build/binary_rootfs | 10 ---------- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/scripts/build/binary b/scripts/build/binary index 9c21fa7a6..c1f929c6b 100755 --- a/scripts/build/binary +++ b/scripts/build/binary @@ -44,6 +44,17 @@ if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]; then lb chroot_archives chroot install "${@}" fi +case "${LB_ARCHITECTURE}" in + powerpc|ppc64el|riscv64) + LINUX="vmlinux" + ;; + + *) + LINUX="vmlinuz" + ;; +esac +export LINUX + # Building root filesystem lb binary_rootfs "${@}" lb binary_dm-verity "${@}" diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image index 562949a87..8a9a3af67 100755 --- a/scripts/build/binary_linux-image +++ b/scripts/build/binary_linux-image @@ -47,16 +47,6 @@ case "${LB_INITRAMFS}" in ;; esac -case "${LB_ARCHITECTURE}" in - powerpc|ppc64el|riscv64) - LINUX="vmlinux" - ;; - - *) - LINUX="vmlinuz" - ;; -esac - # Creating directory mkdir -p "${DESTDIR}" diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index 041b33087..b7d705127 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -32,16 +32,6 @@ Check_stagefile # Acquire lock file Acquire_lockfile -case "${LB_ARCHITECTURE}" in - amd64|i386) - LINUX="vmlinuz" - ;; - - powerpc|ppc64el|riscv64) - LINUX="vmlinux" - ;; -esac - case "${LB_INITRAMFS}" in live-boot|dracut-live) INITFS="live"