summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorElliot Smith <elliot.smith@intel.com>2016-08-23 14:18:26 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-02 18:09:49 +0100
commitd2797b5ec240ab69fb6a5840a77cc5fca8837464 (patch)
treeac5c3c234a1810f0e79e85fafe876de63e6ae805 /bitbake
parent46bad463ef99db9f237723614c5de01f89d5e54f (diff)
downloadpoky-d2797b5ec240ab69fb6a5840a77cc5fca8837464.tar.gz
bitbake: 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] (Bitbake rev: 927ec3524625ac731326b3c1c1361c2a4d2bd9e1) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 7a16ec6aab..0f09b5cb63 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -1616,7 +1616,10 @@ class BuildInfoHelper(object):
1616 if line.startswith('FILES'): 1616 if line.startswith('FILES'):
1617 files_str = line.split(':')[1].strip() 1617 files_str = line.split(':')[1].strip()
1618 files_str = re.sub(r' {2,}', ' ', files_str) 1618 files_str = re.sub(r' {2,}', ' ', files_str)
1619 files = files_str.split(' ') 1619
1620 # ignore lines like "FILES:" with no filenames
1621 if files_str:
1622 files += files_str.split(' ')
1620 return files 1623 return files
1621 1624
1622 def _endswith(self, str_to_test, endings): 1625 def _endswith(self, str_to_test, endings):
@@ -1734,9 +1737,9 @@ class BuildInfoHelper(object):
1734 real_image_name, 1737 real_image_name,
1735 'image_license.manifest') 1738 'image_license.manifest')
1736 1739
1737 # if image_license.manifest exists, we can read the names of bzImage 1740 # if image_license.manifest exists, we can read the names of
1738 # and modules files for this build from it, then look for them 1741 # bzImage, modules etc. files for this build from it, then look for
1739 # in the DEPLOY_DIR_IMAGE; note that this file is only produced 1742 # them in the DEPLOY_DIR_IMAGE; note that this file is only produced
1740 # if an image file was produced 1743 # if an image file was produced
1741 if os.path.isfile(image_license_manifest_path): 1744 if os.path.isfile(image_license_manifest_path):
1742 has_files = True 1745 has_files = True