summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2015-06-03 08:11:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-02 23:03:06 +0100
commitdf96b8895457deeeffc00e849118f2ac6d352e1e (patch)
treedf9786a5b034546e13b76b78e42839a811266b26
parent4809aa9c9d5ac13b30cac1aeada09584f53eecbe (diff)
downloadopenembedded-core-contrib-df96b8895457deeeffc00e849118f2ac6d352e1e.tar.gz
openembedded-core-contrib-df96b8895457deeeffc00e849118f2ac6d352e1e.tar.bz2
openembedded-core-contrib-df96b8895457deeeffc00e849118f2ac6d352e1e.zip
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@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/bootimg.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index ab1d1bdd33..dbbf046d3a 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