oe-pkgdata-util: package-info: Allow extra variables to be displayed
PATCH v3 1/1 oe-pkgdata-util: package-info: Allow extra variables to be displayed
By specifying the -e <var> option one or multiple times, extra variables available in the pkgdata can be displayed, e.,g, oe-pkgdata-util package-info -e SUMMARY -e LICENSE .... The extra variables displayed are quoted since some of them may contain whitespace.
---
PATCHv2: Changed references to SRC_URI into LICENSE, since SRC_URI is not an available variable in the pkgdata.
PATCHv3: Avoid a "TypeError: 'NoneType' object is not iterable" if no --extra argument is specified. Duh!
scripts/oe-pkgdata-util | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
scripts/oe-pkgdata-util +10 -2
@@ -325,8 +325,15 @@ def package_info(args): recipe_version = recipe_version + "-" + mappings[pkg]['PR'] pkg_size = mappings[pkg]['PKGSIZE'] - items.append("%s %s %s %s %s" % - (pkg, pkg_version, recipe, recipe_version, pkg_size)) + line = "%s %s %s %s %s" % (pkg, pkg_version, recipe, recipe_version, pkg_size) + + if args.extra: + for val in args.extra: + src_uri = mappings[pkg][val].strip() + src_uri = re.sub(r'\s+', ' ', src_uri) + line += ' "%s"' % src_uri + + items.append(line) print('\n'.join(items)) def get_recipe_pkgs(pkgdata_dir, recipe, unpackaged):
@@ -530,6 +537,7 @@ def main(): description='Looks up the specified runtime package(s) and display information') parser_package_info.add_argument('pkg', nargs='*', help='Runtime package name to look up') parser_package_info.add_argument('-f', '--file', help='Read package names from the specified file (one per line, first field only)') + parser_package_info.add_argument('-e', '--extra', help='Extra variables to display, e.g., LICENSE (can be specified multiple times)', action='append') parser_package_info.set_defaults(func=package_info) parser_find_path = subparsers.add_parser('find-path',
Signature · 1 line
2.12.0
scripts/oe-pkgdata-util def package_info(args): · line 334
Quoted 6 lines · Peter Kjellerstedt
scripts/oe-pkgdata-util +5
-0+ if args.extra: + for val in args.extra: + src_uri = mappings[pkg][val].strip() + src_uri = re.sub(r'\s+', ' ', src_uri) + line += ' "%s"' % src_uri
I don't think you meant src_uri here. :)
Ross
Duh! That is a remnant from the first, non-generic, implementation I did where I only added support for the SRC_URI variable. I will send an updated version…
//Peter
From: Burton, Ross [mailto:[email protected]]
Sent: den 23 juni 2017 15:09
To: Peter Kjellerstedt <[email protected]>
Cc: OE-core <[email protected]>
Subject: Re: [OE-core] [PATCHv3] oe-pkgdata-util: package-info: Allow extra variables to be displayed
On 19 June 2017 at 15:31, Peter Kjellerstedt <[email protected]<mailto:[email protected]>> wrote:
+ if args.extra:
+ for val in args.extra:
+ src_uri = mappings[pkg][val].strip() + src_uri = re.sub(r'\s+', ' ', src_uri) + line += ' "%s"' % src_uri
I don't think you meant src_uri here. :)
Ross