From d45d4a5a21ab4209b87331dddf515ecdb62367fa Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 28 Jan 2017 14:40:36 +0000 Subject: 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 --- meta/classes/staging.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/classes/staging.bbclass') diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index fdb393bbb9..b9c84a4057 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) -- cgit v1.2.3-54-g00ecf