diff options
Diffstat (limited to 'recipes-extended/images/xen-image-minimal.bb')
-rw-r--r-- | recipes-extended/images/xen-image-minimal.bb | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/recipes-extended/images/xen-image-minimal.bb b/recipes-extended/images/xen-image-minimal.bb index ea596ceb..fe79a485 100644 --- a/recipes-extended/images/xen-image-minimal.bb +++ b/recipes-extended/images/xen-image-minimal.bb @@ -5,7 +5,7 @@ INITRD_IMAGE = "core-image-minimal-initramfs" XEN_KERNEL_MODULES ?= "kernel-module-xen-blkback kernel-module-xen-gntalloc \ kernel-module-xen-gntdev kernel-module-xen-netback kernel-module-xen-wdt \ ${@bb.utils.contains('MACHINE_FEATURES', 'pci', "${XEN_PCIBACK_MODULE}", '', d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'kernel-module-xen-acpi-processor', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', '${XEN_ACPI_PROCESSOR_MODULE}', '', d)} \ " IMAGE_INSTALL += " \ @@ -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 @@ -21,17 +23,26 @@ IMAGE_INSTALL += " \ do_build[depends] += "xen:do_deploy" # Networking for HVM-mode guests (x86/64 only) requires the tun kernel module -IMAGE_INSTALL:append:x86 = "kernel-module-tun" -IMAGE_INSTALL:append:x86-64 = "kernel-module-tun" +IMAGE_INSTALL:append:x86 = " kernel-module-tun" +IMAGE_INSTALL:append:x86-64 = " kernel-module-tun" # Linux kernel option CONFIG_XEN_PCIDEV_BACKEND depends on X86 XEN_PCIBACK_MODULE = "" XEN_PCIBACK_MODULE:x86 = "kernel-module-xen-pciback" XEN_PCIBACK_MODULE:x86-64 = "kernel-module-xen-pciback" +XEN_ACPI_PROCESSOR_MODULE = "" +XEN_ACPI_PROCESSOR_MODULE:x86 = "kernel-module-xen-acpi-processor" +XEN_ACPI_PROCESSOR_MODULE:x86-64 = "kernel-module-xen-acpi-processor" LICENSE = "MIT" -inherit core-image qemuboot-xen-defaults qemuboot-xen-dtb qemuboot-testimage-network +QB_NETWORK_XEN_BRIDGE = "1" + +inherit core-image +# Only inherit the qemuboot classes when building for a qemu machine +QB_QEMU_CLASSES = "" +QB_QEMU_CLASSES:qemuall = "qemuboot-xen-defaults qemuboot-xen-dtb qemuboot-testimage-network" +inherit ${QB_QEMU_CLASSES} do_check_xen_state() { if [ "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' yes', 'no', d)}" = "no" ]; then @@ -41,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 } @@ -62,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} @@ -74,7 +90,9 @@ build_syslinux_cfg () { # Enable runqemu. eg: runqemu xen-image-minimal nographic slirp WKS_FILE:x86-64 = "directdisk-xen.wks" +WKS_FILE_DEPENDS_DEFAULT:x86-64 = "syslinux-native" WKS_FILE:qemux86-64 = "qemuboot-xen-x86-64.wks" +WKS_FILE_DEPENDS_DEFAULT:qemux86-64 = "syslinux-native" QB_MEM ?= "-m 400" QB_DEFAULT_KERNEL ?= "none" QB_DEFAULT_FSTYPE ?= "wic" |