summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/siggen.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/siggen.py')
-rw-r--r--bitbake/lib/bb/siggen.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index e0a66e68d5..fe580e487f 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -179,7 +179,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
179 def get_taskhash(self, fn, task, deps, dataCache): 179 def get_taskhash(self, fn, task, deps, dataCache):
180 180
181 mc = '' 181 mc = ''
182 if fn.startswith('multiconfig:'): 182 if fn.startswith('mc:'):
183 mc = fn.split(':')[1] 183 mc = fn.split(':')[1]
184 k = fn + "." + task 184 k = fn + "." + task
185 185
@@ -194,7 +194,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
194 depmc = pkgname.split(':')[1] 194 depmc = pkgname.split(':')[1]
195 if mc != depmc: 195 if mc != depmc:
196 continue 196 continue
197 if dep.startswith("multiconfig:") and not mc: 197 if dep.startswith("mc:") and not mc:
198 continue 198 continue
199 depname = dataCache.pkg_fn[pkgname] 199 depname = dataCache.pkg_fn[pkgname]
200 if not self.rundep_check(fn, recipename, task, dep, depname, dataCache): 200 if not self.rundep_check(fn, recipename, task, dep, depname, dataCache):
@@ -412,13 +412,13 @@ def list_inline_diff(oldlist, newlist, colors=None):
412 412
413def clean_basepath(a): 413def clean_basepath(a):
414 mc = None 414 mc = None
415 if a.startswith("multiconfig:"): 415 if a.startswith("mc:"):
416 _, mc, a = a.split(":", 2) 416 _, mc, a = a.split(":", 2)
417 b = a.rsplit("/", 2)[1] + '/' + a.rsplit("/", 2)[2] 417 b = a.rsplit("/", 2)[1] + '/' + a.rsplit("/", 2)[2]
418 if a.startswith("virtual:"): 418 if a.startswith("virtual:"):
419 b = b + ":" + a.rsplit(":", 1)[0] 419 b = b + ":" + a.rsplit(":", 1)[0]
420 if mc: 420 if mc:
421 b = b + ":multiconfig:" + mc 421 b = b + ":mc:" + mc
422 return b 422 return b
423 423
424def clean_basepaths(a): 424def clean_basepaths(a):