xen: use bzImage for boot (instead of vmlinux)

Testing with the latest oe-core was unable to boot and
only syslinux was running.

It appears that the desired kernel is not on the /boot
partition, and hence the system can't continue.

bzImage is installed and available, so we switch to that.

We also ensure that both kernel-vmlinux and kernel-image
are installed to the rootfs so we can have choices in
the future.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 8 insertions, 1 deletions

diff --git a/recipes-extended/images/xen-image-minimal.bb b/recipes-extended/images/xen-image-minimal.bb
index 7f1acbfe..fe79a485 100644
--- a/recipes-extended/images/xen-image-minimal.bb
+++ b/recipes-extended/images/xen-image-minimal.bb
@@ -14,6 +14,8 @@ IMAGE_INSTALL += " \
     ${XEN_KERNEL_MODULES} \
     xen-tools \
     qemu \
+    kernel-image \
+    kernel-vmlinux \
     "
 
 # The hypervisor may not be within the dom0 filesystem image but at least
@@ -50,20 +52,24 @@ do_check_xen_state() {
 
 addtask check_xen_state before do_rootfs
 
+# note: this may be unused, see the wic plugin
 syslinux_iso_populate:append() {
         install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${ISODIR}${ISOLINUXDIR}
         install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${ISODIR}${ISOLINUXDIR}
 }
 
+# note: this may be unused, see the wic plugin
 syslinux_hddimg_populate:append() {
         install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${HDDDIR}${SYSLINUXDIR}
         install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${HDDDIR}${SYSLINUXDIR}
 }
 
+# note: this may be unused, see the wic plugin
 grubefi_populate:append() {
         install -m 0644 ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz ${DEST}${EFIDIR}/xen.gz
 }
 
+# note: this may be unused, see the wic plugin
 syslinux_populate:append() {
         install -m 0644 ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz ${DEST}/xen.gz
 }
@@ -71,6 +77,7 @@ syslinux_populate:append() {
 SYSLINUX_XEN_ARGS ?= "loglvl=all guest_loglvl=all console=com1,vga com1=115200,8n1"
 SYSLINUX_KERNEL_ARGS ?= "ramdisk_size=32768 root=/dev/ram0 rw console=hvc0 earlyprintk=xen console=tty0 panic=10 LABEL=boot debugshell=5"
 
+# note: this may be unused, see the wic plugin
 build_syslinux_cfg () {
         echo "ALLOWOPTIONS 1" > ${SYSLINUX_CFG}
         echo "DEFAULT boot" >> ${SYSLINUX_CFG}
diff --git a/wic/qemuboot-xen-x86-64.cfg b/wic/qemuboot-xen-x86-64.cfg
index 297e19b2..94fb0890 100644
--- a/wic/qemuboot-xen-x86-64.cfg
+++ b/wic/qemuboot-xen-x86-64.cfg
@@ -5,4 +5,4 @@ SERIAL 0 115200
 
 LABEL boot
   KERNEL mboot.c32
-  APPEND /xen.gz console=com1,vga com1=115200,8n1 loglvl=all guest_loglvl=all --- /vmlinuz console=hvc0 earlyprintk=xen root=/dev/sda2 pmtmr=0
+  APPEND /xen.gz console=com1,vga com1=115200,8n1 loglvl=all guest_loglvl=all --- /bZimage console=hvc0 earlyprintk=xen root=/dev/sda2 pmtmr=0