[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3019/8267] live-vm-common.bbclass: Allow to use different kernel image than KERNEL_IMAGETYPE for /vmlinuz

[Emmanuele Bassi <ebassi src gnome org>]

commit 704c8b825bcd9ebfa3bdd0901a3950ab72d253d9
Author: Martin Jansa <martin jansa gmail com>
Date:   Wed Oct 12 14:06:12 2016 +0200

    live-vm-common.bbclass: Allow to use different kernel image than KERNEL_IMAGETYPE for /vmlinuz
    
    * syslinux config hardcodes kernel image as /vmlinuz add warning message
      when the selected image doesn't exist and allow to select different image
      with VM_DEFAULT_KERNEL variable (qemuboot.bbclass is using QB_DEFAULT_KERNEL)
    
    (From OE-Core rev: e6b21d1b3716ee6f4aec1674e56f06b2963a7968)
    
    Signed-off-by: Martin Jansa <Martin Jansa gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/live-vm-common.bbclass |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/live-vm-common.bbclass b/meta/classes/live-vm-common.bbclass
index c751385..734697f 100644
--- a/meta/classes/live-vm-common.bbclass
+++ b/meta/classes/live-vm-common.bbclass
@@ -31,14 +31,18 @@ inherit ${EFI_CLASS}
 inherit ${PCBIOS_CLASS}
 
 KERNEL_IMAGETYPE ??= "bzImage"
+VM_DEFAULT_KERNEL ??= "${KERNEL_IMAGETYPE}"
 
 populate_kernel() {
        dest=$1
        install -d $dest
 
        # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
-       if [ -e ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ]; then
-               install -m 0644 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} $dest/vmlinuz
+       bbnote "Trying to install ${DEPLOY_DIR_IMAGE}/${VM_DEFAULT_KERNEL} as $dest/vmlinuz"
+       if [ -e ${DEPLOY_DIR_IMAGE}/${VM_DEFAULT_KERNEL} ]; then
+               install -m 0644 ${DEPLOY_DIR_IMAGE}/${VM_DEFAULT_KERNEL} $dest/vmlinuz
+       else
+               bbwarn "${DEPLOY_DIR_IMAGE}/${VM_DEFAULT_KERNEL} doesn't exist"
        fi
 
        # initrd is made of concatenation of multiple filesystem images