diff options
| author | Chris Co <chrco@microsoft.com> | 2021-03-28 00:11:23 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2021-03-28 13:19:53 -0400 |
| commit | 977c6949428b922470715583ca76127a44f6e8bc (patch) | |
| tree | 882f34e0f507091e4b70614e66ca958b1ddf9387 | |
| parent | 27da4170f0fb30acde91a37e0256dfcfe76ea69e (diff) | |
| download | efi-boot-shim-977c6949428b922470715583ca76127a44f6e8bc.tar.gz efi-boot-shim-977c6949428b922470715583ca76127a44f6e8bc.zip | |
Makefile: sort vendor sbats to remove duplicates
If no TOPDIR is defined and a vendor sbat CSV is placed in
$(BUILDDIR)/data/sbat.*.csv, objcopy fails with the following
error.
objcopy --add-section .sbat=/shim/data/sbat.csv \
--set-section-flags .sbat=contents,alloc,load,readonly,data \
sbat_data.o
objcopy --add-section ".sbat.microsoft=sbat.microsoft.csv" sbat_data.o
objcopy --add-section ".sbat.microsoft=sbat.microsoft.csv" sbat_data.o
objcopy:stuf2iKG: can't add section '.sbat.microsoft': bad value
make: *** [Makefile:120: sbat_data.o] Error 1
The sbat.vendor.csv is getting included twice in VENDOR_SBATS.
Use sort to ensure unique entries in VENDOR_SBATS
Signed-off-by: Chris Co <chrco@microsoft.com>
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -111,7 +111,7 @@ sbat.%.csv : data/sbat.%.csv $(DOS2UNIX) $(D2UFLAGS) $< $@ tail -c1 $@ | read -r _ || echo >> $@ # ensure a trailing newline -VENDOR_SBATS := $(foreach x,$(wildcard $(TOPDIR)/data/sbat.*.csv data/sbat.*.csv),$(notdir $(x))) +VENDOR_SBATS := $(sort $(foreach x,$(wildcard $(TOPDIR)/data/sbat.*.csv data/sbat.*.csv),$(notdir $(x)))) sbat_data.o : | $(SBATPATH) $(VENDOR_SBATS) sbat_data.o : /dev/null |