[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4366/8267] image_types: use correct output directory

[Emmanuele Bassi <ebassi src gnome org>]

commit 6d78ff1144642c17d36ec3b1365059257152819c
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Tue Jan 24 15:43:54 2017 +0200

    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>

 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 d3c7326..005d1e2 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"