xen, xen-tools: move tools-specific EXTRA_OECONF to xen-tools.inc

Since the hypervisor recipe does not install init scripts, it does not
include update-rc.d.bbclass, which defines INIT_D_DIR; so move the use
of that and systemd and qemu tools-specific configure settings over into
the tools include file. Fix a hardcoded bindir while at it.

Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 8 insertions, 5 deletions

diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc
index 99e7e0b8..ace1a013 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -730,6 +730,14 @@ ADD_SYSROOT32_CFLAGS_x86-64 = \
 # This x86-64 override is never intended for native use, so clear that.
 ADD_SYSROOT32_CFLAGS_class-native = ""
 
+EXTRA_OECONF += " \
+    --with-systemd=${systemd_unitdir}/system \
+    --with-systemd-modules-load=${systemd_unitdir}/modules-load.d \
+    --with-initddir=${INIT_D_DIR} \
+    --with-sysconfig-leaf-dir=default \
+    --with-system-qemu=${bindir}/qemu-system-i386 \
+    "
+
 do_configure() {
     do_configure_common
 
diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.inc
index 3c1e3b95..9e8fcad2 100644
--- a/recipes-extended/xen/xen.inc
+++ b/recipes-extended/xen/xen.inc
@@ -118,17 +118,12 @@ EXTRA_OECONF += " \
     --exec-prefix=${prefix} \
     --prefix=${prefix} \
     --host=${HOST_SYS} \
-    --with-systemd=${systemd_unitdir}/system \
-    --with-systemd-modules-load=${systemd_unitdir}/modules-load.d \
     --disable-stubdom \
     --disable-ioemu-stubdom \
     --disable-pv-grub \
     --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 \
     "