aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-07 23:45:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-08 09:22:37 +0000
commit93d79fc162bd49387958e9e4d898dc4ba50d20b0 (patch)
tree4cde2fe864dece3a2af385c10972949db86c40d4
parent64efe68c731d202059880b2fb61a282b9ad1c3e6 (diff)
downloadopenembedded-core-contrib-93d79fc162bd49387958e9e4d898dc4ba50d20b0.tar.gz
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@linuxfoundation.org>
-rw-r--r--meta/classes/rm_work.bbclass9
1 files changed, 9 insertions, 0 deletions
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 7979a53a38..e68d02a783 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')
+}