[oe-commits] Koen Kooi : bootimg bbclass: don't hardcode 'bzImage' name
git at git.openembedded.org
git at git.openembedded.org
Thu Jul 2 22:08:59 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: df96b8895457deeeffc00e849118f2ac6d352e1e
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=df96b8895457deeeffc00e849118f2ac6d352e1e
Author: Koen Kooi <koen.kooi at linaro.org>
Date: Wed Jun 3 08:11:54 2015 +0200
bootimg bbclass: don't hardcode 'bzImage' name
In the EFI case there are 2 more architectures besides x86(_64) that may use this class: aarch32, which tends to use 'zImage' and aarch64, which uses 'Image'. Instead of hardcoding those values like the luvOS fork does, use the proper variable.
Signed-off-by: Koen Kooi <koen.kooi at linaro.org>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/classes/bootimg.bbclass | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index ab1d1bd..dbbf046 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -47,6 +47,8 @@ EFI = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "1", "0", d)}"
EFI_PROVIDER ?= "grub-efi"
EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}"
+KERNEL_IMAGETYPE ??= "bzImage"
+
# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not
# contain "efi". This way legacy is supported by default if neither is
# specified, maintaining the original behavior.
@@ -66,8 +68,8 @@ populate() {
DEST=$1
install -d ${DEST}
- # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
- install -m 0644 ${DEPLOY_DIR_IMAGE}/bzImage ${DEST}/vmlinuz
+ # Install kernel, initrd, and rootfs.img in DEST for all loaders to use.
+ install -m 0644 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ${DEST}/vmlinuz
# initrd is made of concatenation of multiple filesystem images
if [ -n "${INITRD}" ]; then
More information about the Openembedded-commits
mailing list