summaryrefslogtreecommitdiffstats
path: root/meta/classes/staging.bbclass
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:31:18 +0000
commitd7d26488f252d60628862ee114a4404e8d6cb6f1 (patch)
treee67f639d63260fa760cd51e3ac00ffed224ce46b /meta/classes/staging.bbclass
parent46bd7e48cb5ae654d915fa493420534219682e85 (diff)
downloadopenembedded-core-d7d26488f252d60628862ee114a4404e8d6cb6f1.tar.gz
openembedded-core-d7d26488f252d60628862ee114a4404e8d6cb6f1.tar.bz2
openembedded-core-d7d26488f252d60628862ee114a4404e8d6cb6f1.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/staging.bbclass')
-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() {
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)