Skip to content

Commit 4db9c2e

Browse files
committed
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 <[email protected]> Reviewed-by: Nicolas Schier <[email protected]>
1 parent 5410f3e commit 4db9c2e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

scripts/Makefile.modinst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ endif
6666
# Don't stop modules_install even if we can't sign external modules.
6767
#
6868
ifeq ($(CONFIG_MODULE_SIG_ALL),y)
69+
CONFIG_MODULE_SIG_KEY := $(CONFIG_MODULE_SIG_KEY:"%"=%)
70+
sig-key := $(if $(wildcard $(CONFIG_MODULE_SIG_KEY)),,$(srctree)/)$(CONFIG_MODULE_SIG_KEY)
6971
quiet_cmd_sign = SIGN $@
70-
$(eval $(call config_filename,MODULE_SIG_KEY))
71-
cmd_sign = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) $(MODULE_SIG_KEY_SRCPREFIX)$(CONFIG_MODULE_SIG_KEY) certs/signing_key.x509 $@ \
72+
cmd_sign = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) $(sig-key) certs/signing_key.x509 $@ \
7273
$(if $(KBUILD_EXTMOD),|| true)
7374
else
7475
quiet_cmd_sign :=

0 commit comments

Comments
 (0)