summaryrefslogtreecommitdiff
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-07 23:48:24 +0000
commit050de16968fe6efeba5d64761b11512549e9fdc2 (patch)
tree01ed58c1b6ef915232d8c6a5a74d59bff87561ac
parentef303442278c900cd6bfd529692cb9de80e31353 (diff)
downloadopenembedded-core-050de16968fe6efeba5d64761b11512549e9fdc2.tar.gz
openembedded-core-050de16968fe6efeba5d64761b11512549e9fdc2.tar.bz2
openembedded-core-050de16968fe6efeba5d64761b11512549e9fdc2.zip
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.bbclass8
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 7b1ec17205..e68d02a783 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -110,3 +110,11 @@ 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')
+}