summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-06 23:11:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-07 11:35:43 +0100
commit439792ea5fbf2ec6179f0e29e776039c05903197 (patch)
tree79ab40836f2f90d8eb4e230a2511659cc6dfb148
parent6706c7bdd2de6e0e447d90062e74a718a8d31778 (diff)
downloadpoky-439792ea5fbf2ec6179f0e29e776039c05903197.tar.gz
sstate.bbclass: Ensure machine specific stamps are only wiped for the current task
sstate was being a little too ethusiastic about removing stamp files and was removing stamp files for other machines when it shouldn't have been. This patch teaches sstate about machine specific stamp extensions and allows it to only remove the current task's stampfiles. Based on a patch from Phil Blundell <philb@gnu.org> with some tweaks from me. (From OE-Core rev: 5e9488495401399d39fcb5012b86c313b6caca73) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index eee04ab3f5..6abf55bb14 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -259,10 +259,15 @@ def sstate_clean(ss, d):
259 bb.utils.unlockfile(lock) 259 bb.utils.unlockfile(lock)
260 260
261 stfile = d.getVar("STAMP", True) + ".do_" + ss['task'] 261 stfile = d.getVar("STAMP", True) + ".do_" + ss['task']
262 extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info')
262 oe.path.remove(stfile) 263 oe.path.remove(stfile)
263 oe.path.remove(stfile + "_setscene") 264 oe.path.remove(stfile + "_setscene")
264 oe.path.remove(stfile + ".*") 265 if extrainf:
265 oe.path.remove(stfile + "_setscene" + ".*") 266 oe.path.remove(stfile + ".*" + extrainf)
267 oe.path.remove(stfile + "_setscene" + ".*" + extrainf)
268 else:
269 oe.path.remove(stfile + ".*")
270 oe.path.remove(stfile + "_setscene" + ".*")
266 271
267CLEANFUNCS += "sstate_cleanall" 272CLEANFUNCS += "sstate_cleanall"
268 273