From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 59D89E00F9F; Tue, 23 Aug 2016 04:21:26 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high * trust * [192.55.52.93 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 0F0E8E00E4B for ; Tue, 23 Aug 2016 04:21:24 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 23 Aug 2016 04:21:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,565,1464678000"; d="scan'208";a="1029958060" Received: from linux.intel.com ([10.54.29.200]) by fmsmga001.fm.intel.com with ESMTP; 23 Aug 2016 04:21:25 -0700 Received: from linux.intel.com (vmed.fi.intel.com [10.237.72.68]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTP id D83D66A4006; Tue, 23 Aug 2016 04:21:05 -0700 (PDT) Date: Tue, 23 Aug 2016 14:21:15 +0300 From: Ed Bartosh To: Elliot Smith Message-ID: <20160823112115.GA1375@linux.intel.com> References: <1471945658-9671-1-git-send-email-elliot.smith@intel.com> MIME-Version: 1.0 In-Reply-To: <1471945658-9671-1-git-send-email-elliot.smith@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.5.21 (2010-09-15) Cc: toaster@yoctoproject.org Subject: Re: [PATCH] buildinfohelper: discover kernel artifacts correctly X-BeenThere: toaster@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: ed.bartosh@linux.intel.com List-Id: Web based interface for BitBake List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Aug 2016 11:21:26 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 > --- > 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 > toaster@yoctoproject.org > https://lists.yoctoproject.org/listinfo/toaster -- -- Regards, Ed