Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fbd39cf authored by David Howells's avatar David Howells
Browse files

KEYS: Have make canonicalise the paths of the X.509 certs better to deduplicate 



Have make canonicalise the paths of the X.509 certificates before we sort them
as this allows $(sort) to better remove duplicates.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent f0e6d220

kernel/Makefile

+9 −3
Original line number Diff line number Diff line
@@ -144,13 +144,19 @@ $(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc FORCE 
ifeq ($(CONFIG_MODULE_SIG),y)

###############################################################################

#

# Roll all the X.509 certificates that we can find together and pull

# them into the kernel.

# Roll all the X.509 certificates that we can find together and pull them into

# the kernel.

#

# We look in the source root and the build root for all files whose name ends

# in ".x509".  Unfortunately, this will generate duplicate filenames, so we

# have make canonicalise the pathnames and then sort them to discard the

# duplicates.

#

###############################################################################

X509_CERTIFICATES-y := $(wildcard *.x509) $(wildcard $(srctree)/*.x509)

X509_CERTIFICATES-$(CONFIG_MODULE_SIG) += signing_key.x509

X509_CERTIFICATES := $(sort $(X509_CERTIFICATES-y))

X509_CERTIFICATES := $(sort $(foreach CERT,$(X509_CERTIFICATES-y), \

				$(or $(realpath $(CERT)),$(CERT))))



ifeq ($(X509_CERTIFICATES),)

$(warning *** No X.509 certificates found ***)