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 5FAA0EB64DC for ; Tue, 18 Jul 2023 20:34:52 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 040F58670A; Tue, 18 Jul 2023 22:34:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none 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="Wf5LS2HT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E10DD86708; Tue, 18 Jul 2023 22:34:38 +0200 (CEST) Received: from s.wrqvtzvf.outbound-mail.sendgrid.net (s.wrqvtzvf.outbound-mail.sendgrid.net [149.72.126.143]) (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 77610865FA for ; Tue, 18 Jul 2023 22:34:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none 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=Ci0OGvKw0XqmH3ApGkaUrob+7S5Rr1HkXHpSeBlS8tk=; b=Wf5LS2HTWXBEX0flHd599p3+KPfXqTmmzJ+CiT1W/mlRwBTaFLKShywDoRD5THLje7Yh 3atMNUvYgqn2N/EjQCMNMgtaZUQTx/BvlW79QIrK0RnRGyfgWaVdwMpv+Yl4C4l/itlKDA FtkOY1TDJVdWrMrxMQwAtlRoJpTKaUXE2t4o8LqiKnK0bbWvQ1Hy4XfabrifD4Xa2x6KBQ k+jxDqwJspsjItrTtyFN0gXZGj2LOfuYisO80a0ojv81YJsgNNHXtqJneHokbaCwNdGHb6 dOFOkpdWwpLuedAmQZPIuLzxKTc/2k1Zr84rbvPSJvN3nLpviDs7B6rYAGZunCQA== Received: by filterdrecv-77869f68cc-5zdvl with SMTP id filterdrecv-77869f68cc-5zdvl-1-64B6F75A-2C 2023-07-18 20:34:35.071595242 +0000 UTC m=+5950712.869451164 Received: from bionic.localdomain (unknown) by geopod-ismtpd-9 (SG) with ESMTP id vPb4NN_iTWuP8AYckynCsg Tue, 18 Jul 2023 20:34:34.871 +0000 (UTC) From: Jonas Karlman Subject: [PATCH v2 3/7] binman: Report missing external blobs using error level Date: Tue, 18 Jul 2023 20:34:35 +0000 (UTC) Message-ID: <20230718203423.264341-4-jonas@kwiboo.se> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718203423.264341-1-jonas@kwiboo.se> References: <20230718203423.264341-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: =?us-ascii?Q?TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxA?= =?us-ascii?Q?fZekEeQsTe+RrMu3cja6a0h6vg7jzsn7UsxY5iT?= =?us-ascii?Q?Ylmx2+VXn=2FXMBCOGqIHiXaPZVp8c6x2hDzEx+BL?= =?us-ascii?Q?gNJ9KYbblGtZaA8XLfnRrtnhXwWWAr=2FKA0PVn0b?= =?us-ascii?Q?ob7bAaqnBh3qkkyvs9QLO2NmztTPGbr2o95+i2I?= =?us-ascii?Q?TJQTUBdEgH3LOXIAirBYVJRK81QeeY56Tt+ocA?= To: Simon Glass , Alper Nebi Yasak Cc: 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.8 at phobos.denx.de X-Virus-Status: Clean Print missing external blobs using error level and missing optional external blobs using warning level. Also change to only print the header line in color, red for missing and yellow for optional. Signed-off-by: Jonas Karlman --- v2: - New patch tools/binman/control.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/binman/control.py b/tools/binman/control.py index 3560cadba4c2..e5682bf2d3db 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -112,12 +112,12 @@ def _ReadMissingBlobHelp(): _FinishTag(tag, msg, result) return result -def _ShowBlobHelp(path, text): - tout.warning('\n%s:' % path) +def _ShowBlobHelp(level, path, text): + tout.do_output(level, '\n%s:' % path) for line in text.splitlines(): - tout.warning(' %s' % line) + tout.do_output(level, ' %s' % line) -def _ShowHelpForMissingBlobs(missing_list): +def _ShowHelpForMissingBlobs(level, missing_list): """Show help for each missing blob to help the user take action Args: @@ -134,7 +134,7 @@ def _ShowHelpForMissingBlobs(missing_list): # Show the first match help message for tag in tags: if tag in missing_blob_help: - _ShowBlobHelp(entry._node.path, missing_blob_help[tag]) + _ShowBlobHelp(level, entry._node.path, missing_blob_help[tag]) break def GetEntryModules(include_testing=True): @@ -658,9 +658,9 @@ 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" % - (image.name, ' '.join([e.name for e in missing_list]))) - _ShowHelpForMissingBlobs(missing_list) + tout.error("Image '%s' is missing external blobs and is non-functional: %s" % + (image.name, ' '.join([e.name for e in missing_list]))) + _ShowHelpForMissingBlobs(tout.ERROR, missing_list) faked_list = [] image.CheckFakedBlobs(faked_list) @@ -676,7 +676,7 @@ def ProcessImage(image, update_fdt, write_map, get_contents=True, tout.warning( "Image '%s' is missing optional external blobs but is still functional: %s" % (image.name, ' '.join([e.name for e in optional_list]))) - _ShowHelpForMissingBlobs(optional_list) + _ShowHelpForMissingBlobs(tout.WARNING, optional_list) missing_bintool_list = [] image.check_missing_bintools(missing_bintool_list) -- 2.41.0