From 5817c4a29b361812b87eddb2bbb623344dccbdc2 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 26 Jan 2016 13:09:21 -0600 Subject: xen: move bits common to all Xen versions to xen.inc These items are common for all Xen versions since at least 4.5 and newer so these should just go in the common include file. Signed-off-by: Doug Goldstein Signed-off-by: Bruce Ashfield --- recipes-extended/xen/xen.inc | 14 ++++++++++++++ recipes-extended/xen/xen_4.6.0.bb | 17 ----------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index 86508ff4..a46421b8 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc @@ -693,6 +693,11 @@ python () { raise bb.parse.SkipPackage('Cannot map `%s` to a xen architecture' % d.getVar('TARGET_ARCH', True)) } +# Yocto appends ${PN} to libexecdir by default and Xen appends 'xen' as well +# the result is a nested xen/xen/ so let's avoid that by shunning Yocto's +# extra ${PN} appended. +libexecdir = "${libdir}" + # hardcoded as Linux, as the only compatible hosts are Linux. export XEN_OS = "Linux" @@ -720,8 +725,17 @@ EXTRA_OECONF += " \ --disable-xenstore-stubdom \ --disable-rombios \ --disable-ocamltools \ + --with-initddir=${INIT_D_DIR} \ + --with-sysconfig-leaf-dir=default \ + --with-system-qemu=/usr/bin/qemu-system-i386 \ + --disable-qemu-traditional \ " +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" + # check for XSM in package config to allow XSM_ENABLE to be set python () { pkgconfig = d.getVar('PACKAGECONFIG', True) diff --git a/recipes-extended/xen/xen_4.6.0.bb b/recipes-extended/xen/xen_4.6.0.bb index 95570a75..93c6d2ef 100644 --- a/recipes-extended/xen/xen_4.6.0.bb +++ b/recipes-extended/xen/xen_4.6.0.bb @@ -10,23 +10,6 @@ SRC_URI[sha256sum] = "6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478 S = "${WORKDIR}/xen-${PV}" -# Xen suffixes the libexecdir within its configure scripts, prevent the nested xen/xen/ -libexecdir = "${libdir}" - -# These options override detected values from the build. -EXTRA_OECONF_append += " \ - --with-initddir=${INIT_D_DIR} \ - --with-sysconfig-leaf-dir=default \ - --with-system-qemu=/usr/bin/qemu-system-i386 \ - --disable-qemu-traditional \ - " - -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_install_append() { # fixup default path to qemu-system-i386 sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#' ${D}/etc/init.d/xencommons -- cgit v1.2.3-54-g00ecf