diff options
| -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 | |||
| 35 | import re | 35 | import re |
| 36 | 36 | ||
| 37 | def usage(): | 37 | def usage(): |
| 38 | print("syntax: oe-pkgdata-util glob [-d] <pkgdatadir> <vendor-os> <pkglist> \"<globs>\"\n \ | 38 | print("syntax: oe-pkgdata-util glob [-d] <pkgdatadir> <pkglist> \"<globs>\"\n \ |
| 39 | read-value [-d] <pkgdatadir> <vendor-os> <value-name> \"<package-name>_<package_architecture>\""); | 39 | read-value [-d] <pkgdatadir> <value-name> \"<pkgs>\""); |
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | 42 | ||
| @@ -55,10 +55,11 @@ def glob(args): | |||
| 55 | with open(pkglist_file, 'r') as f: | 55 | with open(pkglist_file, 'r') as f: |
| 56 | for line in f: | 56 | for line in f: |
| 57 | fields = line.rstrip().split() | 57 | fields = line.rstrip().split() |
| 58 | if len(fields) < 2: | 58 | if not fields: |
| 59 | continue | 59 | continue |
| 60 | pkg = fields[0] | 60 | pkg = fields[0] |
| 61 | arch = fields[1] | 61 | # We don't care about other args (used to need the package architecture but the |
| 62 | # new pkgdata structure avoids the need for that) | ||
| 62 | 63 | ||
| 63 | # Skip packages for which there is no point applying globs | 64 | # Skip packages for which there is no point applying globs |
| 64 | if skipregex.search(pkg): | 65 | if skipregex.search(pkg): |
| @@ -172,9 +173,8 @@ def read_value(args): | |||
| 172 | for package in packages: | 173 | for package in packages: |
| 173 | pkg_split = package.split('_') | 174 | pkg_split = package.split('_') |
| 174 | pkg_name = pkg_split[0] | 175 | pkg_name = pkg_split[0] |
| 175 | pkg_arch = '_'.join(pkg_split[1:]) | ||
| 176 | if debug: | 176 | if debug: |
| 177 | print "package: name: '%s', arch: '%s'" % (pkg_name, pkg_arch) | 177 | print "package: '%s'" % pkg_name |
| 178 | revlink = os.path.join(pkgdata_dir, "runtime-reverse", pkg_name) | 178 | revlink = os.path.join(pkgdata_dir, "runtime-reverse", pkg_name) |
| 179 | if debug: | 179 | if debug: |
| 180 | print(revlink) | 180 | print(revlink) |
