upstreamed and pushed to toaster-next Thanks, Ed
On Tue, Aug 23, 2016 at 10:47:38AM +0100, Elliot Smith wrote: > 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 <[email protected]> > --- > bitbake/lib/bb/ui/buildinfohelper.py | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/bitbake/lib/bb/ui/buildinfohelper.py > b/bitbake/lib/bb/ui/buildinfohelper.py > index a5a42cd..7dbb560 100644 > --- a/bitbake/lib/bb/ui/buildinfohelper.py > +++ b/bitbake/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): > @@ -1729,9 +1732,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 > -- > 2.7.4 > > -- > _______________________________________________ > toaster mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/toaster -- -- Regards, Ed -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
