From c7ad2dada79f715e5a5d54b2711c2956217588e7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 27 Jan 2011 20:57:54 +0000 Subject: sstate: Ensure stale stamp files are removed as part of sstate_clean() Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'meta/classes/sstate.bbclass') diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index c83bc27bf0..d7d30c0121 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -49,8 +49,9 @@ python () { d.setVar('SSTATETASKNAMES', " ".join(namemap)) } -def sstate_init(name, d): +def sstate_init(name, task, d): ss = {} + ss['task'] = task ss['name'] = name ss['dirs'] = [] ss['plaindirs'] = [] @@ -73,7 +74,7 @@ def sstate_state_fromvars(d, task = None): if not name or len(inputs) != len(outputs): bb.fatal("sstate variables not setup correctly?!") - ss = sstate_init(name, d) + ss = sstate_init(name, task, d) for i in range(len(inputs)): sstate_add(ss, inputs[i], outputs[i], d) ss['lockfiles'] = lockfiles @@ -219,6 +220,7 @@ def sstate_clean_manifest(manifest, d): oe.path.remove(manifest) def sstate_clean(ss, d): + import oe.path manifest = bb.data.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'], d) @@ -234,6 +236,8 @@ def sstate_clean(ss, d): for lock in locks: bb.utils.unlockfile(lock) + oe.path.remove(d.getVar("STAMP", True) + ".do_" + ss['task'] + "*") + SCENEFUNCS += "sstate_cleanall" CLEANFUNCS += "sstate_cleanall" -- cgit v1.2.3-54-g00ecf