diff options
-rw-r--r-- | meta/lib/oe/sstatesig.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index f943df181e..633a0fd450 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py | |||
@@ -215,6 +215,9 @@ class SignatureGeneratorOEBasicHashMixIn(object): | |||
215 | def dump_lockedsigs(self, sigfile, taskfilter=None): | 215 | def dump_lockedsigs(self, sigfile, taskfilter=None): |
216 | types = {} | 216 | types = {} |
217 | for tid in self.runtaskdeps: | 217 | for tid in self.runtaskdeps: |
218 | # Bitbake changed this to a tuple in newer versions | ||
219 | if isinstance(tid, tuple): | ||
220 | tid = tid[1] | ||
218 | if taskfilter: | 221 | if taskfilter: |
219 | if not tid in taskfilter: | 222 | if not tid in taskfilter: |
220 | continue | 223 | continue |
@@ -321,11 +324,12 @@ def find_siginfo(pn, taskname, taskhashlist, d): | |||
321 | if not taskname: | 324 | if not taskname: |
322 | # We have to derive pn and taskname | 325 | # We have to derive pn and taskname |
323 | key = pn | 326 | key = pn |
324 | splitit = key.split('.bb:') | 327 | if key.startswith("mc:"): |
325 | taskname = splitit[1] | 328 | # mc:<mc>:<pn>:<task> |
326 | pn = os.path.basename(splitit[0]).split('_')[0] | 329 | _, _, pn, taskname = key.split(':', 3) |
327 | if key.startswith('virtual:native:'): | 330 | else: |
328 | pn = pn + '-native' | 331 | # <pn>:<task> |
332 | pn, taskname = key.split(':', 1) | ||
329 | 333 | ||
330 | hashfiles = {} | 334 | hashfiles = {} |
331 | filedates = {} | 335 | filedates = {} |