From patchwork Thu Jan 20 19:22:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12719003 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE4A5C433FE for ; Thu, 20 Jan 2022 19:23:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243770AbiATTXc (ORCPT ); Thu, 20 Jan 2022 14:23:32 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:24700 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238482AbiATTXb (ORCPT ); Thu, 20 Jan 2022 14:23:31 -0500 Received: from grover.. (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-08.nifty.com with ESMTP id 20KJMCMN001376; Fri, 21 Jan 2022 04:22:12 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com 20KJMCMN001376 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1642706532; bh=gPoSejFv1rZps1hQ66wlGv5FGinyPUP1BTtRi8b169c=; h=From:To:Cc:Subject:Date:From; b=IDKXs+gIUr7RFnQw7j+xeXOXvn3Y8X0iyTPdjYQFqbMQS0oh6KcK9TMkX4XecLvGs nuLRFaDMFe0BhgQ1Fz7q7rCymDP2QsVuMNzvvERlxLGO2ycc3nzw8EripFc+ZUyfHV Kjw40EpE7ZHN+ZNkUimhpG3ycXtlKaS64BIQOWOEyNSlWpmdoDimHpUK9xQ5/2+InC MbZ8b+qVMECaYZwXn/bdSFqH1m7etWdIjCGfXqDvMYKi62ecIi+AKXszYA6uVoXEoO 5BmmGWwx1cNy+5SsUQWXf0OyGnjW2qiKFRiDmlAg2znk6ufG5fgUWG9R1AYqWuxpPu 7vzIZzUyrqxdQ== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Michal Kubecek , Masahiro Yamada , David Howells , David Woodhouse , keyrings@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] certs: Fix build error when CONFIG_MODULE_SIG_KEY is PKCS#11 URI Date: Fri, 21 Jan 2022 04:22:04 +0900 Message-Id: <20220120192205.525103-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: keyrings@vger.kernel.org When CONFIG_MODULE_SIG_KEY is PKCS#11 URL (pkcs11:*), signing_key.x509 fails to build: certs/Makefile:77: *** target pattern contains no '%'. Stop. Due to the typo, $(X509_DEP) contains a colon. Fix it. Fixes: b8c96a6b466c ("certs: simplify $(srctree)/ handling and remove config_filename macro") Signed-off-by: Masahiro Yamada --- certs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/certs/Makefile b/certs/Makefile index f7041c29a2e0..0c459cfd09df 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -68,7 +68,7 @@ $(obj)/x509.genkey: endif # CONFIG_MODULE_SIG_KEY # If CONFIG_MODULE_SIG_KEY isn't a PKCS#11 URI, depend on it -ifneq ($(filter-out pkcs11:%, %(CONFIG_MODULE_SIG_KEY)),) +ifneq ($(filter-out pkcs11:%, $(CONFIG_MODULE_SIG_KEY)),) X509_DEP := $(CONFIG_MODULE_SIG_KEY) endif From patchwork Thu Jan 20 19:22:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12719004 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4548BC4332F for ; Thu, 20 Jan 2022 19:23:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346991AbiATTXc (ORCPT ); Thu, 20 Jan 2022 14:23:32 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:24706 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243427AbiATTXb (ORCPT ); Thu, 20 Jan 2022 14:23:31 -0500 Received: from grover.. (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-08.nifty.com with ESMTP id 20KJMCMO001376; Fri, 21 Jan 2022 04:22:13 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com 20KJMCMO001376 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1642706533; bh=e7aATIIG+VEhoI3nC/mHzVmccU9dk9dBlThTaanPlSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mbJhvdlLRE2ESnBfuaVbAUo5c0rr+qIWClKFNU+NF5n3/pqjMaEJoFHBtArAzhtyZ 025imjOK78Rz6EXfNri06RXcAwNsIULJs7Mo9w8CKmUlxRADfeoHGCUS3QTVv7N20r XlWZNYrbzatI5j98vt7cqhU1f09lJzquJmuzM7F7b8esaEqRgU2rW3w38orsqlO1M4 L+ZCPARxdBcMSFnw0YHgkAFt7kPVGkYcrIqub9G10HclxfMgCKf1/ki7p7N9TYJaq0 aG5ulSbCQ91EP/xocZT2enqbmRcmpdy0j9TG7gDTOZ2NcirY6y+Kn0MSb8A7ZjiTNu oGxK43KW4aI2w== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Michal Kubecek , Masahiro Yamada , David Howells , David Woodhouse , keyrings@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] certs: Fix build error when CONFIG_MODULE_SIG_KEY is empty Date: Fri, 21 Jan 2022 04:22:05 +0900 Message-Id: <20220120192205.525103-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220120192205.525103-1-masahiroy@kernel.org> References: <20220120192205.525103-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: keyrings@vger.kernel.org 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 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 Signed-off-by: Masahiro Yamada Tested-by: Michal Kubecek --- 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