diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-03-11 06:22:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-22 14:52:17 +0000 |
commit | bdc4356c7afc542b67b78e4e5225b813d7668ecd (patch) | |
tree | a02e369da6504e11ee44de11c193d23f9e030736 | |
parent | cccd1578d84f041cd0c2dcddb91f317c69af70de (diff) | |
download | bitbake-contrib-bdc4356c7afc542b67b78e4e5225b813d7668ecd.tar.gz |
bitbake-dumpsig: Allow recipe and task to be specified
Use --task <recipe> <task> to dump the signature info for a given
recipe and task. This is similar to the --task option of
bitbake-diffsigs.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | bin/bitbake-dumpsig | 53 |
1 files changed, 42 insertions, 11 deletions
diff --git a/bin/bitbake-dumpsig b/bin/bitbake-dumpsig index 58ba1cad0..b1fce2510 100755 --- a/bin/bitbake-dumpsig +++ b/bin/bitbake-dumpsig @@ -27,6 +27,7 @@ import pickle sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib')) +import bb.tinfoil import bb.siggen def logger_create(name, output=sys.stderr): @@ -42,24 +43,54 @@ def logger_create(name, output=sys.stderr): logger = logger_create('bitbake-dumpsig') +def find_siginfo_task(bbhandler, pn, taskname): + """ Find the most recent signature file for the specified PN/task """ + + 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 + + filedates = bb.siggen.find_siginfo(pn, taskname, None, bbhandler.config_data) + latestfiles = sorted(filedates.keys(), key=lambda f: filedates[f])[-1:] + if not latestfiles: + logger.error('No sigdata files found matching %s %s' % (pn, taskname)) + sys.exit(1) + + return latestfiles[0] + parser = optparse.OptionParser( description = "Dumps siginfo/sigdata files written out by BitBake", usage = """ + %prog -t recipename taskname %prog sigdatafile""") +parser.add_option("-t", "--task", + help = "find the signature data file for the specified task", + action="store", dest="taskargs", nargs=2, metavar='recipename taskname') + options, args = parser.parse_args(sys.argv) -if len(args) == 1: +if options.taskargs: + tinfoil = bb.tinfoil.Tinfoil() + tinfoil.prepare(config_only = True) + file = find_siginfo_task(tinfoil, options.taskargs[0], options.taskargs[1]) +elif len(args) == 1: parser.print_help() + sys.exit(0) else: - try: - output = bb.siggen.dump_sigfile(args[1]) - except IOError as e: - logger.error(str(e)) - sys.exit(1) - except (pickle.UnpicklingError, EOFError): - logger.error('Invalid signature data - ensure you are specifying a sigdata/siginfo file') - sys.exit(1) + file = args[1] + +try: + output = bb.siggen.dump_sigfile(file) +except IOError as e: + logger.error(str(e)) + sys.exit(1) +except (pickle.UnpicklingError, EOFError): + logger.error('Invalid signature data - ensure you are specifying a sigdata/siginfo file') + sys.exit(1) - if output: - print('\n'.join(output)) +if output: + print('\n'.join(output)) |