Patchwork [1/4] classes/sstate: fix taints being undone on execution of sstate tasks

login
register
mail settings
Submitter Paul Eggleton
Date Feb. 24, 2014, 4:05 p.m.
Message ID <4de333a454da92ea76af9ac8b296b44e94fc9af1.1393257867.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/67269/
State New
Headers show

Comments

Paul Eggleton - Feb. 24, 2014, 4:05 p.m.
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>
---
 meta/classes/sstate.bbclass | 3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index f7bd117..c4f437b 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)