diff options
author | Masahiro Yamada <masahiroy@kernel.org> | 2021-12-14 11:53:50 +0900 |
---|---|---|
committer | Masahiro Yamada <masahiroy@kernel.org> | 2022-01-08 17:46:35 +0900 |
commit | 4db9c2e3d055cc11e64b5c9bbaa70b5a552adf0f (patch) | |
tree | 080c2a296e54278cda339b565fb4013c34660b53 /scripts | |
parent | 5410f3e810f64366ada353efa5e7559be040fb71 (diff) | |
download | lwn-4db9c2e3d055cc11e64b5c9bbaa70b5a552adf0f.tar.gz lwn-4db9c2e3d055cc11e64b5c9bbaa70b5a552adf0f.zip |
kbuild: stop using config_filename in scripts/Makefile.modsign
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>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.modinst | 5 |
1 files 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 := |