summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-24 15:43:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:12:47 +0000
commit3983507bf859f6c3c29e9dea06ffe51f42c0759c (patch)
tree1b09aa9ffa8a11b4ed8cbd84dc4742a35ae5888c
parent2f92c0490f1acf5a6926fc6654ce3b6588ddcc24 (diff)
downloadopenembedded-core-3983507bf859f6c3c29e9dea06ffe51f42c0759c.tar.gz
openembedded-core-3983507bf859f6c3c29e9dea06ffe51f42c0759c.tar.bz2
openembedded-core-3983507bf859f6c3c29e9dea06ffe51f42c0759c.zip
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>
-rw-r--r--meta/classes/image_types.bbclass2
1 files changed, 1 insertions, 1 deletions
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"