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>

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index f7bd1174d8cfbe9998a136d24632047deba270ed..c4f437bde50893fac4e7ec192935abc0296b886d 100644 (file)
--- 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)