[oe-commits] Richard Purdie : rm_work: Fix RM_WORK_EXCLUDE for image/sdk recipes

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: dizzy
Commit: 93d79fc162bd49387958e9e4d898dc4ba50d20b0
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=93d79fc162bd49387958e9e4d898dc4ba50d20b0

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Wed Jan  7 23:45:08 2015 +0000

rm_work: Fix RM_WORK_EXCLUDE for image/sdk recipes

A previous change meant image/sdk recipes were removed unconditionally
by the class and did not respect RM_WORK_EXCLUDE. This fixes that
problem.

[YOCTO #7114]

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/rm_work.bbclass | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 7979a53..e68d02a 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -109,3 +109,12 @@ rm_work_rootfs () {
     :
 }
 rm_work_rootfs[cleandirs] = "${WORKDIR}/rootfs"
+
+python () {
+    # If the recipe name is in the RM_WORK_EXCLUDE, skip the recipe.
+    excludes = (d.getVar("RM_WORK_EXCLUDE", True) or "").split()
+    pn = d.getVar("PN", True)
+    if pn in excludes:
+        d.delVarFlag('rm_work_rootfs', 'cleandirs')
+        d.delVarFlag('rm_work_populatesdk', 'cleandirs')
+}