diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/bootimg.bbclass | 6 |
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)}" | |||
47 | EFI_PROVIDER ?= "grub-efi" | 47 | EFI_PROVIDER ?= "grub-efi" |
48 | EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" | 48 | EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" |
49 | 49 | ||
50 | KERNEL_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 |