Commit 8da1d9ba authored Jul 17, 2015 by David Ng

X.509: Remove obj path in certificate file for MOD_SIG



Remove $(objpath) path reference for signing_key.x509
file such that it remains the same whether the file
exists or not.

CONFIG_MOD_SIG includes the signing_key.x509 file
that gets embedded into the image, with .x509.list
tracking the list of certificates.  If signing_key.x509
does not exist, .x509.list will contain a path
reference ("./signing_key.x509") but on subsequent
compiles the path reference is stripped.  This leads to
relinking of vmlinux.

Change-Id: I3e3fefe29afbb3da7542fc16ce662177e41c3562
Signed-off-by: David Ng <dave@codeaurora.org>

parent da9777c8

kernel/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ $(obj)/config_data.h: $(obj)/config_data.gz FORCE
		###############################################################################
		ifeq ($(CONFIG_SYSTEM_TRUSTED_KEYRING),y)
		X509_CERTIFICATES-y := $(wildcard .x509) $(wildcard $(srctree)/.x509)
		X509_CERTIFICATES-$(CONFIG_MODULE_SIG) += $(objtree)/signing_key.x509
		X509_CERTIFICATES-$(CONFIG_MODULE_SIG) += signing_key.x509
		X509_CERTIFICATES-raw := $(sort $(foreach CERT,$(X509_CERTIFICATES-y), \
		$(or $(realpath $(CERT)),$(CERT))))
		X509_CERTIFICATES := $(subst $(realpath $(objtree))/,,$(X509_CERTIFICATES-raw))