From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Mon, 14 Mar 2022 14:16:45 +0000 (+0100)
Subject: image.bbclass: Remove two unnecessary paths from do_rootfs[dirs]
X-Git-Tag: yocto-4.0~367
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d76a31a37c3b2253a6a8fdffd8581fc88987857d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

image.bbclass: Remove two unnecessary paths from do_rootfs[dirs]

There is no reason to include a path in foo[dirs] if it is also in
foo[cleandirs] (except if it is the last path in foo[dirs]).

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index eb192057c2e..7f1f6f80a46 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -252,7 +252,7 @@ fakeroot python do_rootfs () {
 
     progress_reporter.finish()
 }
-do_rootfs[dirs] = "${IMAGE_ROOTFS} ${IMGDEPLOYDIR} ${TOPDIR}"
+do_rootfs[dirs] = "${TOPDIR}"
 do_rootfs[cleandirs] += "${IMAGE_ROOTFS} ${IMGDEPLOYDIR} ${S}"
 do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}"
 addtask rootfs after do_prepare_recipe_sysroot