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 <[email protected]> --- recipes-extended/xen/xen.inc | 9 +++++++++ recipes-extended/xen/xen_4.6.0.bb | 11 ----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index 3e029ee..6f52765 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc @@ -691,6 +691,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" @@ -718,6 +723,10 @@ 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 \ " # check for XSM in package config to allow XSM_ENABLE to be set diff --git a/recipes-extended/xen/xen_4.6.0.bb b/recipes-extended/xen/xen_4.6.0.bb index 95570a7..3e99324 100644 --- a/recipes-extended/xen/xen_4.6.0.bb +++ b/recipes-extended/xen/xen_4.6.0.bb @@ -10,17 +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" -- 2.4.10 -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
