[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5574/8267] staging: Fix sysroot problem with populate_sysroot dependencies on do_fetch

[Emmanuele Bassi <ebassi src gnome org>]

commit 177d4be3c1714270e4d94fcea3106934a7d5c6e5
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Mon Apr 10 19:59:33 2017 +0100

    staging: Fix sysroot problem with populate_sysroot dependencies on do_fetch
    
    Dependencies on svn:// urls were failing as the cleandirs on do_fetch was destroying
    any sysroot setup by the extend_recipe_sysroot function.
    
    Add code so that if the task do_fetch, we move the cleandirs to the extend_recipe_sysroot
    task else we'd wipe out the sysroot we just created.
    
    This allows fetcher do_populate_sysroot dependencies to work correctly again.
    
    (From OE-Core rev: cd5e0a32184d98beb8d81e6b5527166d3ca4fb3c)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/staging.bbclass |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 27fcd1e..c50abd0 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -647,6 +647,11 @@ 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