diff options
Diffstat (limited to 'bitbake/lib/bb/siggen.py')
-rw-r--r-- | bitbake/lib/bb/siggen.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index ab228e4148..e9bb51d736 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -193,15 +193,24 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
193 | return taint | 193 | return taint |
194 | 194 | ||
195 | def get_taskhash(self, fn, task, deps, dataCache): | 195 | def get_taskhash(self, fn, task, deps, dataCache): |
196 | |||
197 | mc = '' | ||
198 | if fn.startswith('multiconfig:'): | ||
199 | mc = fn.split(':')[1] | ||
196 | k = fn + "." + task | 200 | k = fn + "." + task |
201 | |||
197 | data = dataCache.basetaskhash[k] | 202 | data = dataCache.basetaskhash[k] |
198 | self.basehash[k] = data | 203 | self.basehash[k] = data |
199 | self.runtaskdeps[k] = [] | 204 | self.runtaskdeps[k] = [] |
200 | self.file_checksum_values[k] = [] | 205 | self.file_checksum_values[k] = [] |
201 | recipename = dataCache.pkg_fn[fn] | 206 | recipename = dataCache.pkg_fn[fn] |
202 | |||
203 | for dep in sorted(deps, key=clean_basepath): | 207 | for dep in sorted(deps, key=clean_basepath): |
204 | depname = dataCache.pkg_fn[self.pkgnameextract.search(dep).group('fn')] | 208 | pkgname = self.pkgnameextract.search(dep).group('fn') |
209 | if mc: | ||
210 | depmc = pkgname.split(':')[1] | ||
211 | if mc != depmc: | ||
212 | continue | ||
213 | depname = dataCache.pkg_fn[pkgname] | ||
205 | if not self.rundep_check(fn, recipename, task, dep, depname, dataCache): | 214 | if not self.rundep_check(fn, recipename, task, dep, depname, dataCache): |
206 | continue | 215 | continue |
207 | if dep not in self.taskhash: | 216 | if dep not in self.taskhash: |