summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-11-22 20:52:27 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-06 01:15:39 +0000
commitccd590bf9dc3347c2252188ce30f91d699147272 (patch)
tree6e13a1173a5139690d6094213f55c027c1d81b51 /bitbake
parenta0033b622eef8ec2135b81e702719795b9f66b74 (diff)
downloadpoky-ccd590bf9dc3347c2252188ce30f91d699147272.tar.gz
siggen.py: set 'runtaskdeps' correctly
Now 'runtaskdeps' is assigned before taskhash whitelist is filtered out, and thus always contains original task dependencies. This causes problem to diagnose sstate related problem. So fix it by appending filtered dep to 'runtaskdeps' in the fly. Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/siggen.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 5c53a86f3a..9e956ee91f 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -106,7 +106,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
106 def get_taskhash(self, fn, task, deps, dataCache): 106 def get_taskhash(self, fn, task, deps, dataCache):
107 k = fn + "." + task 107 k = fn + "." + task
108 data = dataCache.basetaskhash[k] 108 data = dataCache.basetaskhash[k]
109 self.runtaskdeps[k] = deps 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 if self.twl and self.twl.search(dataCache.pkg_fn[fn]):
112 #bb.note("Skipping %s" % dep) 112 #bb.note("Skipping %s" % dep)
@@ -114,6 +114,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
114 if dep not in self.taskhash: 114 if dep not in self.taskhash:
115 bb.fatal("%s is not in taskhash, caller isn't calling in dependency order?", dep) 115 bb.fatal("%s is not in taskhash, caller isn't calling in dependency order?", dep)
116 data = data + self.taskhash[dep] 116 data = data + self.taskhash[dep]
117 self.runtaskdeps[k].append(dep)
117 h = hashlib.md5(data).hexdigest() 118 h = hashlib.md5(data).hexdigest()
118 self.taskhash[k] = h 119 self.taskhash[k] = h
119 #d.setVar("BB_TASKHASH_task-%s" % task, taskhash[task]) 120 #d.setVar("BB_TASKHASH_task-%s" % task, taskhash[task])
@@ -258,8 +259,3 @@ def dump_sigfile(a):
258 if 'runtaskhashes' in a_data: 259 if 'runtaskhashes' in a_data:
259 for dep in a_data['runtaskhashes']: 260 for dep in a_data['runtaskhashes']:
260 print "Hash for dependent task %s is %s" % (dep, a_data['runtaskhashes'][dep]) 261 print "Hash for dependent task %s is %s" % (dep, a_data['runtaskhashes'][dep])
261
262
263
264
265