From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Michal Simek <michal.simek@xilinx.com>,
linux-arch@vger.kernel.org, David Howells <dhowells@redhat.com>,
David Woodhouse <dwmw2@infradead.org>,
keyrings@vger.kernel.org, Richard Weinberger <richard@nod.at>,
Nicolas Schier <n.schier@avm.de>,
Masahiro Yamada <masahiroy@kernel.org>
Subject: [PATCH v2 06/11] kbuild: stop using config_filename in scripts/Makefile.modsign
Date: Tue, 14 Dec 2021 11:53:50 +0900 [thread overview]
Message-ID: <20211214025355.1267796-7-masahiroy@kernel.org> (raw)
In-Reply-To: <20211214025355.1267796-1-masahiroy@kernel.org>
Toward the goal of removing the config_filename macro, drop
the double-quotes and add $(srctree)/ prefix in an ad hoc way.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <n.schier@avm.de>
---
(no changes since v1)
scripts/Makefile.modinst | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index ff9b09e4cfca..df7e3d578ef5 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -66,9 +66,10 @@ endif
# Don't stop modules_install even if we can't sign external modules.
#
ifeq ($(CONFIG_MODULE_SIG_ALL),y)
+CONFIG_MODULE_SIG_KEY := $(CONFIG_MODULE_SIG_KEY:"%"=%)
+sig-key := $(if $(wildcard $(CONFIG_MODULE_SIG_KEY)),,$(srctree)/)$(CONFIG_MODULE_SIG_KEY)
quiet_cmd_sign = SIGN $@
-$(eval $(call config_filename,MODULE_SIG_KEY))
- cmd_sign = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) $(MODULE_SIG_KEY_SRCPREFIX)$(CONFIG_MODULE_SIG_KEY) certs/signing_key.x509 $@ \
+ cmd_sign = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) $(sig-key) certs/signing_key.x509 $@ \
$(if $(KBUILD_EXTMOD),|| true)
else
quiet_cmd_sign :=
--
2.32.0
next prev parent reply other threads:[~2021-12-14 2:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-14 2:53 [PATCH v2 00/11] kbuild: do not quote string values in Makefile Masahiro Yamada
2021-12-14 2:53 ` [PATCH v2 01/11] certs: use $< and $@ to simplify the key generation rule Masahiro Yamada
2021-12-14 2:53 ` [PATCH v2 02/11] certs: unify duplicated cmd_extract_certs and improve the log Masahiro Yamada
2021-12-14 2:53 ` [PATCH v2 03/11] certs: remove unneeded -I$(srctree) option for system_certificates.o Masahiro Yamada
2021-12-14 2:53 ` [PATCH v2 04/11] certs: refactor file cleaning Masahiro Yamada
2021-12-14 2:53 ` [PATCH v2 05/11] certs: remove misleading comments about GCC PR Masahiro Yamada
2021-12-14 2:53 ` Masahiro Yamada [this message]
2021-12-14 2:53 ` [PATCH v2 07/11] certs: simplify $(srctree)/ handling and remove config_filename macro Masahiro Yamada
2021-12-14 2:53 ` [PATCH v2 08/11] kbuild: do not include include/config/auto.conf from shell scripts Masahiro Yamada
2021-12-14 2:53 ` [PATCH v2 09/11] kbuild: do not quote string values in include/config/auto.conf Masahiro Yamada
2021-12-14 2:53 ` [PATCH v2 10/11] certs: move scripts/extract-cert to certs/ Masahiro Yamada
2021-12-14 2:53 ` [PATCH v2 11/11] microblaze: use built-in function to get CPU_{MAJOR,MINOR,REV} Masahiro Yamada
2022-01-04 23:48 ` [PATCH v2 00/11] kbuild: do not quote string values in 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=20211214025355.1267796-7-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--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=michal.simek@xilinx.com \
--cc=n.schier@avm.de \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).