diff options
-rw-r--r-- | recipes-extended/images/xen-image-minimal.bb | 7 | ||||
-rw-r--r-- | wic/qemuboot-xen-x86-64.cfg | 2 |
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 += " \ | |||
14 | ${XEN_KERNEL_MODULES} \ | 14 | ${XEN_KERNEL_MODULES} \ |
15 | xen-tools \ | 15 | xen-tools \ |
16 | qemu \ | 16 | qemu \ |
17 | kernel-image \ | ||
18 | kernel-vmlinux \ | ||
17 | " | 19 | " |
18 | 20 | ||
19 | # The hypervisor may not be within the dom0 filesystem image but at least | 21 | # The hypervisor may not be within the dom0 filesystem image but at least |
@@ -50,20 +52,24 @@ do_check_xen_state() { | |||
50 | 52 | ||
51 | addtask check_xen_state before do_rootfs | 53 | addtask check_xen_state before do_rootfs |
52 | 54 | ||
55 | # note: this may be unused, see the wic plugin | ||
53 | syslinux_iso_populate:append() { | 56 | syslinux_iso_populate:append() { |
54 | install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${ISODIR}${ISOLINUXDIR} | 57 | install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${ISODIR}${ISOLINUXDIR} |
55 | install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${ISODIR}${ISOLINUXDIR} | 58 | install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${ISODIR}${ISOLINUXDIR} |
56 | } | 59 | } |
57 | 60 | ||
61 | # note: this may be unused, see the wic plugin | ||
58 | syslinux_hddimg_populate:append() { | 62 | syslinux_hddimg_populate:append() { |
59 | install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${HDDDIR}${SYSLINUXDIR} | 63 | install -m 0444 ${STAGING_DATADIR}/syslinux/libcom32.c32 ${HDDDIR}${SYSLINUXDIR} |
60 | install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${HDDDIR}${SYSLINUXDIR} | 64 | install -m 0444 ${STAGING_DATADIR}/syslinux/mboot.c32 ${HDDDIR}${SYSLINUXDIR} |
61 | } | 65 | } |
62 | 66 | ||
67 | # note: this may be unused, see the wic plugin | ||
63 | grubefi_populate:append() { | 68 | grubefi_populate:append() { |
64 | install -m 0644 ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz ${DEST}${EFIDIR}/xen.gz | 69 | install -m 0644 ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz ${DEST}${EFIDIR}/xen.gz |
65 | } | 70 | } |
66 | 71 | ||
72 | # note: this may be unused, see the wic plugin | ||
67 | syslinux_populate:append() { | 73 | syslinux_populate:append() { |
68 | install -m 0644 ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz ${DEST}/xen.gz | 74 | install -m 0644 ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz ${DEST}/xen.gz |
69 | } | 75 | } |
@@ -71,6 +77,7 @@ syslinux_populate:append() { | |||
71 | SYSLINUX_XEN_ARGS ?= "loglvl=all guest_loglvl=all console=com1,vga com1=115200,8n1" | 77 | SYSLINUX_XEN_ARGS ?= "loglvl=all guest_loglvl=all console=com1,vga com1=115200,8n1" |
72 | SYSLINUX_KERNEL_ARGS ?= "ramdisk_size=32768 root=/dev/ram0 rw console=hvc0 earlyprintk=xen console=tty0 panic=10 LABEL=boot debugshell=5" | 78 | SYSLINUX_KERNEL_ARGS ?= "ramdisk_size=32768 root=/dev/ram0 rw console=hvc0 earlyprintk=xen console=tty0 panic=10 LABEL=boot debugshell=5" |
73 | 79 | ||
80 | # note: this may be unused, see the wic plugin | ||
74 | build_syslinux_cfg () { | 81 | build_syslinux_cfg () { |
75 | echo "ALLOWOPTIONS 1" > ${SYSLINUX_CFG} | 82 | echo "ALLOWOPTIONS 1" > ${SYSLINUX_CFG} |
76 | echo "DEFAULT boot" >> ${SYSLINUX_CFG} | 83 | 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 | |||
5 | 5 | ||
6 | LABEL boot | 6 | LABEL boot |
7 | KERNEL mboot.c32 | 7 | KERNEL mboot.c32 |
8 | APPEND /xen.gz console=com1,vga com1=115200,8n1 loglvl=all guest_loglvl=all --- /vmlinuz console=hvc0 earlyprintk=xen root=/dev/sda2 pmtmr=0 | 8 | APPEND /xen.gz console=com1,vga com1=115200,8n1 loglvl=all guest_loglvl=all --- /bZimage console=hvc0 earlyprintk=xen root=/dev/sda2 pmtmr=0 |