diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-28 13:34:33 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-28 14:14:07 +0000 |
commit | 9de050111b9ae323dcdbb666939afbf898f67de1 (patch) | |
tree | 92c7d67fbe423a3a6b933b435846bec838752d27 /bitbake/lib/bb/siggen.py | |
parent | 4493b107a7f0f9b4f441f661c16176157d950245 (diff) | |
download | poky-9de050111b9ae323dcdbb666939afbf898f67de1.tar.gz |
bitbake: build/siggen.py: Avoid removing too many stamps when cleaning
The "*" part of the mask is to ensure we clean both any stamp, and any
setscene varient. It turns out we would also trample other tasks,
e.g. do_package_write could trample do_package_write_rpm. do_package also
tramples do_package_write_* but this is less of an issue since the other
tasks depend on it.
Rather than use the wildcard, we can just use a list instead.
[YOCTO #3484]
(Bitbake rev: c14d831ea3f625e9a47266a0c4e6deefc924ca5a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/siggen.py')
-rw-r--r-- | bitbake/lib/bb/siggen.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index ff70d4ff4f..ba149402bf 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -49,7 +49,7 @@ class SignatureGenerator(object): | |||
49 | return ("%s.%s.%s" % (stampbase, taskname, extrainfo)).rstrip('.') | 49 | return ("%s.%s.%s" % (stampbase, taskname, extrainfo)).rstrip('.') |
50 | 50 | ||
51 | def stampcleanmask(self, stampbase, file_name, taskname, extrainfo): | 51 | def stampcleanmask(self, stampbase, file_name, taskname, extrainfo): |
52 | return ("%s.%s*.%s" % (stampbase, taskname, extrainfo)).rstrip('.') | 52 | return ("%s.%s.%s" % (stampbase, taskname, extrainfo)).rstrip('.') |
53 | 53 | ||
54 | def dump_sigtask(self, fn, task, stampbase, runtime): | 54 | def dump_sigtask(self, fn, task, stampbase, runtime): |
55 | return | 55 | return |
@@ -276,7 +276,6 @@ class SignatureGeneratorBasicHash(SignatureGeneratorBasic): | |||
276 | k = fn + "." + taskname | 276 | k = fn + "." + taskname |
277 | if clean: | 277 | if clean: |
278 | h = "*" | 278 | h = "*" |
279 | taskname = taskname + "*" | ||
280 | elif k in self.taskhash: | 279 | elif k in self.taskhash: |
281 | h = self.taskhash[k] | 280 | h = self.taskhash[k] |
282 | else: | 281 | else: |