From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 56997C05027 for ; Sun, 19 Feb 2023 22:03:44 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 61BF58584D; Sun, 19 Feb 2023 23:02:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="Tc0VDUEF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 296D185778; Sun, 19 Feb 2023 23:02:22 +0100 (CET) Received: from xtrwkhkk.outbound-mail.sendgrid.net (xtrwkhkk.outbound-mail.sendgrid.net [167.89.16.17]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2589285860 for ; Sun, 19 Feb 2023 23:02:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=JH9bnYYPyT0qa64I0NW+CoXQyO3qflaWjwOEU1j3hAY=; b=Tc0VDUEFQiIh70qynr+WWrrdAWSna93z+IAoJQqdnFCBX0WSqfUAQbWC+nyoIj3r/Mnr x5aeJi97qIarxYrOG1qcgHRAvcU/8ZnZYtgNZrNHffQd/Gd6t+JuzJ5h50sh4T2EAFMZdn U7SA0SdJAxwR90Rz49wDDD5DhZuGnrEGlBFejmtGtAnYZK8UqXnBDsOcDl8FSIJpSiicny vM75EWZjOS8Nu0tvyJiYOMNYqkEz3XtL7O29r05wuaO5fLQwk/7/2CKI+w5VZDx73HLuHK x3FDQ6Fzq5q3mW5K2yX0zfhy/1X3Id+5vGabd2tGdo+jssEb3nSCtdd1QkBsUqMQ== Received: by filterdrecv-7765ff4f7d-qqvbf with SMTP id filterdrecv-7765ff4f7d-qqvbf-1-63F29C5D-7B 2023-02-19 22:02:06.081643786 +0000 UTC m=+788479.030351542 Received: from bionic.localdomain (unknown) by geopod-ismtpd-canary-0 (SG) with ESMTP id u-BeDL94TWWforpq4XKpVQ Sun, 19 Feb 2023 22:02:05.779 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 7/9] binman: Fix blank line usage for invalid images warning text Date: Sun, 19 Feb 2023 22:02:06 +0000 (UTC) Message-Id: <20230219220158.4160763-8-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230219220158.4160763-1-jonas@kwiboo.se> References: <20230219220158.4160763-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: =?us-ascii?Q?TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxA?= =?us-ascii?Q?fZekEeQsTe+RrMu3cja6a0hxvFyypeXhx47Qk7V?= =?us-ascii?Q?hpcH+dgKtc8Ow+6FRv=2FoKjWRGf4MMYbhDFXiz4h?= =?us-ascii?Q?vj3UEAk+z+yU+fDjua95VTaoSq7a4iqAOoKWQkh?= =?us-ascii?Q?5iUqkS326vzQMFsS9TZ705VMeSlrTDUtvID5Q6e?= =?us-ascii?Q?08RmEZJNzEgsBLmuWbc35hkc3=2Fa=2F1TZJ7RXOcA?= To: Simon Glass , Alper Nebi Yasak Cc: Pali =?iso-8859-1?b?Um9o4XI=?= , Heinrich Schuchardt , Marek =?iso-8859-1?b?QmVo+m4=?= , Quentin Schulz , Stefan Herbrechtsmeier , u-boot@lists.denx.de, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean There is no blank line between last missing blob help message and the header line for optional blob help messages. Image 'simple-bin' is missing external blobs and is non-functional: atf-bl31 /binman/simple-bin/fit/images/@atf-SEQ/atf-bl31: See the documentation for your board. You may need to build ARM Trusted Firmware and build with BL31=/path/to/bl31.bin Image 'simple-bin' is missing external blobs but is still functional: tee-os /binman/simple-bin/fit/images/@tee-SEQ/tee-os: See the documentation for your board. You may need to build Open Portable Trusted Execution Environment (OP-TEE) with TEE=/path/to/tee.bin Some images are invalid With this a blank line is inserted to make the text more readable. Signed-off-by: Jonas Karlman --- tools/binman/control.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/binman/control.py b/tools/binman/control.py index e64740094f60..b5ede60c1cde 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -106,9 +106,10 @@ def _ReadMissingBlobHelp(): return result def _ShowBlobHelp(path, text): - tout.warning('\n%s:' % path) + tout.warning('%s:' % path) for line in text.splitlines(): tout.warning(' %s' % line) + tout.warning('') def _ShowHelpForMissingBlobs(missing_list): """Show help for each missing blob to help the user take action @@ -598,7 +599,7 @@ def ProcessImage(image, update_fdt, write_map, get_contents=True, missing_list = [] image.CheckMissing(missing_list) if missing_list: - tout.warning("Image '%s' is missing external blobs and is non-functional: %s" % + tout.warning("Image '%s' is missing external blobs and is non-functional: %s\n" % (image.name, ' '.join([e.name for e in missing_list]))) _ShowHelpForMissingBlobs(missing_list) @@ -606,7 +607,7 @@ def ProcessImage(image, update_fdt, write_map, get_contents=True, image.CheckFakedBlobs(faked_list) if faked_list: tout.warning( - "Image '%s' has faked external blobs and is non-functional: %s" % + "Image '%s' has faked external blobs and is non-functional: %s\n" % (image.name, ' '.join([os.path.basename(e.GetDefaultFilename()) for e in faked_list]))) @@ -614,7 +615,7 @@ def ProcessImage(image, update_fdt, write_map, get_contents=True, image.CheckOptional(optional_list) if optional_list: tout.warning( - "Image '%s' is missing external blobs but is still functional: %s" % + "Image '%s' is missing external blobs but is still functional: %s\n" % (image.name, ' '.join([e.name for e in optional_list]))) _ShowHelpForMissingBlobs(optional_list) @@ -622,7 +623,7 @@ def ProcessImage(image, update_fdt, write_map, get_contents=True, image.check_missing_bintools(missing_bintool_list) if missing_bintool_list: tout.warning( - "Image '%s' has missing bintools and is non-functional: %s" % + "Image '%s' has missing bintools and is non-functional: %s\n" % (image.name, ' '.join([os.path.basename(bintool.name) for bintool in missing_bintool_list]))) return any([missing_list, faked_list, missing_bintool_list]) @@ -756,7 +757,7 @@ def Binman(args): # This can only be True if -M is provided, since otherwise binman # would have raised an error already if invalid: - msg = '\nSome images are invalid' + msg = 'Some images are invalid' if args.ignore_missing: tout.warning(msg) else: -- 2.39.2