From: Masahiro Yamada <masahiroy@kernel.org>
To: Jarkko Sakkinen <jarkko@kernel.org>,
David Howells <dhowells@redhat.com>,
David Woodhouse <dwmw2@infradead.org>,
keyrings@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
Masahiro Yamada <masahiroy@kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/5] certs: use 'cmd' to hide openssl output in silent builds more simply
Date: Fri, 5 Nov 2021 12:59:57 +0900 [thread overview]
Message-ID: <20211105035959.93748-5-masahiroy@kernel.org> (raw)
In-Reply-To: <20211105035959.93748-1-masahiroy@kernel.org>
Commit 5d06ee20b662 ("modsign: hide openssl output in silent builds")
silenced the key generation log from openssl in silent builds.
Since commit 174a1dcc9642 ("kbuild: sink stdout from cmd for silent
build"), the 'cmd' macro can handle it in a cleaner way.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
certs/Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/certs/Makefile b/certs/Makefile
index a8c9abceef00..fdf206022113 100644
--- a/certs/Makefile
+++ b/certs/Makefile
@@ -51,9 +51,6 @@ ifdef SIGN_KEY
#
###############################################################################
-redirect_openssl = 2>&1
-quiet_redirect_openssl = 2>&1
-silent_redirect_openssl = 2>/dev/null
openssl_available = $(shell openssl help 2>/dev/null && echo yes)
# We do it this way rather than having a boolean option for enabling an
@@ -79,13 +76,16 @@ $(if $(findstring rsaEncryption,$(X509TEXT)),,$(shell rm -f "certs/signing_key.p
endif
endif # CONFIG_MODULE_SIG_KEY_TYPE_RSA
-$(obj)/signing_key.pem: $(obj)/x509.genkey
- $(Q)openssl req -new -nodes -utf8 -$(CONFIG_MODULE_SIG_HASH) -days 36500 \
+quiet_cmd_gen_key = GENKEY $@
+ cmd_gen_key = openssl req -new -nodes -utf8 -$(CONFIG_MODULE_SIG_HASH) -days 36500 \
-batch -x509 -config $(obj)/x509.genkey \
-outform PEM -out $(obj)/signing_key.pem \
-keyout $(obj)/signing_key.pem \
$(keytype_openssl) \
- $($(quiet)redirect_openssl)
+ 2>&1
+
+$(obj)/signing_key.pem: $(obj)/x509.genkey
+ $(call cmd,gen_key)
quiet_cmd_copy_x509_config = COPY $@
cmd_copy_x509_config = cat $(srctree)/$(src)/default_x509.genkey > $@
--
2.30.2
next prev parent reply other threads:[~2021-11-05 4:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-05 3:59 [PATCH 0/5] certs: various cleanups of certs/Makefile Masahiro Yamada
2021-11-05 3:59 ` [PATCH 1/5] certs: remove meaningless $(error ...) in certs/Makefile Masahiro Yamada
2021-11-05 3:59 ` [PATCH 2/5] certs: check-in the default x509 config file Masahiro Yamada
2021-11-05 3:59 ` [PATCH 3/5] certs: remove noisy messages while generating the signing key Masahiro Yamada
2021-11-05 7:33 ` Arnd Bergmann
2021-11-05 7:55 ` Masahiro Yamada
2021-11-05 3:59 ` Masahiro Yamada [this message]
2021-11-05 3:59 ` [PATCH 5/5] certs: use if_changed to re-generate the key when the key type is changed Masahiro Yamada
2021-12-11 18:42 ` [PATCH 0/5] certs: various cleanups of certs/Makefile Masahiro Yamada
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=20211105035959.93748-5-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=arnd@arndb.de \
--cc=dhowells@redhat.com \
--cc=dwmw2@infradead.org \
--cc=jarkko@kernel.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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