diff options
-rw-r--r-- | meta/classes/image_types_wic.bbclass | 7 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/imager/direct.py | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index 7d5ebe1cb0..fc9b106a9a 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass | |||
@@ -27,16 +27,17 @@ WIC_CREATE_EXTRA_ARGS ?= "" | |||
27 | 27 | ||
28 | IMAGE_CMD_wic () { | 28 | IMAGE_CMD_wic () { |
29 | out="${IMGDEPLOYDIR}/${IMAGE_NAME}" | 29 | out="${IMGDEPLOYDIR}/${IMAGE_NAME}" |
30 | build_wic="${WORKDIR}/build-wic" | ||
30 | wks="${WKS_FULL_PATH}" | 31 | wks="${WKS_FULL_PATH}" |
31 | if [ -z "$wks" ]; then | 32 | if [ -z "$wks" ]; then |
32 | bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately." | 33 | bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately." |
33 | fi | 34 | fi |
34 | 35 | ||
35 | BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS} | 36 | BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$build_wic/" ${WIC_CREATE_EXTRA_ARGS} |
36 | mv "$out/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" | 37 | mv "$build_wic/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" |
37 | rm -rf "$out/" | ||
38 | } | 38 | } |
39 | IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR" | 39 | IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR" |
40 | do_image_wic[cleandirs] = "${WORKDIR}/build-wic" | ||
40 | 41 | ||
41 | # Rebuild when the wks file or vars in WICVARS change | 42 | # Rebuild when the wks file or vars in WICVARS change |
42 | USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" | 43 | USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" |
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 2441cc33ad..c50645ff76 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py | |||
@@ -580,9 +580,7 @@ class PartitionedImage(): | |||
580 | self.native_sysroot) | 580 | self.native_sysroot) |
581 | 581 | ||
582 | def cleanup(self): | 582 | def cleanup(self): |
583 | # remove partition images | 583 | pass |
584 | for image in set(self.partimages): | ||
585 | os.remove(image) | ||
586 | 584 | ||
587 | def assemble(self): | 585 | def assemble(self): |
588 | logger.debug("Installing partitions") | 586 | logger.debug("Installing partitions") |