diff options
| -rwxr-xr-x | bin/bitbake-diffsigs | 35 | ||||
| -rw-r--r-- | lib/bb/command.py | 11 | ||||
| -rw-r--r-- | lib/bb/event.py | 8 |
3 files changed, 47 insertions, 7 deletions
diff --git a/bin/bitbake-diffsigs b/bin/bitbake-diffsigs index eb2f85979..4e6bbddcd 100755 --- a/bin/bitbake-diffsigs +++ b/bin/bitbake-diffsigs @@ -34,18 +34,39 @@ import bb.msg logger = bb.msg.logger_create('bitbake-diffsigs') +def find_siginfo(tinfoil, pn, taskname, sigs=None): + result = None + tinfoil.set_event_mask(['bb.event.FindSigInfoResult', + 'logging.LogRecord', + 'bb.command.CommandCompleted', + 'bb.command.CommandFailed']) + ret = tinfoil.run_command('findSigInfo', pn, taskname, sigs) + if ret: + while True: + event = tinfoil.wait_event(1) + if event: + if isinstance(event, bb.command.CommandCompleted): + break + elif isinstance(event, bb.command.CommandFailed): + logger.error(str(event)) + sys.exit(2) + elif isinstance(event, bb.event.FindSigInfoResult): + result = event.result + elif isinstance(event, logging.LogRecord): + logger.handle(event) + else: + logger.error('No result returned from findSigInfo command') + sys.exit(2) + return result + def find_compare_task(bbhandler, pn, taskname, sig1=None, sig2=None, color=False): """ Find the most recent signature files for the specified PN/task and compare them """ - if not hasattr(bb.siggen, 'find_siginfo'): - logger.error('Metadata does not support finding signature data files') - sys.exit(1) - if not taskname.startswith('do_'): taskname = 'do_%s' % taskname if sig1 and sig2: - sigfiles = bb.siggen.find_siginfo(pn, taskname, [sig1, sig2], bbhandler.config_data) + sigfiles = find_siginfo(bbhandler, pn, taskname, [sig1, sig2]) if len(sigfiles) == 0: logger.error('No sigdata files found matching %s %s matching either %s or %s' % (pn, taskname, sig1, sig2)) sys.exit(1) @@ -57,7 +78,7 @@ def find_compare_task(bbhandler, pn, taskname, sig1=None, sig2=None, color=False sys.exit(1) latestfiles = [sigfiles[sig1], sigfiles[sig2]] else: - filedates = bb.siggen.find_siginfo(pn, taskname, None, bbhandler.config_data) + filedates = find_siginfo(bbhandler, pn, taskname) latestfiles = sorted(filedates.keys(), key=lambda f: filedates[f])[-3:] if not latestfiles: logger.error('No sigdata files found matching %s %s' % (pn, taskname)) @@ -69,7 +90,7 @@ def find_compare_task(bbhandler, pn, taskname, sig1=None, sig2=None, color=False # Define recursion callback def recursecb(key, hash1, hash2): hashes = [hash1, hash2] - hashfiles = bb.siggen.find_siginfo(key, None, hashes, bbhandler.config_data) + hashfiles = find_siginfo(bbhandler, key, None, hashes) recout = [] if len(hashfiles) == 0: diff --git a/lib/bb/command.py b/lib/bb/command.py index 0e0a35af6..c44c7a6a5 100644 --- a/lib/bb/command.py +++ b/lib/bb/command.py @@ -746,3 +746,14 @@ class CommandsAsync: command.finishAsyncCommand() clientComplete.needcache = False + def findSigInfo(self, command, params): + """ + Find signature info files via the signature generator + """ + pn = params[0] + taskname = params[1] + sigs = params[2] + res = bb.siggen.find_siginfo(pn, taskname, sigs, command.cooker.data) + bb.event.fire(bb.event.FindSigInfoResult(res), command.cooker.data) + command.finishAsyncCommand() + findSigInfo.needcache = False diff --git a/lib/bb/event.py b/lib/bb/event.py index 59cca6142..3827dcfba 100644 --- a/lib/bb/event.py +++ b/lib/bb/event.py @@ -819,3 +819,11 @@ class NetworkTestFailed(Event): """ Event to indicate network test has failed """ + +class FindSigInfoResult(Event): + """ + Event to return results from findSigInfo command + """ + def __init__(self, result): + Event.__init__(self) + self.result = result |