diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2017-09-27 13:09:42 -0400 |
|---|---|---|
| committer | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2017-09-27 13:09:42 -0400 |
| commit | ecc29226057b19002d41141e651ae64ff9cdc522 (patch) | |
| tree | 5bbff1198009bf63767d7afa09270f7b34d6f41f | |
| parent | 51d5bbcb24fabe7bfc8a1664778e55f2583daf00 (diff) | |
| download | efi-boot-shim-upstream/13_git1506531982.23ce039.tar.gz efi-boot-shim-upstream/13_git1506531982.23ce039.zip | |
New upstream version 13~git1506531982.23ce039upstream/13_git1506531982.23ce039
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | commit | 2 |
2 files changed, 9 insertions, 6 deletions
@@ -76,6 +76,7 @@ ifeq ($(ARCH),x86_64) LIBDIR ?= $(prefix)/lib64 ARCH_SUFFIX ?= x64 ARCH_SUFFIX_UPPER ?= X64 + ARCH_LDFLAGS ?= endif ifeq ($(ARCH),ia32) CFLAGS += -mno-mmx -mno-sse -mno-red-zone -nostdinc \ @@ -84,6 +85,7 @@ ifeq ($(ARCH),ia32) LIBDIR ?= $(prefix)/lib ARCH_SUFFIX ?= ia32 ARCH_SUFFIX_UPPER ?= IA32 + ARCH_LDFLAGS ?= endif ifeq ($(ARCH),aarch64) CFLAGS += -DMDE_CPU_AARCH64 -DPAGE_SIZE=4096 -mstrict-align @@ -92,7 +94,7 @@ ifeq ($(ARCH),aarch64) ARCH_SUFFIX_UPPER ?= AA64 FORMAT := -O binary SUBSYSTEM := 0xa - LDFLAGS += --defsym=EFI_SUBSYSTEM=$(SUBSYSTEM) + ARCH_LDFLAGS += --defsym=EFI_SUBSYSTEM=$(SUBSYSTEM) endif ifeq ($(ARCH),arm) CFLAGS += -DMDE_CPU_ARM -DPAGE_SIZE=4096 -mstrict-align @@ -101,7 +103,7 @@ ifeq ($(ARCH),arm) ARCH_SUFFIX_UPPER ?= ARM FORMAT := -O binary SUBSYSTEM := 0xa - LDFLAGS += --defsym=EFI_SUBSYSTEM=$(SUBSYSTEM) + ARCH_LDFLAGS += --defsym=EFI_SUBSYSTEM=$(SUBSYSTEM) endif FORMAT ?= --target efi-app-$(ARCH) @@ -129,7 +131,7 @@ ifneq ($(origin VENDOR_DBX_FILE), undefined) CFLAGS += -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 +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) TARGETS = $(SHIMNAME) TARGETS += $(SHIMNAME).debug $(MMNAME).debug $(FBNAME).debug @@ -227,7 +229,7 @@ buildid : $(TOPDIR)/buildid.c $(BOOTCSVNAME) : @echo Making $@ - @( printf "\xff\xfe" ; echo "$(SHIMNAME),$(OSLABEL),,This is the boot entry for $(OSLABEL)" | sed -z 's/./&\x00/g' ) > $@ + @echo "$(SHIMNAME),$(OSLABEL),,This is the boot entry for $(OSLABEL)" | iconv -t UCS-2LE > $@ install-check : ifeq ($(origin LIBDIR),undefined) @@ -329,12 +331,13 @@ else $(PESIGN) -n certdb -i $< -c "shim" -s -o $@ -f endif +clean: OBJS=$(wildcard *.o) clean: $(MAKE) -C Cryptlib -f $(TOPDIR)/Cryptlib/Makefile clean $(MAKE) -C Cryptlib/OpenSSL -f $(TOPDIR)/Cryptlib/OpenSSL/Makefile clean $(MAKE) -C lib -f $(TOPDIR)/lib/Makefile clean rm -rf $(TARGET) $(OBJS) $(MOK_OBJS) $(FALLBACK_OBJS) $(KEYS) certdb $(BOOTCSVNAME) - rm -f *.debug *.so *.efi *.tar.* version.c + rm -f *.debug *.so *.efi *.efi.* *.tar.* version.c GITTAG = $(VERSION) @@ -1 +1 @@ -35fd2c170cadfd50670d55fbcbf9cb2f4d4f1868
\ No newline at end of file +23ce039c434d164a3848c829b237899cc17c1d21
\ No newline at end of file |