From dec4fb1beea753e0c917981f61571ec3bb5e7b35 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 6 Oct 2011 23:11:18 +0100 Subject: [PATCH] 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 with some tweaks from me. (From OE-Core rev: 5e9488495401399d39fcb5012b86c313b6caca73) (From OE-Core rev: e8efeedbc2ec1587b1c4d938c25cacd4e8611053) Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 9 +++++++-- 1 file 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): bb.utils.unlockfile(lock) stfile = d.getVar("STAMP", True) + ".do_" + ss['task'] + extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info') oe.path.remove(stfile) oe.path.remove(stfile + "_setscene") - oe.path.remove(stfile + ".*") - oe.path.remove(stfile + "_setscene" + ".*") + if extrainf: + oe.path.remove(stfile + ".*" + extrainf) + oe.path.remove(stfile + "_setscene" + ".*" + extrainf) + else: + oe.path.remove(stfile + ".*") + oe.path.remove(stfile + "_setscene" + ".*") CLEANFUNCS += "sstate_cleanall"