From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Tue, 24 Jan 2017 13:43:54 +0000 (+0200)
Subject: image_types: use correct output directory
X-Git-Tag: uninative-1.5~559
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3983507bf859f6c3c29e9dea06ffe51f42c0759c;p=openembedded-core.git

image_types: use correct output directory

Wic put result images into <output dir>/build, which was confusing.
Now it's fixed in wic code and images are put into output directory.
Changed code in image_types to reflect this.

[YOCTO #10783]

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index d3c7326b19..005d1e2d4e 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -217,7 +217,7 @@ IMAGE_CMD_wic () {
 	fi
 
 	BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS}
-	mv "$out/build/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic"
+	mv "$out/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic"
 	rm -rf "$out/"
 }
 IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES"