From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752536AbbETBR4 (ORCPT ); Tue, 19 May 2015 21:17:56 -0400 Received: from ip-203-192-156-9.asianetcom.net ([203.192.156.9]:23346 "EHLO amd.suse.cz" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752236AbbETBRv (ORCPT ); Tue, 19 May 2015 21:17:51 -0400 From: Michal Marek To: dhowells@redhat.com Cc: torvalds@linux-foundation.org, aricart@memnix.com, linux-kernel@vger.kernel.org, sedat.dilek@gmail.com, keyrings@linux-nfs.org, rusty@rustcorp.com.au, linux-security-module@vger.kernel.org, james.l.morris@oracle.com, dwmw2@infradead.org Subject: [PATCH 2/3] MODSIGN: Use filechk to generate .x509.list Date: Wed, 20 May 2015 09:08:39 +0800 Message-Id: <1432084120-7918-2-git-send-email-mmarek@suse.cz> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1432084120-7918-1-git-send-email-mmarek@suse.cz> References: <18832.1432044859.1@warthog.procyon.org.uk> <1432084120-7918-1-git-send-email-mmarek@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Linus Torvalds Use the filechk Kbuild function instead of manually comparing the content of the generated file. Signed-off-by: Linus Torvalds --- kernel/Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index dc78819..3177160 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -136,13 +136,6 @@ ifeq ($(X509_CERTIFICATES),) $(warning *** No X.509 certificates found ***) endif -ifneq ($(wildcard $(obj)/.x509.list),) -ifneq ($(shell cat $(obj)/.x509.list),$(X509_CERTIFICATES)) -$(info X.509 certificate list changed) -$(shell rm $(obj)/.x509.list) -endif -endif - kernel/system_certificates.o: $(obj)/x509_certificate_list quiet_cmd_x509certs = CERTS $@ @@ -152,9 +145,12 @@ targets += $(obj)/x509_certificate_list $(obj)/x509_certificate_list: $(X509_CERTIFICATES) $(obj)/.x509.list $(call if_changed,x509certs) +define filechk_x509_list + echo $(X509_CERTIFICATES) +endef targets += $(obj)/.x509.list -$(obj)/.x509.list: - @echo $(X509_CERTIFICATES) >$@ +$(obj)/.x509.list: Makefile FORCE + $(call filechk,x509_list) endif clean-files := x509_certificate_list .x509.list -- 2.1.4