summaryrefslogtreecommitdiff
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
parenta0033b622eef8ec2135b81e702719795b9f66b74 (diff)
downloadopenembedded-core-ccd590bf9dc3347c2252188ce30f91d699147272.tar.gz
openembedded-core-ccd590bf9dc3347c2252188ce30f91d699147272.tar.bz2
openembedded-core-ccd590bf9dc3347c2252188ce30f91d699147272.tar.xz
openembedded-core-ccd590bf9dc3347c2252188ce30f91d699147272.zip
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>
-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 5c53a86f3..9e956ee91 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -106,7 +106,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
def get_taskhash(self, fn, task, deps, dataCache):
k = fn + "." + task
data = dataCache.basetaskhash[k]
- self.runtaskdeps[k] = deps
+ self.runtaskdeps[k] = []
for dep in sorted(deps):
if self.twl and self.twl.search(dataCache.pkg_fn[fn]):
#bb.note("Skipping %s" % dep)
@@ -114,6 +114,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
if dep not in self.taskhash:
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()
self.taskhash[k] = h
#d.setVar("BB_TASKHASH_task-%s" % task, taskhash[task])
@@ -258,8 +259,3 @@ def dump_sigfile(a):
if 'runtaskhashes' in a_data:
for dep in a_data['runtaskhashes']:
print "Hash for dependent task %s is %s" % (dep, a_data['runtaskhashes'][dep])
-
-
-
-
-