From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id D068CE00E47; Tue, 23 Aug 2016 02:47:58 -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=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no * trust * [46.232.183.163 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from nov-007-i609.relay.mailchannels.net (nov-007-i609.relay.mailchannels.net [46.232.183.163]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id C54E1E00D19 for ; Tue, 23 Aug 2016 02:47:51 -0700 (PDT) X-Sender-Id: wwwh|x-authuser|elliot@townx.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 95B5521882; Tue, 23 Aug 2016 09:47:45 +0000 (UTC) Received: from uscentral428.accountservergroup.com (ip-10-107-69-155.us-west-2.compute.internal [10.107.69.155]) by relay.mailchannels.net (Postfix) with ESMTPA id D793B213CB; Tue, 23 Aug 2016 09:47:44 +0000 (UTC) X-Sender-Id: wwwh|x-authuser|elliot@townx.org Received: from uscentral428.accountservergroup.com (uscentral428.accountservergroup.com [10.45.13.172]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.7.6); Tue, 23 Aug 2016 09:47:45 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: wwwh|x-authuser|elliot@townx.org X-MailChannels-Auth-Id: wwwh X-MC-Loop-Signature: 1471945665147:3227183749 X-MC-Ingress-Time: 1471945665147 Received: from [176.249.240.35] (port=50282 helo=localhost.localdomain) by uscentral428.accountservergroup.com with esmtpa (Exim 4.87) (envelope-from ) id 1bc8J5-0002HZ-ON; Tue, 23 Aug 2016 05:47:44 -0400 From: Elliot Smith To: toaster@yoctoproject.org Date: Tue, 23 Aug 2016 10:47:38 +0100 Message-Id: <1471945658-9671-1-git-send-email-elliot.smith@intel.com> X-Mailer: git-send-email 2.7.4 X-AuthUser: elliot@townx.org Subject: [PATCH] buildinfohelper: discover kernel artifacts correctly X-BeenThere: toaster@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list 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 09:47:58 -0000 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