diff options
| -rw-r--r-- | meta/classes/grub-efi-cfg.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/live-vm-common.bbclass | 16 | ||||
| -rw-r--r-- | meta/classes/syslinux.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/systemd-boot-cfg.bbclass | 2 |
4 files changed, 12 insertions, 10 deletions
diff --git a/meta/classes/grub-efi-cfg.bbclass b/meta/classes/grub-efi-cfg.bbclass index 5eeee6c2e3f..e5a8307be11 100644 --- a/meta/classes/grub-efi-cfg.bbclass +++ b/meta/classes/grub-efi-cfg.bbclass @@ -91,7 +91,7 @@ python build_efi_cfg() { lb = label if label == "install": lb = "install-efi" - kernel = localdata.getVar('KERNEL_IMAGETYPE') + kernel = localdata.getVar('KERNEL_IMAGETYPES').split()[0] cfgfile.write('linux /%s LABEL=%s' % (kernel, lb)) cfgfile.write(' %s' % replace_rootfs_uuid(d, root)) diff --git a/meta/classes/live-vm-common.bbclass b/meta/classes/live-vm-common.bbclass index 68105d9b84f..93bf03f8fef 100644 --- a/meta/classes/live-vm-common.bbclass +++ b/meta/classes/live-vm-common.bbclass @@ -36,13 +36,15 @@ populate_kernel() { dest=$1 install -d $dest - # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. - bbnote "Trying to install ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} as $dest/${KERNEL_IMAGETYPE}" - if [ -e ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ]; then - install -m 0644 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} $dest/${KERNEL_IMAGETYPE} - else - bbwarn "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} doesn't exist" - fi + for kernel in ${KERNEL_IMAGETYPES}; do + # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. + bbnote "Trying to install ${DEPLOY_DIR_IMAGE}/$kernel as $dest/$kernel" + if [ -e ${DEPLOY_DIR_IMAGE}/$kernel ]; then + install -m 0644 ${DEPLOY_DIR_IMAGE}/$kernel $dest/$kernel + else + bbwarn "${DEPLOY_DIR_IMAGE}/$kernel doesn't exist" + fi + done # initrd is made of concatenation of multiple filesystem images if [ -n "${INITRD}" ]; then diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass index 031dacbf7d3..b3ba5958332 100644 --- a/meta/classes/syslinux.bbclass +++ b/meta/classes/syslinux.bbclass @@ -173,7 +173,7 @@ python build_syslinux_cfg () { if not root: bb.fatal('SYSLINUX_ROOT not defined') - kernel = localdata.getVar('KERNEL_IMAGETYPE') + kernel = localdata.getVar('KERNEL_IMAGETYPES').split()[0] for btype in btypes: cfgfile.write('LABEL %s%s\nKERNEL /%s\n' % (btype[0], label, kernel)) diff --git a/meta/classes/systemd-boot-cfg.bbclass b/meta/classes/systemd-boot-cfg.bbclass index 021c9f93315..03882b3ee22 100644 --- a/meta/classes/systemd-boot-cfg.bbclass +++ b/meta/classes/systemd-boot-cfg.bbclass @@ -48,7 +48,7 @@ python build_efi_cfg() { entrycfg.write('title %s\n' % label) - kernel = localdata.getVar("KERNEL_IMAGETYPE") + kernel = localdata.getVar("KERNEL_IMAGETYPES").split()[0] entrycfg.write('linux /%s\n' % kernel) append = localdata.getVar('APPEND') |