From ec2931852b2a097c9c8cb0d7288f5ca1d79f401c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 11 Apr 2017 00:56:18 +0100 Subject: 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. --- meta/classes/staging.bbclass | 5 ----- 1 file changed, 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 -- cgit 1.2.3-korg