Skip to content

Commit

Permalink
certs: use 'cmd' to hide openssl output in silent builds more simply
Browse files Browse the repository at this point in the history
Commit 5d06ee2 ("modsign: hide openssl output in silent builds")
silenced the key generation log from openssl in silent builds.

Since commit 174a1dc ("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>
  • Loading branch information
Masahiro Yamada committed Dec 11, 2021
1 parent f8487d2 commit 54c8b51
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions certs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 > $@
Expand Down

0 comments on commit 54c8b51

Please sign in to comment.