Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-fixes-v6.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- Fix two bugs (for building and for signing) when MODULE_SIG_KEY
contains a PKCS#11 URI
* tag 'kbuild-fixes-v6.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kbuild: modinst: Fix build error when CONFIG_MODULE_SIG_KEY is a PKCS#11 URI
certs: Fix build error when PKCS#11 URI contains semicolon
+7
-3
+2
-2
certs/Makefile
+2
-2
certs/Makefile
···
23
23
targets += blacklist_hash_list
24
24
25
25
quiet_cmd_extract_certs = CERT $@
26
-
cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@
27
-
extract-cert-in = $(or $(filter-out $(obj)/extract-cert, $(real-prereqs)),"")
26
+
cmd_extract_certs = $(obj)/extract-cert "$(extract-cert-in)" $@
27
+
extract-cert-in = $(filter-out $(obj)/extract-cert, $(real-prereqs))
28
28
29
29
$(obj)/system_certificates.o: $(obj)/x509_certificate_list
30
30
+5
-1
scripts/Makefile.modinst
+5
-1
scripts/Makefile.modinst
···
66
66
# Don't stop modules_install even if we can't sign external modules.
67
67
#
68
68
ifeq ($(CONFIG_MODULE_SIG_ALL),y)
69
+
ifeq ($(filter pkcs11:%, $(CONFIG_MODULE_SIG_KEY)),)
69
70
sig-key := $(if $(wildcard $(CONFIG_MODULE_SIG_KEY)),,$(srctree)/)$(CONFIG_MODULE_SIG_KEY)
71
+
else
72
+
sig-key := $(CONFIG_MODULE_SIG_KEY)
73
+
endif
70
74
quiet_cmd_sign = SIGN $@
71
-
cmd_sign = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) $(sig-key) certs/signing_key.x509 $@ \
75
+
cmd_sign = scripts/sign-file $(CONFIG_MODULE_SIG_HASH) "$(sig-key)" certs/signing_key.x509 $@ \
72
76
$(if $(KBUILD_EXTMOD),|| true)
73
77
else
74
78
quiet_cmd_sign :=