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>2012-01-30 16:37:58 +0000
commitdec4fb1beea753e0c917981f61571ec3bb5e7b35 (patch)
tree0a3278598c5f218ae8b5ef77b4bfae596afb9a3c
parentef1a8f21e068ca996ce946dbac5e8ee93cdaa220 (diff)
downloadpoky-dec4fb1beea753e0c917981f61571ec3bb5e7b35.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) (From OE-Core rev: e8efeedbc2ec1587b1c4d938c25cacd4e8611053) 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 91f209a9cf..7e688a8840 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -258,10 +258,15 @@ def sstate_clean(ss, d):
258 bb.utils.unlockfile(lock) 258 bb.utils.unlockfile(lock)
259 259
260 stfile = d.getVar("STAMP", True) + ".do_" + ss['task'] 260 stfile = d.getVar("STAMP", True) + ".do_" + ss['task']
261 extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info')
261 oe.path.remove(stfile) 262 oe.path.remove(stfile)
262 oe.path.remove(stfile + "_setscene") 263 oe.path.remove(stfile + "_setscene")
263 oe.path.remove(stfile + ".*") 264 if extrainf:
264 oe.path.remove(stfile + "_setscene" + ".*") 265 oe.path.remove(stfile + ".*" + extrainf)
266 oe.path.remove(stfile + "_setscene" + ".*" + extrainf)
267 else:
268 oe.path.remove(stfile + ".*")
269 oe.path.remove(stfile + "_setscene" + ".*")
265 270
266CLEANFUNCS += "sstate_cleanall" 271CLEANFUNCS += "sstate_cleanall"
267 272