From 927ec3524625ac731326b3c1c1361c2a4d2bd9e1 Mon Sep 17 00:00:00 2001 From: Elliot Smith Date: Tue, 23 Aug 2016 14:18:26 +0300 Subject: buildinfohelper: discover kernel artifacts correctly Because some image_license.manifest files contain multiple FILES lines, and because those lines can sometimes not contain a list of files (i.e. they look like "FILES:\n"), we were resetting the list of kernel artifacts when we hit the second "empty" line. Fix by ignoring any FILES line which doesn't list files, and by appending any files found in a valid FILES line, rather than overwriting the existing list. [YOCTO #10107] Signed-off-by: Elliot Smith Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- lib/bb/ui/buildinfohelper.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib/bb') diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py index 7a16ec6aa..0f09b5cb6 100644 --- a/lib/bb/ui/buildinfohelper.py +++ b/lib/bb/ui/buildinfohelper.py @@ -1616,7 +1616,10 @@ class BuildInfoHelper(object): if line.startswith('FILES'): files_str = line.split(':')[1].strip() files_str = re.sub(r' {2,}', ' ', files_str) - files = files_str.split(' ') + + # ignore lines like "FILES:" with no filenames + if files_str: + files += files_str.split(' ') return files def _endswith(self, str_to_test, endings): @@ -1734,9 +1737,9 @@ class BuildInfoHelper(object): real_image_name, 'image_license.manifest') - # if image_license.manifest exists, we can read the names of bzImage - # and modules files for this build from it, then look for them - # in the DEPLOY_DIR_IMAGE; note that this file is only produced + # if image_license.manifest exists, we can read the names of + # bzImage, modules etc. files for this build from it, then look for + # them in the DEPLOY_DIR_IMAGE; note that this file is only produced # if an image file was produced if os.path.isfile(image_license_manifest_path): has_files = True -- cgit 1.2.3-korg