summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Jorns <ejo@pengutronix.de>2020-02-09 14:19:31 +0100
committerEnrico Jorns <ejo@pengutronix.de>2020-03-27 08:53:16 +0100
commit891f757347a26e4b6b0443793c0a84f49c3a11a3 (patch)
treed0f0572c69ed6249b8289da153f8c1bb77b64e85
parentdff9d579bb4e8fcb13c1b7f49cb7fed476b19778 (diff)
downloadmeta-ptx-891f757347a26e4b6b0443793c0a84f49c3a11a3.tar.gz
meta-ptx-891f757347a26e4b6b0443793c0a84f49c3a11a3.tar.xz
classes: genimage: make use of [cleandirs] varflag to setup tmpdirs
The cleandirs varflag of a task allows to specify *empty* directories to create before the task runs, which is exactly what we did manually before. Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
-rw-r--r--classes/genimage.bbclass8
1 files changed, 2 insertions, 6 deletions
diff --git a/classes/genimage.bbclass b/classes/genimage.bbclass
index 38b5f54..076db02 100644
--- a/classes/genimage.bbclass
+++ b/classes/genimage.bbclass
@@ -88,17 +88,13 @@ do_genimage[depends] += "${@'${GENIMAGE_ROOTFS_IMAGE}:do_image_complete' if '${G
GENIMAGE_TMPDIR = "${WORKDIR}/genimage-tmp"
GENIMAGE_ROOTDIR = "${WORKDIR}/root"
+do_genimage[cleandirs] = "${GENIMAGE_TMPDIR} ${GENIMAGE_ROOTDIR}"
+
fakeroot do_genimage () {
cd ${WORKDIR}
- rm -rf ${GENIMAGE_TMPDIR}
- mkdir -p ${GENIMAGE_TMPDIR}
-
sed -i s:@IMAGE@:${GENIMAGE_IMAGE_NAME}.${GENIMAGE_IMAGE_SUFFIX}:g ${WORKDIR}/genimage.config
- rm -rf ${GENIMAGE_ROOTDIR}
- mkdir -p ${GENIMAGE_ROOTDIR}
-
# unpack input rootfs image if given
if [ "x${GENIMAGE_ROOTFS_IMAGE}" != "x" ]; then
bbnote "Unpacking ${DEPLOY_DIR_IMAGE}/${GENIMAGE_ROOTFS_IMAGE}-${MACHINE}.${GENIMAGE_ROOTFS_IMAGE_FSTYPE} to ${GENIMAGE_ROOTDIR}"