diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-10-18 12:08:26 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-29 10:41:33 +0000 |
commit | 9ce903bd3c5e8bbc3fa03f788bad1b470b7ce6d9 (patch) | |
tree | 564807527d89796f26dcd668845ebb062040c025 /scripts/oe-pkgdata-util | |
parent | 78b91ab23d9856525fc7ac1bb8da2975382813bf (diff) | |
download | openembedded-core-contrib-9ce903bd3c5e8bbc3fa03f788bad1b470b7ce6d9.tar.gz |
scripts/oe-pkgdata-util: remove remnants of former pkgdata structure
OE-Core commit 1b8e4abd2d9c0901d38d89d0f944fe1ffd019379 removed the
vendor-os argument from the command line, and the code using the package
architectures, so clean these items up.
(From OE-Core rev: 8b9ee57afbbcf633cba66e4b6e8ab7339ad6d391)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/oe-pkgdata-util')
-rwxr-xr-x | scripts/oe-pkgdata-util | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index dcdfe25dfd..c0fd50d549 100755 --- a/scripts/oe-pkgdata-util +++ b/scripts/oe-pkgdata-util @@ -35,8 +35,8 @@ import fnmatch import re def usage(): - print("syntax: oe-pkgdata-util glob [-d] <pkgdatadir> <vendor-os> <pkglist> \"<globs>\"\n \ - read-value [-d] <pkgdatadir> <vendor-os> <value-name> \"<package-name>_<package_architecture>\""); + print("syntax: oe-pkgdata-util glob [-d] <pkgdatadir> <pkglist> \"<globs>\"\n \ + read-value [-d] <pkgdatadir> <value-name> \"<pkgs>\""); @@ -55,10 +55,11 @@ def glob(args): with open(pkglist_file, 'r') as f: for line in f: fields = line.rstrip().split() - if len(fields) < 2: + if not fields: continue pkg = fields[0] - arch = fields[1] + # We don't care about other args (used to need the package architecture but the + # new pkgdata structure avoids the need for that) # Skip packages for which there is no point applying globs if skipregex.search(pkg): @@ -172,9 +173,8 @@ def read_value(args): for package in packages: pkg_split = package.split('_') pkg_name = pkg_split[0] - pkg_arch = '_'.join(pkg_split[1:]) if debug: - print "package: name: '%s', arch: '%s'" % (pkg_name, pkg_arch) + print "package: '%s'" % pkg_name revlink = os.path.join(pkgdata_dir, "runtime-reverse", pkg_name) if debug: print(revlink) |