From 4336d676d44b18242691306d319b4c57fb591ced Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Tue, 23 Nov 2010 00:35:03 +0800 Subject: siggen.py: fix the wrong usage on BB_TASKHASH_WHITELIST BB_TASKHASH_WHITELIST is expected to filter out native tasks from the dependency list for target recipe's checksum. However current code actually implements the opposite. All native sstate packages end up to have empty task dependency while target sstate packages still have native tasks counted into the checksum. Signed-off-by: Kevin Tian --- bitbake/lib/bb/siggen.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'bitbake/lib/bb/siggen.py') diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 9e956ee91f..391020a9ed 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -108,11 +108,15 @@ class SignatureGeneratorBasic(SignatureGenerator): data = dataCache.basetaskhash[k] self.runtaskdeps[k] = [] for dep in sorted(deps): - if self.twl and self.twl.search(dataCache.pkg_fn[fn]): - #bb.note("Skipping %s" % dep) - continue + # We only manipulate the dependencies for packages not in the whitelist + if self.twl and not self.twl.search(dataCache.pkg_fn[fn]): + # then process the actual dependencies + dep_fn = re.search("(?P.*)\..*", dep).group('fn') + if self.twl.search(dataCache.pkg_fn[dep_fn]): + #bb.note("Skipping %s" % dep) + continue if dep not in self.taskhash: - bb.fatal("%s is not in taskhash, caller isn't calling in dependency order?", dep) + bb.fatal("%s is not in taskhash, caller isn't calling in dependency order?", dep) data = data + self.taskhash[dep] self.runtaskdeps[k].append(dep) h = hashlib.md5(data).hexdigest() -- cgit v1.2.3-54-g00ecf