summaryrefslogtreecommitdiffstats
path: root/scripts/oe-pkgdata-util
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-10-18 12:08:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-29 10:41:33 +0000
commit9ce903bd3c5e8bbc3fa03f788bad1b470b7ce6d9 (patch)
tree564807527d89796f26dcd668845ebb062040c025 /scripts/oe-pkgdata-util
parent78b91ab23d9856525fc7ac1bb8da2975382813bf (diff)
downloadpoky-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-xscripts/oe-pkgdata-util12
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
35import re 35import re
36 36
37def usage(): 37def 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)