[PATCH 06/10] wic-img: Use wks-file class for WKS_FILE lookup

[Jan Kiszka <jan.kiszka@siemens.com>]

From: Jan Kiszka <jan.kiszka@siemens.com>

Rather than letting wic search only in the canned-wks folders, use
get_wks_full_path search for WKS_FILE at all newly defined locations.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/wic-img.bbclass | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass
index fef8308..c80c927 100644
--- a/meta/classes/wic-img.bbclass
+++ b/meta/classes/wic-img.bbclass
@@ -9,6 +9,10 @@ python () {
         bb.fatal("WKS_FILE must be set")
 }
 
+inherit wks-file
+
+WKS_FULL_PATH = "${@get_wks_full_path(d)}"
+
 # wic comes with reasonable defaults, and the proper interface is the wks file
 ROOTFS_EXTRA ?= "0"
 
@@ -75,7 +79,10 @@ do_wic_image() {
     export BUILDDIR=${BUILDDIR}
     export MTOOLS_SKIP_CHECK=1
 
-    sudo -E chroot ${BUILDCHROOT_DIR} ${ISARROOT}/scripts/wic create ${WKS_FILE} --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -o /tmp/ -e ${IMAGE_BASENAME} ${WIC_CREATE_EXTRA_ARGS}
+    sudo -E chroot ${BUILDCHROOT_DIR} \
+        ${ISARROOT}/scripts/wic create ${WKS_FULL_PATH} \
+            --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -o /tmp/ \
+            -e ${IMAGE_BASENAME} ${WIC_CREATE_EXTRA_ARGS}
     sudo chown -R $(stat -c "%U" ${ISARROOT}) ${ISARROOT}/meta ${ISARROOT}/meta-isar ${ISARROOT}/scripts || true
     cp -f `ls -t -1 ${BUILDCHROOT_DIR}/tmp/${WKS_FILE}*.direct | head -1` ${WIC_IMAGE_FILE}
 }
-- 
2.16.4