diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-02-24 16:05:44 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-25 08:01:09 +0000 |
commit | d7eb0f5731436bb13f8aacac71527c0372069fb6 (patch) | |
tree | 3c1248b46ae1521f024f385dbc275a9fafb8f144 /meta/classes | |
parent | 61890967ed21bf047dd0e80a00012d6478372fa7 (diff) | |
download | poky-d7eb0f5731436bb13f8aacac71527c0372069fb6.tar.gz |
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].
(From OE-Core rev: 4708859e5627488251dc4250d45cb5f4e9736b8a)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/sstate.bbclass | 3 |
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): | |||
375 | # Keep the sigdata | 375 | # Keep the sigdata |
376 | if ".sigdata." in stfile: | 376 | if ".sigdata." in stfile: |
377 | continue | 377 | continue |
378 | # Preserve taint files in the stamps directory | ||
379 | if stfile.endswith('.taint'): | ||
380 | continue | ||
378 | if rm_stamp in stfile or rm_setscene in stfile or \ | 381 | if rm_stamp in stfile or rm_setscene in stfile or \ |
379 | stfile.endswith(rm_nohash): | 382 | stfile.endswith(rm_nohash): |
380 | oe.path.remove(stfile) | 383 | oe.path.remove(stfile) |