summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-12-02 18:50:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-03 17:45:49 +0000
commit4a75e83b29d6736a17d3a461774adb18b8ff5abf (patch)
tree4f676dbd0a8ca75e13c31287439a6b498bb72712 /scripts
parenta6450a951fd52d1330c577139dd492f0c8abb1f8 (diff)
downloadpoky-4a75e83b29d6736a17d3a461774adb18b8ff5abf.tar.gz
classes/package: fix FILES_INFO serialisation in pkgdata
The FILES_INFO entry in each pkgdata file stores the list of files for each package. Make the following improvements to how this is stored: * Store paths as they would be seen on the target rather than erroneously including the full path to PKGDEST (which is specific to the build host the package was built on) * For simplicity when loading the data, store complete paths for each entry instead of trying to break off the first part and use it as the dict key * Record sizes for each file (as needed by Toaster) * Serialise the value explicitly using json rather than just passing it through str(). Fixes [YOCTO #5443]. (From OE-Core rev: ca86603607a69a17cc5540d69de0e242b33382d3) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/oe-pkgdata-util19
1 files changed, 7 insertions, 12 deletions
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util
index 17e946e1e4..03c8f95305 100755
--- a/scripts/oe-pkgdata-util
+++ b/scripts/oe-pkgdata-util
@@ -262,25 +262,20 @@ def find_path(args, usage, debug=False):
262 print('ERROR: Unable to find pkgdata directory %s' % pkgdata_dir) 262 print('ERROR: Unable to find pkgdata directory %s' % pkgdata_dir)
263 sys.exit(1) 263 sys.exit(1)
264 264
265 import ast 265 import json
266 import fnmatch 266 import fnmatch
267 267
268 for root, dirs, files in os.walk(os.path.join(pkgdata_dir, 'runtime')): 268 for root, dirs, files in os.walk(os.path.join(pkgdata_dir, 'runtime')):
269 for fn in files: 269 for fn in files:
270 pkgsplitname = '/packages-split/%s' % fn
271 with open(os.path.join(root,fn)) as f: 270 with open(os.path.join(root,fn)) as f:
272 for line in f: 271 for line in f:
273 if line.startswith('FILES_INFO:'): 272 if line.startswith('FILES_INFO:'):
274 val = line.split(':', 1)[1].strip().replace('\\\'', '\'') 273 val = line.split(':', 1)[1].strip()
275 dictval = ast.literal_eval(val) 274 dictval = json.loads(val)
276 for parent, dirlist in dictval.items(): 275 for fullpth in dictval.keys():
277 idx = parent.find(pkgsplitname) 276 if fnmatch.fnmatchcase(fullpth, targetpath):
278 if idx > -1: 277 print("%s: %s" % (fn, fullpth))
279 parent = parent[idx+len(pkgsplitname):] 278 break
280 for basename in dirlist:
281 fullpth = os.path.join(parent, basename)
282 if fnmatch.fnmatchcase(fullpth, targetpath):
283 print("%s: %s" % (fn, fullpth))
284 279
285 280
286def main(): 281def main():