From bcc9f1b5f1e1c78d07b250672e4ea84d942514e5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 29 Jul 2019 15:45:19 +0100 Subject: 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 --- meta/lib/oe/sstatesig.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'meta/lib/oe') 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): for (pn, task, fn, taskhash) in sorted(tasks): f.write('%s.%s %s %s\n' % (pn, task, fn, taskhash)) - def checkhashes(self, missed, ret, sq_fn, sq_task, sq_hash, sq_hashfn, d): + def checkhashes(self, sq_data, missed, found, d): warn_msgs = [] error_msgs = [] sstate_missing_msgs = [] - for task in range(len(sq_fn)): - if task not in ret: + for tid in sq_data['hash']: + if tid not in found: for pn in self.lockedsigs: - if sq_hash[task] in iter(self.lockedsigs[pn].values()): - if sq_task[task] == 'do_shared_workdir': + taskname = bb.runqueue.taskname_from_tid(tid) + if sq_data['hash'][tid] in iter(self.lockedsigs[pn].values()): + if taskname == 'do_shared_workdir': continue sstate_missing_msgs.append("Locked sig is set for %s:%s (%s) yet not in sstate cache?" - % (pn, sq_task[task], sq_hash[task])) + % (pn, taskname, sq_data['hash'][tid])) checklevel = d.getVar("SIGGEN_LOCKEDSIGS_TASKSIG_CHECK") if checklevel == 'warn': -- cgit v1.2.3-54-g00ecf