diff options
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/siggen.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index ab6df7603c..5508523f2d 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
| @@ -41,6 +41,9 @@ class SignatureGenerator(object): | |||
| 41 | def finalise(self, fn, d, varient): | 41 | def finalise(self, fn, d, varient): |
| 42 | return | 42 | return |
| 43 | 43 | ||
| 44 | def get_unihash(self, task): | ||
| 45 | return self.taskhash[task] | ||
| 46 | |||
| 44 | def get_taskhash(self, fn, task, deps, dataCache): | 47 | def get_taskhash(self, fn, task, deps, dataCache): |
| 45 | return "0" | 48 | return "0" |
| 46 | 49 | ||
| @@ -186,7 +189,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
| 186 | continue | 189 | continue |
| 187 | if dep not in self.taskhash: | 190 | if dep not in self.taskhash: |
| 188 | bb.fatal("%s is not in taskhash, caller isn't calling in dependency order?" % dep) | 191 | bb.fatal("%s is not in taskhash, caller isn't calling in dependency order?" % dep) |
| 189 | data = data + self.taskhash[dep] | 192 | data = data + self.get_unihash(dep) |
| 190 | self.runtaskdeps[k].append(dep) | 193 | self.runtaskdeps[k].append(dep) |
| 191 | 194 | ||
| 192 | if task in dataCache.file_checksums[fn]: | 195 | if task in dataCache.file_checksums[fn]: |
| @@ -261,7 +264,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
| 261 | data['file_checksum_values'] = [(os.path.basename(f), cs) for f,cs in self.file_checksum_values[k]] | 264 | data['file_checksum_values'] = [(os.path.basename(f), cs) for f,cs in self.file_checksum_values[k]] |
| 262 | data['runtaskhashes'] = {} | 265 | data['runtaskhashes'] = {} |
| 263 | for dep in data['runtaskdeps']: | 266 | for dep in data['runtaskdeps']: |
| 264 | data['runtaskhashes'][dep] = self.taskhash[dep] | 267 | data['runtaskhashes'][dep] = self.get_unihash(dep) |
| 265 | data['taskhash'] = self.taskhash[k] | 268 | data['taskhash'] = self.taskhash[k] |
| 266 | 269 | ||
| 267 | taint = self.read_taint(fn, task, referencestamp) | 270 | taint = self.read_taint(fn, task, referencestamp) |
