arm-autonomy/host-image-minimal: use XENGUEST_MANAGER_GUEST_DIR in image recipe

Created conf/xenguest.conf which defines XENGUEST_MANAGER_GUEST_DIR for both
arm-autonomy-host-image-minimal and xenguest-manager to ensure the value is
aligned.

Issue-Id: SCM-2168
Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
Change-Id: I9cd5a351b5910bb122b275f47d542798b2df7b1f
Signed-off-by: Jon Mason <jon.mason@arm.com>

meta-arm-autonomy/conf/xenguest.conf

@@ -0,0 +1,5 @@
+# This file will be required by different xenguest recipes to provide
+# common variables, which can be configured in local.conf
+
+# Xenguest image file install location
+XENGUEST_MANAGER_GUEST_DIR ?= "${datadir}/guests/"

meta-arm-autonomy/recipes-core/images/arm-autonomy-host-image-minimal.bb

@@ -83,6 +83,9 @@ do_image[mcdepends] += "${DO_IMAGE_MCDEPENDS}"
 REQUIRED_DISTRO_FEATURES += 'arm-autonomy-host'
 REQUIRED_DISTRO_FEATURES += 'xen'
 
+# Configurable guest variables
+require conf/xenguest.conf
+
 python __anonymous() {
     import re
     guestfile_pattern = re.compile(r"^([^;]+);")
@@ -133,7 +136,7 @@ python __anonymous() {
 
 python add_extern_guests () {
     # Destination directory on the rootfs
-    guestdir = d.getVar('IMAGE_ROOTFS') + d.getVar('datadir') + '/guests'
+    guestdir = d.getVar('IMAGE_ROOTFS') + d.getVar('XENGUEST_MANAGER_GUEST_DIR')
 
     # Parse SRC_URI for files with ;guestname= parameter
     src_uri = d.getVar('SRC_URI')

meta-arm-autonomy/recipes-extended/xenguest/xenguest-manager.bb

@@ -29,8 +29,10 @@ S = "${WORKDIR}"
 # parameters
 XENGUEST_MANAGER_VOLUME_DEVICE ?= "/dev/sda2"
 XENGUEST_MANAGER_VOLUME_NAME ?= "vg-xen-$(basename ${XENGUEST_MANAGER_VOLUME_DEVICE})"
-XENGUEST_MANAGER_GUEST_DIR ?= "${datadir}/guests/"
 XENGUEST_MANAGER_LOG_LEVEL ?= "ERROR"
+#XENGUEST_MANAGER_GUEST_DIR set in xenguest.conf
+
+require conf/xenguest.conf
 
 # We add an init script to create and start guests automatically
 # run start script after xen-tools and run stop script before xen-tools