summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-11-23 00:35:03 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-07 12:45:08 +0000
commit4336d676d44b18242691306d319b4c57fb591ced (patch)
tree2b632b3bfcf4248bfdff1243810316e13f352ec3 /bitbake/lib/bb
parent55859b9c3d6fb806427ccbcfb6cda095ef557f29 (diff)
downloadpoky-4336d676d44b18242691306d319b4c57fb591ced.tar.gz
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 <kevin.tian@intel.com>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/siggen.py12
1 files changed, 8 insertions, 4 deletions
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):
108 data = dataCache.basetaskhash[k] 108 data = dataCache.basetaskhash[k]
109 self.runtaskdeps[k] = [] 109 self.runtaskdeps[k] = []
110 for dep in sorted(deps): 110 for dep in sorted(deps):
111 if self.twl and self.twl.search(dataCache.pkg_fn[fn]): 111 # We only manipulate the dependencies for packages not in the whitelist
112 #bb.note("Skipping %s" % dep) 112 if self.twl and not self.twl.search(dataCache.pkg_fn[fn]):
113 continue 113 # then process the actual dependencies
114 dep_fn = re.search("(?P<fn>.*)\..*", dep).group('fn')
115 if self.twl.search(dataCache.pkg_fn[dep_fn]):
116 #bb.note("Skipping %s" % dep)
117 continue
114 if dep not in self.taskhash: 118 if dep not in self.taskhash:
115 bb.fatal("%s is not in taskhash, caller isn't calling in dependency order?", dep) 119 bb.fatal("%s is not in taskhash, caller isn't calling in dependency order?", dep)
116 data = data + self.taskhash[dep] 120 data = data + self.taskhash[dep]
117 self.runtaskdeps[k].append(dep) 121 self.runtaskdeps[k].append(dep)
118 h = hashlib.md5(data).hexdigest() 122 h = hashlib.md5(data).hexdigest()