summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-28 14:40:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-28 23:32:16 +0000
commitd45d4a5a21ab4209b87331dddf515ecdb62367fa (patch)
tree464cb25e0933e6d23954067c0370b62b064dd3a1
parentf66f1af4b165d713b2e0bb0b8f6123cf82fad456 (diff)
downloadpoky-d45d4a5a21ab4209b87331dddf515ecdb62367fa.tar.gz
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>
-rw-r--r--meta/classes/staging.bbclass2
1 files changed, 2 insertions, 0 deletions
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() {
520 bb.note("%s exists in sysroot, but is stale (%s vs. %s), removing." % (c, lnk, c + "." + taskhash)) 520 bb.note("%s exists in sysroot, but is stale (%s vs. %s), removing." % (c, lnk, c + "." + taskhash))
521 sstate_clean_manifest(depdir + "/" + lnk, d, workdir) 521 sstate_clean_manifest(depdir + "/" + lnk, d, workdir)
522 os.unlink(depdir + "/" + c) 522 os.unlink(depdir + "/" + c)
523 if os.path.lexists(depdir + "/" + c + ".complete"):
524 os.unlink(depdir + "/" + c + ".complete")
523 elif os.path.lexists(depdir + "/" + c): 525 elif os.path.lexists(depdir + "/" + c):
524 os.unlink(depdir + "/" + c) 526 os.unlink(depdir + "/" + c)
525 527