summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-11 00:56:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-11 00:56:58 +0100
commitec2931852b2a097c9c8cb0d7288f5ca1d79f401c (patch)
tree7a30c520518f90fc290714bd2f21ee228bbc3457
parentcd5e0a32184d98beb8d81e6b5527166d3ca4fb3c (diff)
downloadopenembedded-core-contrib-ec2931852b2a097c9c8cb0d7288f5ca1d79f401c.tar.gz
openembedded-core-contrib-ec2931852b2a097c9c8cb0d7288f5ca1d79f401c.tar.bz2
openembedded-core-contrib-ec2931852b2a097c9c8cb0d7288f5ca1d79f401c.zip
Revert "staging: Fix sysroot problem with populate_sysroot dependencies on do_fetch"
There seems to be an issue with the patch, revert for now. This reverts commit cd5e0a32184d98beb8d81e6b5527166d3ca4fb3c.
-rw-r--r--meta/classes/staging.bbclass5
1 files changed, 0 insertions, 5 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index c50abd0551..27fcd1efa9 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -647,11 +647,6 @@ python staging_taskhandler() {
deps = d.getVarFlag(task, "depends")
if deps and "populate_sysroot" in deps:
d.appendVarFlag(task, "prefuncs", " extend_recipe_sysroot")
- # If this is do_fetch, we need to move the cleandirs above to the extend_recipe_sysroot task
- # else we'd wipe out the sysroot we just created.
- if task == "do_fetch":
- d.setVarFlag("extend_recipe_sysroot", "cleandirs", d.getVarFlag(task, "cleandirs"))
- d.delVarFlag(task, "cleandirs")
}
staging_taskhandler[eventmask] = "bb.event.RecipeTaskPreProcess"
addhandler staging_taskhandler