From: Chun-Yi Lee <j...@suse.com> This issue was found in devel-pekey branch on linux-modsign.git tree. The x509_certificate_list includes certificate twice when the signing_key.x509 already exists. We can reproduce this issue by making kernel twice, the build log of second time looks like this:
... CHK kernel/config_data.h CERTS kernel/x509_certificate_list - Including cert /ramdisk/working/joey/linux-modsign/signing_key.x509 - Including cert signing_key.x509 ... Actually the build path was the same with the srctree path when building kernel. It causes the size of bzImage increased by packaging certificates twice. Originally this patch was signed and merged to devel-pekey in David Howells's linux-modsign git: http://lwn.net/Articles/540288/ git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-modsign.git tags/pekey-20130221 But it is missed in mainline kernel. v3: Using realpath to compare current file path with source tree patch. Thanks for Rusty Russell's suggestion. v2: Using '$(shell /bin/pwd)' instead of '$(shell pwd)' for more reliable between different shells Cc: Rusty Russell <ru...@rustcorp.com.au> Cc: Josh Boyer <jwbo...@redhat.com> Cc: Randy Dunlap <rdun...@xenotime.net> Cc: Herbert Xu <herb...@gondor.apana.org.au> Cc: "David S. Miller" <da...@davemloft.net> Cc: Michal Marek <mma...@suse.com> Signed-off-by: Chun-Yi Lee <j...@suse.com> Signed-off-by: David Howells <dhowe...@redhat.com> --- kernel/Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index bc010ee..1d671b1 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -136,7 +136,10 @@ $(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc FORCE # ############################################################################### ifeq ($(CONFIG_SYSTEM_TRUSTED_KEYRING),y) -X509_CERTIFICATES-y := $(wildcard *.x509) $(wildcard $(srctree)/*.x509) +X509_CERTIFICATES-y := $(wildcard *.x509) +ifneq ($(realpath .), $(realpath $(srctree))) +X509_CERTIFICATES-y += $(wildcard $(srctree)/*.x509) +endif X509_CERTIFICATES-$(CONFIG_MODULE_SIG) += $(objtree)/signing_key.x509 X509_CERTIFICATES-raw := $(sort $(foreach CERT,$(X509_CERTIFICATES-y), \ $(or $(realpath $(CERT)),$(CERT)))) -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
