[PATCH v4 - misc fixes 1/6] wic-img: do not leave temporary files behind

[Cedric Hombourger <Cedric_Hombourger@mentor.com>]

We do not seem to make any use of the timestamped wic images being
generated and worse we are leaving them in the buildchroot tmp folder.
"mv" the generated files instead of "cp"'ing them to the deploy
directory.

Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
---
 meta/classes/wic-img.bbclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass
index 795640f..24c3b65 100644
--- a/meta/classes/wic-img.bbclass
+++ b/meta/classes/wic-img.bbclass
@@ -155,8 +155,12 @@ EOSUDO
             -e ${IMAGE_BASENAME} ${WIC_CREATE_EXTRA_ARGS}
     sudo chown -R $(stat -c "%U" ${ISARROOT}) ${ISARROOT}/meta ${ISARROOT}/meta-isar ${ISARROOT}/scripts || true
     WIC_DIRECT=$(ls -t -1 ${BUILDCHROOT_DIR}/$WICTMP/${IMAGE_FULLNAME}.wic/*.direct | head -1)
-    cp -f ${WIC_DIRECT} ${WIC_IMAGE_FILE}
-    cp -f ${WIC_DIRECT}.bmap ${WIC_IMAGE_FILE}.bmap
+    sudo chown $(stat -c "%U:%G" ${ISARROOT}) ${WIC_DIRECT} ${WIC_DIRECT}.bmap
+    sudo mv -f ${WIC_DIRECT} ${WIC_IMAGE_FILE}
+    sudo mv -f ${WIC_DIRECT}.bmap ${WIC_IMAGE_FILE}.bmap
+    sudo rmdir --ignore-fail-on-non-empty \
+        ${BUILDCHROOT_DIR}/${WICTMP}/${IMAGE_FULLNAME}.wic \
+        ${BUILDCHROOT_DIR}/${WICTMP}
 }
 
 do_wic_image[file-checksums] += "${WKS_FILE_CHECKSUM}"
-- 
2.20.1