fc4b3ef345
- Update to 0.9 - Refresh patches + shim-fix-gnu-efi-30w.patch + shim-fix-mokmanager-sections.patch + shim-opensuse-cert-prompt.patch - Drop upstreamed patches + shim-bsc920515-fix-fallback-buffer-length.patch + shim-mokx-support.patch + shim-update-cryptlib.patch - Drop shim-bsc919675-uninstall-shim-protocols.patch since upstream fixed the bug in another way. - Drop shim-gcc5.patch which was fixed in another way OBS-URL: https://build.opensuse.org/request/show/315550 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=99
54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
From fa7e46558ebdafeb7b5f4a3b843f309a678d4365 Mon Sep 17 00:00:00 2001
|
|
From: Gary Ching-Pang Lin <glin@suse.com>
|
|
Date: Mon, 10 Nov 2014 17:19:58 +0800
|
|
Subject: [PATCH] Fix objcopy parameters to include .rel and .rela
|
|
|
|
This is a quick hack for the old objcopy.
|
|
|
|
The asterisks support in objcopy was added in 2.24. For the distro
|
|
with the older objcopy, some sections would be ignored and this could
|
|
crash the program.
|
|
|
|
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
|
|
---
|
|
Makefile | 12 ++++--------
|
|
1 file changed, 4 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 412496b..a791bcc 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -9,7 +9,6 @@ LD = $(CROSS_COMPILE)ld
|
|
OBJCOPY = $(CROSS_COMPILE)objcopy
|
|
|
|
ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,)
|
|
-OBJCOPY_GTE224 = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^.* //g' | cut -f1-2 -d.` \>= 2.24)
|
|
|
|
SUBDIRS = Cryptlib lib
|
|
|
|
@@ -142,17 +141,14 @@ endif
|
|
FORMAT ?= --target efi-app-$(ARCH)
|
|
|
|
%.efi: %.so
|
|
-ifneq ($(OBJCOPY_GTE224),1)
|
|
- $(error objcopy >= 2.24 is required)
|
|
-endif
|
|
$(OBJCOPY) -j .text -j .sdata -j .data \
|
|
- -j .dynamic -j .dynsym -j .rel* \
|
|
- -j .rela* -j .reloc -j .eh_frame \
|
|
+ -j .dynamic -j .dynsym -j .rel \
|
|
+ -j .rela -j .reloc -j .eh_frame \
|
|
-j .vendor_cert \
|
|
$(FORMAT) $^ $@
|
|
$(OBJCOPY) -j .text -j .sdata -j .data \
|
|
- -j .dynamic -j .dynsym -j .rel* \
|
|
- -j .rela* -j .reloc -j .eh_frame \
|
|
+ -j .dynamic -j .dynsym -j .rel \
|
|
+ -j .rela -j .reloc -j .eh_frame \
|
|
-j .debug_info -j .debug_abbrev -j .debug_aranges \
|
|
-j .debug_line -j .debug_str -j .debug_ranges \
|
|
-j .note.gnu.build-id \
|
|
--
|
|
2.1.4
|
|
|