Skip to contentSkip to conversation

siggen.py: fix the wrong usage on BB_TASKHASH_WHITELIST

PATCH New Kevin Tian 1 participant 1 message Nov 29, 2010

lore
Share & tools
lore

Kevin Tian

author
#0 lore raw

PATCH 4/5 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.

---
 bitbake/lib/bb/siggen.py |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
bitbake/lib/bb/siggen.py +6 -4
index 20f57ad..26ec5ce 100644
@@ -109,11 +109,13 @@ 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
+            if self.twl and not self.twl.search(dataCache.pkg_fn[fn]):
+                dep_fn = re.search("(?P<fn>.*)\..*", 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()
Signature · 1 line
1.6.0.4