diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-24 15:43:54 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-31 14:38:32 +0000 |
| commit | 6d78ff1144642c17d36ec3b1365059257152819c (patch) | |
| tree | 5a7dcf9b8ddff6ce3d1d42c90bd87345cd1b0d2d | |
| parent | 3407f252166e017b9e4a11803e57288f99c81aed (diff) | |
| download | poky-6d78ff1144642c17d36ec3b1365059257152819c.tar.gz | |
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]
(From OE-Core rev: 3983507bf859f6c3c29e9dea06ffe51f42c0759c)
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.bbclass | 2 |
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 () { | |||
| 217 | fi | 217 | fi |
| 218 | 218 | ||
| 219 | BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS} | 219 | BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS} |
| 220 | mv "$out/build/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" | 220 | mv "$out/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" |
| 221 | rm -rf "$out/" | 221 | rm -rf "$out/" |
| 222 | } | 222 | } |
| 223 | IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" | 223 | IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" |