summaryrefslogtreecommitdiffstats
path: root/meta/classes
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:08:39 +0100
commita23d2730b84166464de257ffb7b562af72fc33d5 (patch)
tree94c0a81939c16ed34525aa40355d1a616109a953 /meta/classes
parentffb64e352e3d5ed5767c3082f1edeaba7c1f9b12 (diff)
downloadpoky-a23d2730b84166464de257ffb7b562af72fc33d5.tar.gz
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. (From OE-Core rev: df96b8895457deeeffc00e849118f2ac6d352e1e) Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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)}"
47EFI_PROVIDER ?= "grub-efi" 47EFI_PROVIDER ?= "grub-efi"
48EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" 48EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}"
49 49
50KERNEL_IMAGETYPE ??= "bzImage"
51
50# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not 52# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not
51# contain "efi". This way legacy is supported by default if neither is 53# contain "efi". This way legacy is supported by default if neither is
52# specified, maintaining the original behavior. 54# specified, maintaining the original behavior.
@@ -66,8 +68,8 @@ populate() {
66 DEST=$1 68 DEST=$1
67 install -d ${DEST} 69 install -d ${DEST}
68 70
69 # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. 71 # Install kernel, initrd, and rootfs.img in DEST for all loaders to use.
70 install -m 0644 ${DEPLOY_DIR_IMAGE}/bzImage ${DEST}/vmlinuz 72 install -m 0644 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ${DEST}/vmlinuz
71 73
72 # initrd is made of concatenation of multiple filesystem images 74 # initrd is made of concatenation of multiple filesystem images
73 if [ -n "${INITRD}" ]; then 75 if [ -n "${INITRD}" ]; then