diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-29 15:45:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-06 11:24:26 +0100 |
commit | bcc9f1b5f1e1c78d07b250672e4ea84d942514e5 (patch) | |
tree | 000b083bde9960e4d4cb8e28940a766d7a3f9040 /meta/lib/oe | |
parent | 8d7f6631365ce589207b85614428d462142cff1e (diff) | |
download | poky-bcc9f1b5f1e1c78d07b250672e4ea84d942514e5.tar.gz |
sstate/sstatesig: Update to new form of BB_HASHCHECK_FUNCTION
Bitbake has updated to a cleaned up form of BB_HASHCHECK_FUNCTION,
adapt to this cleanup. This is an API breaking change.
(From OE-Core rev: a4d413d8d809132b0e0a5dd673a36e2bd0e0be4c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/sstatesig.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 3f926e3e51..80aafa0c2d 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py | |||
@@ -235,19 +235,20 @@ class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash): | |||
235 | for (pn, task, fn, taskhash) in sorted(tasks): | 235 | for (pn, task, fn, taskhash) in sorted(tasks): |
236 | f.write('%s.%s %s %s\n' % (pn, task, fn, taskhash)) | 236 | f.write('%s.%s %s %s\n' % (pn, task, fn, taskhash)) |
237 | 237 | ||
238 | def checkhashes(self, missed, ret, sq_fn, sq_task, sq_hash, sq_hashfn, d): | 238 | def checkhashes(self, sq_data, missed, found, d): |
239 | warn_msgs = [] | 239 | warn_msgs = [] |
240 | error_msgs = [] | 240 | error_msgs = [] |
241 | sstate_missing_msgs = [] | 241 | sstate_missing_msgs = [] |
242 | 242 | ||
243 | for task in range(len(sq_fn)): | 243 | for tid in sq_data['hash']: |
244 | if task not in ret: | 244 | if tid not in found: |
245 | for pn in self.lockedsigs: | 245 | for pn in self.lockedsigs: |
246 | if sq_hash[task] in iter(self.lockedsigs[pn].values()): | 246 | taskname = bb.runqueue.taskname_from_tid(tid) |
247 | if sq_task[task] == 'do_shared_workdir': | 247 | if sq_data['hash'][tid] in iter(self.lockedsigs[pn].values()): |
248 | if taskname == 'do_shared_workdir': | ||
248 | continue | 249 | continue |
249 | sstate_missing_msgs.append("Locked sig is set for %s:%s (%s) yet not in sstate cache?" | 250 | sstate_missing_msgs.append("Locked sig is set for %s:%s (%s) yet not in sstate cache?" |
250 | % (pn, sq_task[task], sq_hash[task])) | 251 | % (pn, taskname, sq_data['hash'][tid])) |
251 | 252 | ||
252 | checklevel = d.getVar("SIGGEN_LOCKEDSIGS_TASKSIG_CHECK") | 253 | checklevel = d.getVar("SIGGEN_LOCKEDSIGS_TASKSIG_CHECK") |
253 | if checklevel == 'warn': | 254 | if checklevel == 'warn': |