diff options
-rw-r--r-- | bitbake/lib/bb/siggen.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 114851c490..d8ba1d47a3 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -186,8 +186,9 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
186 | k = fn + "." + task | 186 | k = fn + "." + task |
187 | data = dataCache.basetaskhash[k] | 187 | data = dataCache.basetaskhash[k] |
188 | self.runtaskdeps[k] = [] | 188 | self.runtaskdeps[k] = [] |
189 | self.file_checksum_values[k] = {} | 189 | self.file_checksum_values[k] = [] |
190 | recipename = dataCache.pkg_fn[fn] | 190 | recipename = dataCache.pkg_fn[fn] |
191 | |||
191 | for dep in sorted(deps, key=clean_basepath): | 192 | for dep in sorted(deps, key=clean_basepath): |
192 | depname = dataCache.pkg_fn[self.pkgnameextract.search(dep).group('fn')] | 193 | depname = dataCache.pkg_fn[self.pkgnameextract.search(dep).group('fn')] |
193 | if not self.rundep_check(fn, recipename, task, dep, depname, dataCache): | 194 | if not self.rundep_check(fn, recipename, task, dep, depname, dataCache): |
@@ -203,7 +204,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
203 | else: | 204 | else: |
204 | checksums = bb.fetch2.get_file_checksums(dataCache.file_checksums[fn][task], recipename) | 205 | checksums = bb.fetch2.get_file_checksums(dataCache.file_checksums[fn][task], recipename) |
205 | for (f,cs) in checksums: | 206 | for (f,cs) in checksums: |
206 | self.file_checksum_values[k][f] = cs | 207 | self.file_checksum_values[k].append((f,cs)) |
207 | if cs: | 208 | if cs: |
208 | data = data + cs | 209 | data = data + cs |
209 | 210 | ||
@@ -262,7 +263,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
262 | 263 | ||
263 | if runtime and k in self.taskhash: | 264 | if runtime and k in self.taskhash: |
264 | data['runtaskdeps'] = self.runtaskdeps[k] | 265 | data['runtaskdeps'] = self.runtaskdeps[k] |
265 | data['file_checksum_values'] = [(os.path.basename(f), cs) for f,cs in self.file_checksum_values[k].items()] | 266 | data['file_checksum_values'] = [(os.path.basename(f), cs) for f,cs in self.file_checksum_values[k]] |
266 | data['runtaskhashes'] = {} | 267 | data['runtaskhashes'] = {} |
267 | for dep in data['runtaskdeps']: | 268 | for dep in data['runtaskdeps']: |
268 | data['runtaskhashes'][dep] = self.taskhash[dep] | 269 | data['runtaskhashes'][dep] = self.taskhash[dep] |