From a19e5567dc9f34d0c52fdb40544f82bba41bf0d0 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 26 Jan 2016 13:09:20 -0600 Subject: xen: separate the extra steps into their own tasks do_configure() was overloaded with a lot of behaviors that really were source code patching so instead make them as extra tasks that happen after do_patch() and before do_configure(). Signed-off-by: Doug Goldstein Signed-off-by: Bruce Ashfield --- recipes-extended/xen/xen.inc | 21 ++++++++++++++++++++- recipes-extended/xen/xen_4.6.0.bb | 12 ------------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc index 789fd343..86508ff4 100644 --- a/recipes-extended/xen/xen.inc +++ b/recipes-extended/xen/xen.inc @@ -731,7 +731,21 @@ python () { d.setVar('XSM_ENABLED', '0') } -do_configure() { +do_post_patch() { + # fixup AS/CC/CCP/etc variable within StdGNU.mk + for i in LD CC CPP CXX; do + sed -i "s/^\($i\s\s*\).*=/\1?=/" ${S}/config/StdGNU.mk + done + # fixup environment passing in some makefiles + sed -i 's#\(\w*\)=\(\$.\w*.\)#\1="\2"#' ${S}/tools/firmware/Makefile + + # libsystemd-daemon -> libsystemd for newer systemd versions + sed -i 's#libsystemd-daemon#libsystemd#' ${S}/tools/configure +} + +addtask post_patch after do_patch before do_configure + +do_stubs() { # no stubs-32.h in our 64-bit sysroot - hack it into tools/include/gnu if ! test -f ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-32.h ; then if test -f ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-64.h ; then @@ -742,6 +756,11 @@ do_configure() { echo \#define __stub___kernel_tanl >> ${S}/tools/include/gnu/stubs-32.h fi fi +} + +addtask stubs after do_patch before do_configure + +do_configure() { #./configure --enable-xsmpolicy does not set XSM_ENABLE must be done manually if [ "${XSM_ENABLED}" = "1" ]; then diff --git a/recipes-extended/xen/xen_4.6.0.bb b/recipes-extended/xen/xen_4.6.0.bb index 92975a08..95570a75 100644 --- a/recipes-extended/xen/xen_4.6.0.bb +++ b/recipes-extended/xen/xen_4.6.0.bb @@ -27,18 +27,6 @@ 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 LD CC CPP CXX; do - sed -i "s/^\($i\s\s*\).*=/\1?=/" ${S}/config/StdGNU.mk - done - # fixup environment passing in some makefiles - sed -i 's#\(\w*\)=\(\$.\w*.\)#\1="\2"#' ${S}/tools/firmware/Makefile - - # libsystemd-daemon -> libsystemd for newer systemd versions - sed -i 's#libsystemd-daemon#libsystemd#' ${S}/tools/configure -} - 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