diff options
| author | Steve McIntyre <steve@einval.com> | 2021-03-15 21:06:00 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2021-03-15 19:50:53 -0400 |
| commit | 2d1d11567f9706a703d22d0d17996cb81c5ae4de (patch) | |
| tree | a430f8157d5e5e3cad5f7a542b79073ca96d03f0 | |
| parent | f3cdd0f8df36d759b8fa620457d73d17d6b07042 (diff) | |
| download | efi-boot-shim-2d1d11567f9706a703d22d0d17996cb81c5ae4de.tar.gz efi-boot-shim-2d1d11567f9706a703d22d0d17996cb81c5ae4de.zip | |
Stop using EFI_PATH, and error out if people try to use it
We need to be using our patched version of gnu-efi
Signed-off-by: Steve McIntyre <93sam@debian.org>
| -rw-r--r-- | Make.defaults | 8 | ||||
| -rw-r--r-- | Makefile | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Make.defaults b/Make.defaults index 47d8ffe3..2c867659 100644 --- a/Make.defaults +++ b/Make.defaults @@ -43,7 +43,7 @@ SUBDIRS = $(TOPDIR)/Cryptlib $(TOPDIR)/lib EFI_INCLUDE ?= $(TOPDIR)/gnu-efi/inc EFI_INCLUDES = -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol override EFI_INCLUDES := $(EFI_INCLUDES) -EFI_CRT_OBJS = $(EFI_PATH)/crt0-efi-$(ARCH_GNUEFI).o +EFI_CRT_OBJS = $(LOCAL_EFI_PATH)/crt0-efi-$(ARCH_GNUEFI).o EFI_LDS = $(TOPDIR)/elf_$(ARCH)_efi.lds CLANG_BUGS = $(if $(findstring gcc,$(CC)),-maccumulate-outgoing-args,) @@ -149,8 +149,8 @@ endif LIB_GCC = $(shell $(CC) $(ARCH_CFLAGS) -print-libgcc-file-name) EFI_LIBS = -lefi -lgnuefi --start-group Cryptlib/libcryptlib.a Cryptlib/OpenSSL/libopenssl.a --end-group $(LIB_GCC) FORMAT ?= --target efi-app-$(ARCH) -EFI_PATH ?= gnu-efi/$(ARCH_GNUEFI)/gnuefi -LIBDIR ?= gnu-efi/$(ARCH_GNUEFI)/lib +LOCAL_EFI_PATH = gnu-efi/$(ARCH_GNUEFI)/gnuefi +LIBDIR = gnu-efi/$(ARCH_GNUEFI)/lib MMSTEM ?= mm$(ARCH_SUFFIX) MMNAME = $(MMSTEM).efi @@ -178,7 +178,7 @@ ifneq ($(origin VENDOR_DBX_FILE), undefined) DEFINES += -DVENDOR_DBX_FILE=\"$(VENDOR_DBX_FILE)\" endif -LDFLAGS = --hash-style=sysv -nostdlib -znocombreloc -T $(EFI_LDS) -shared -Bsymbolic -L$(EFI_PATH) -L$(LIBDIR) -LCryptlib -LCryptlib/OpenSSL $(EFI_CRT_OBJS) --build-id=sha1 $(ARCH_LDFLAGS) --no-undefined +LDFLAGS = --hash-style=sysv -nostdlib -znocombreloc -T $(EFI_LDS) -shared -Bsymbolic -L$(LOCAL_EFI_PATH) -L$(LIBDIR) -LCryptlib -LCryptlib/OpenSSL $(EFI_CRT_OBJS) --build-id=sha1 $(ARCH_LDFLAGS) --no-undefined ifneq ($(DEBUG),) export DEBUG @@ -65,7 +65,12 @@ ifneq ($(origin FALLBACK_VERBOSE_WAIT), undefined) CFLAGS += -DFALLBACK_VERBOSE_WAIT=$(FALLBACK_VERBOSE_WAIT) endif -all: $(TARGETS) +all: confcheck $(TARGETS) + +confcheck: +ifneq ($(origin EFI_PATH),undefined) + $(error EFI_PATH is no longer supported, you must build using the supplied copy of gnu-efi) +endif update : git submodule update --init --recursive |