aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-02-24 16:05:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-24 16:18:57 +0000
commit4708859e5627488251dc4250d45cb5f4e9736b8a (patch)
tree17c7b84df65d4dbf8696c4391956bcd14fcd6f04
parent255079780729f0dd9df6f35302169e0c8480eced (diff)
downloadopenembedded-core-contrib-4708859e5627488251dc4250d45cb5f4e9736b8a.tar.gz
openembedded-core-contrib-4708859e5627488251dc4250d45cb5f4e9736b8a.tar.bz2
openembedded-core-contrib-4708859e5627488251dc4250d45cb5f4e9736b8a.zip
classes/sstate: fix taints being undone on execution of sstate tasks
The code here that deletes stamps was also deleting the taint files; so forcing an sstate task with -f would force it to execute and then because the taint file was deleted in the process, the next execution would simply restore the output from sstate again. We need to exclude the taint files just like we did in bb.build.make_stamp(). Fixes [YOCTO #5805]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index f7bd1174d8..c4f437bde5 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -375,6 +375,9 @@ def sstate_clean(ss, d):
# Keep the sigdata
if ".sigdata." in stfile:
continue
+ # Preserve taint files in the stamps directory
+ if stfile.endswith('.taint'):
+ continue
if rm_stamp in stfile or rm_setscene in stfile or \
stfile.endswith(rm_nohash):
oe.path.remove(stfile)