From fd2e7465c8a01aed8a27847799744c0ca3bfb936 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 4 Feb 2015 17:22:45 +1000 Subject: xen: Add 'hvm' PACKAGECONFIG for hvmloader building * The 'hvm' PACKAGECONFIG (which is valid for x86 targets, and default enabled for x86-64 targets) enables building the hvmloader with in-built seabios, ipxe and vgabios firmware Signed-off-by: Nathan Rossi --- recipes-extended/xen/xen.inc | 5 ++++- recipes-extended/xen/xen_4.5.0.bb | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index 3f703ce4..0e4136aa 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc @@ -15,11 +15,13 @@ require xen-arch.inc PACKAGECONFIG ??= " \ sdl \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('XEN_TARGET_ARCH', 'x86_64', 'hvm', '', d)} \ " PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl," PACKAGECONFIG[xsm] = "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native," PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd," +PACKAGECONFIG[hvm] = "--with-system-seabios="${STAGING_DIR_HOST}/usr/share/firmware/bios.bin",--disable-seabios,seabios ipxe vgabios," DEPENDS = " \ bison-native \ @@ -686,7 +688,8 @@ EXTRA_OECONF += " \ --disable-ioemu-stubdom \ --disable-pv-grub \ --disable-xenstore-stubdom \ -" + --disable-rombios \ + " do_configure() { # no stubs-32.h in our 64-bit sysroot - hack it into tools/include/gnu diff --git a/recipes-extended/xen/xen_4.5.0.bb b/recipes-extended/xen/xen_4.5.0.bb index cef0665a..6c17b906 100644 --- a/recipes-extended/xen/xen_4.5.0.bb +++ b/recipes-extended/xen/xen_4.5.0.bb @@ -19,9 +19,14 @@ EXTRA_OECONF_append += " \ --with-sysconfig-leaf-dir=default \ --with-system-qemu=/usr/bin/qemu-system-i386 \ --disable-qemu-traditional \ - --disable-seabios \ " +EXTRA_OEMAKE += "STDVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.7a.bin" +EXTRA_OEMAKE += "CIRRUSVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.7a.cirrus.bin" +EXTRA_OEMAKE += "SEABIOS_ROM=${STAGING_DIR_HOST}/usr/share/firmware/bios.bin" +EXTRA_OEMAKE += "ETHERBOOT_ROMS=${STAGING_DIR_HOST}/usr/share/firmware/rtl8139.rom" +#EXTRA_OEMAKE += "XENGFX_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios.bin" + do_configure_prepend() { # fixup AS/CC/CCP/etc variable within StdGNU.mk for i in AS LD CC CPP AR RANLIB NM STRIP OBJCOPY OBJDUMP; do -- cgit v1.2.3-54-g00ecf