MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-04 21:05:25 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

xen: use bzImage for boot (instead of vmlinux)

Browse Source 
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>
This commit is contained in:
Bruce Ashfield 2024-03-21 23:15:13 +00:00
parent 4e6a74ff63
commit 4666b2a2d8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
recipes-extended/images/xen-image-minimal.bb
View File

@ -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}

2
wic/qemuboot-xen-x86-64.cfg
View File

@ -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