| Message ID | 20220120192205.525103-2-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] certs: Fix build error when CONFIG_MODULE_SIG_KEY is PKCS#11 URI | expand |
On Fri, Jan 21, 2022 at 04:22:05AM +0900, Masahiro Yamada wrote: > Since b8c96a6b466c ("certs: simplify $(srctree)/ handling and remove > config_filename macro"), when CONFIG_MODULE_SIG_KEY is empty, > signing_key.x509 fails to build: > > CERT certs/signing_key.x509 > Usage: extract-cert <source> <dest> > make[1]: *** [certs/Makefile:78: certs/signing_key.x509] Error 2 > make: *** [Makefile:1831: certs] Error 2 > > Pass "" to the first argument of extract-cert to fix the build error. > > Link: https://lore.kernel.org/linux-kbuild/20220120094606.2skuyb26yjlnu66q@lion.mk-sys.cz/T/#u > Fixes: b8c96a6b466c ("certs: simplify $(srctree)/ handling and remove config_filename macro") > Reported-by: Michal Kubecek <mkubecek@suse.cz> > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Tested-by: Michal Kubecek <mkubecek@suse.cz> Thank you for the quick fix. Michal > --- > > certs/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/certs/Makefile b/certs/Makefile > index 0c459cfd09df..3ea7fe60823f 100644 > --- a/certs/Makefile > +++ b/certs/Makefile > @@ -75,7 +75,7 @@ endif > $(obj)/system_certificates.o: $(obj)/signing_key.x509 > > $(obj)/signing_key.x509: $(X509_DEP) $(obj)/extract-cert FORCE > - $(call if_changed,extract_certs,$(if $(X509_DEP),$<,$(CONFIG_MODULE_SIG_KEY))) > + $(call if_changed,extract_certs,$(if $(CONFIG_MODULE_SIG_KEY),$(if $(X509_DEP),$<,$(CONFIG_MODULE_SIG_KEY)),"")) > endif # CONFIG_MODULE_SIG > > targets += signing_key.x509 > -- > 2.32.0 >
diff --git a/certs/Makefile b/certs/Makefile index 0c459cfd09df..3ea7fe60823f 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -75,7 +75,7 @@ endif $(obj)/system_certificates.o: $(obj)/signing_key.x509 $(obj)/signing_key.x509: $(X509_DEP) $(obj)/extract-cert FORCE - $(call if_changed,extract_certs,$(if $(X509_DEP),$<,$(CONFIG_MODULE_SIG_KEY))) + $(call if_changed,extract_certs,$(if $(CONFIG_MODULE_SIG_KEY),$(if $(X509_DEP),$<,$(CONFIG_MODULE_SIG_KEY)),"")) endif # CONFIG_MODULE_SIG targets += signing_key.x509
Since b8c96a6b466c ("certs: simplify $(srctree)/ handling and remove config_filename macro"), when CONFIG_MODULE_SIG_KEY is empty, signing_key.x509 fails to build: CERT certs/signing_key.x509 Usage: extract-cert <source> <dest> make[1]: *** [certs/Makefile:78: certs/signing_key.x509] Error 2 make: *** [Makefile:1831: certs] Error 2 Pass "" to the first argument of extract-cert to fix the build error. Link: https://lore.kernel.org/linux-kbuild/20220120094606.2skuyb26yjlnu66q@lion.mk-sys.cz/T/#u Fixes: b8c96a6b466c ("certs: simplify $(srctree)/ handling and remove config_filename macro") Reported-by: Michal Kubecek <mkubecek@suse.cz> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- certs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)