From: Nicolas Schier <n.schier@avm.de>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org,
Michal Simek <michal.simek@xilinx.com>,
linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>,
David Woodhouse <dwmw2@infradead.org>,
keyrings@vger.kernel.org, Richard Weinberger <richard@nod.at>
Subject: Re: [PATCH 02/10] certs: unify duplicated cmd_extract_certs and improve the log
Date: Mon, 13 Dec 2021 14:07:50 +0100 [thread overview]
Message-ID: <YbdFplCZHvzeOON+@buildd.core.avm.de> (raw)
In-Reply-To: <20211212192941.1149247-3-masahiroy@kernel.org>
On Mon, Dec 13, 2021 at 04:29:33AM +0900, Masahiro Yamada wrote:
> cmd_extract_certs is defined twice. Unify them.
>
> The current log shows the input file $(2), which might be empty.
> You cannot know what is being created from the log, "EXTRACT_CERTS".
>
> Change the log to show the output file with better alignment.
>
> [Before]
>
> EXTRACT_CERTS certs/signing_key.pem
> CC certs/system_keyring.o
> EXTRACT_CERTS
> AS certs/system_certificates.o
> CC certs/common.o
> CC certs/blacklist.o
> EXTRACT_CERTS
> AS certs/revocation_certificates.o
>
> [After]
>
> CERT certs/signing_key.x509
> CC certs/system_keyring.o
> CERT certs/x509_certificate_list
> AS certs/system_certificates.o
> CC certs/common.o
> CC certs/blacklist.o
> CERT certs/x509_revocation_list
> AS certs/revocation_certificates.o
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
Reviewed-by: Nicolas Schier <n.schier@avm.de>
>
> certs/Makefile | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/certs/Makefile b/certs/Makefile
> index 97fd6cc02972..945e53d90d38 100644
> --- a/certs/Makefile
> +++ b/certs/Makefile
> @@ -12,6 +12,9 @@ else
> obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o
> endif
>
> +quiet_cmd_extract_certs = CERT $@
> + cmd_extract_certs = scripts/extract-cert $(2) $@
> +
> ifeq ($(CONFIG_SYSTEM_TRUSTED_KEYRING),y)
>
> $(eval $(call config_filename,SYSTEM_TRUSTED_KEYS))
> @@ -22,9 +25,6 @@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list
> # Cope with signing_key.x509 existing in $(srctree) not $(objtree)
> AFLAGS_system_certificates.o := -I$(srctree)
>
> -quiet_cmd_extract_certs = EXTRACT_CERTS $(patsubst "%",%,$(2))
> - cmd_extract_certs = scripts/extract-cert $(2) $@
> -
> targets += x509_certificate_list
> $(obj)/x509_certificate_list: scripts/extract-cert $(SYSTEM_TRUSTED_KEYS_SRCPREFIX)$(SYSTEM_TRUSTED_KEYS_FILENAME) FORCE
> $(call if_changed,extract_certs,$(SYSTEM_TRUSTED_KEYS_SRCPREFIX)$(CONFIG_SYSTEM_TRUSTED_KEYS))
> @@ -98,9 +98,6 @@ $(eval $(call config_filename,SYSTEM_REVOCATION_KEYS))
>
> $(obj)/revocation_certificates.o: $(obj)/x509_revocation_list
>
> -quiet_cmd_extract_certs = EXTRACT_CERTS $(patsubst "%",%,$(2))
> - cmd_extract_certs = scripts/extract-cert $(2) $@
> -
> targets += x509_revocation_list
> $(obj)/x509_revocation_list: scripts/extract-cert $(SYSTEM_REVOCATION_KEYS_SRCPREFIX)$(SYSTEM_REVOCATION_KEYS_FILENAME) FORCE
> $(call if_changed,extract_certs,$(SYSTEM_REVOCATION_KEYS_SRCPREFIX)$(CONFIG_SYSTEM_REVOCATION_KEYS))
> --
> 2.32.0
>
next prev parent reply other threads:[~2021-12-13 13:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-12 19:29 [PATCH 00/10] kbuild: do not quote string values in Makefile Masahiro Yamada
2021-12-12 19:29 ` [PATCH 01/10] certs: use $@ to simplify the key generation rule Masahiro Yamada
2021-12-13 13:00 ` Nicolas Schier
2021-12-14 1:45 ` Masahiro Yamada
2021-12-12 19:29 ` [PATCH 02/10] certs: unify duplicated cmd_extract_certs and improve the log Masahiro Yamada
2021-12-13 13:07 ` Nicolas Schier [this message]
2021-12-12 19:29 ` [PATCH 03/10] certs: remove unneeded -I$(srctree) option for system_certificates.o Masahiro Yamada
2021-12-12 19:29 ` [PATCH 04/10] certs: refactor file cleaning Masahiro Yamada
2021-12-13 13:08 ` Nicolas Schier
2021-12-12 19:29 ` [PATCH 05/10] certs: remove misleading comments about GCC PR Masahiro Yamada
2021-12-12 19:29 ` [PATCH 06/10] kbuild: stop using config_filename in scripts/Makefile.modsign Masahiro Yamada
2021-12-13 13:13 ` Nicolas Schier
2021-12-12 19:29 ` [PATCH 07/10] certs: simplify $(srctree)/ handling and remove config_filename macro Masahiro Yamada
2021-12-12 19:29 ` [PATCH 08/10] kbuild: do not include include/config/auto.conf from shell scripts Masahiro Yamada
2021-12-13 13:17 ` Nicolas Schier
2021-12-14 1:50 ` Masahiro Yamada
2021-12-12 19:29 ` [PATCH 09/10] kbuild: do not quote string values in include/config/auto.conf Masahiro Yamada
2021-12-12 19:29 ` [PATCH 10/10] microblaze: use built-in function to get CPU_{MAJOR,MINOR,REV} Masahiro Yamada
2021-12-13 13:18 ` Nicolas Schier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YbdFplCZHvzeOON+@buildd.core.avm.de \
--to=n.schier@avm.de \
--cc=dhowells@redhat.com \
--cc=dwmw2@infradead.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=michal.simek@xilinx.com \
--cc=richard@nod.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox