Messages in this thread Patch in this message | | | From | Michal Marek <> | Subject | [PATCH 2/3] MODSIGN: Use filechk to generate .x509.list | Date | Wed, 20 May 2015 09:08:39 +0800 |
| |
From: Linus Torvalds <torvalds@linux-foundation.org>
Use the filechk Kbuild function instead of manually comparing the content of the generated file.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> --- 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
| |