[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4360/8267] staging: Handle stale sysroot rebuild issue

[Emmanuele Bassi <ebassi src gnome org>]

commit d45d4a5a21ab4209b87331dddf515ecdb62367fa
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Sat Jan 28 14:40:36 2017 +0000

    staging: Handle stale sysroot rebuild issue
    
    If a stale sysroot object was found the complete stamp wasn't removed,
    meaning later code could fail when the new link creation was attempted.
    Ensure the stale complete stamp is also removed if present.
    
    (From OE-Core rev: d7d26488f252d60628862ee114a4404e8d6cb6f1)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/staging.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index fdb393b..b9c84a4 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -520,6 +520,8 @@ python extend_recipe_sysroot() {
                 bb.note("%s exists in sysroot, but is stale (%s vs. %s), removing." % (c, lnk, c + "." + 
taskhash))
                 sstate_clean_manifest(depdir + "/" + lnk, d, workdir)
                 os.unlink(depdir + "/" + c)
+                if os.path.lexists(depdir + "/" + c + ".complete"):
+                    os.unlink(depdir + "/" + c + ".complete")
         elif os.path.lexists(depdir + "/" + c):
             os.unlink(depdir + "/" + c)