summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-04-23 20:35:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-27 14:59:49 +0100
commit2a14041f3c3296d22dae44f980318e836a9bf502 (patch)
tree8a0678d9a04a4a33edd0b837b4634a579da2333e
parent3d2e60f0c98fca3d3f365509fdb0bc0fdd107fd4 (diff)
downloadpoky-2a14041f3c3296d22dae44f980318e836a9bf502.tar.gz
gummiboot: upgrade 43 -> 48+git
43 does not compile with gcc-5 Refresh objcopy patch to incorporate latest changes Change-Id: Ied41ed1335bb1db3438b98121e05c22242a8a13e (From OE-Core rev: be5708b077dea2557df1226f7570c4757b68b46d) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch28
-rw-r--r--meta/recipes-bsp/gummiboot/gummiboot_git.bb4
2 files changed, 19 insertions, 13 deletions
diff --git a/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch b/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch
index 2683f835e9..49f55930df 100644
--- a/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch
+++ b/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch
@@ -12,10 +12,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12 Makefile.am | 4 +++- 12 Makefile.am | 4 +++-
13 1 file changed, 3 insertions(+), 1 deletion(-) 13 1 file changed, 3 insertions(+), 1 deletion(-)
14 14
15diff --git a/Makefile.am b/Makefile.am 15Index: git/Makefile.am
16index d224418..dcd95b0 100644 16===================================================================
17--- a/Makefile.am 17--- git.orig/Makefile.am
18+++ b/Makefile.am 18+++ git/Makefile.am
19@@ -19,6 +19,8 @@ 19@@ -19,6 +19,8 @@
20 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} 20 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
21 AM_MAKEFLAGS = --no-print-directory 21 AM_MAKEFLAGS = --no-print-directory
@@ -25,15 +25,21 @@ index d224418..dcd95b0 100644
25 gummibootlibdir = $(prefix)/lib/gummiboot 25 gummibootlibdir = $(prefix)/lib/gummiboot
26 26
27 AM_CPPFLAGS = -include config.h 27 AM_CPPFLAGS = -include config.h
28@@ -143,7 +145,7 @@ $(efi_solib): $(efi_objects) 28@@ -148,7 +150,7 @@ $(gummiboot_solib): $(gummiboot_objects)
29 .DELETE_ON_ERROR: $(efi_solib) 29 .DELETE_ON_ERROR: $(gummboot_solib)
30 30
31 $(efi_loadername): $(efi_solib) 31 $(gummiboot): $(gummiboot_solib)
32- $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \ 32- $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \
33+ $(AM_V_GEN) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \ 33+ $(AM_V_GEN) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
34 -j .dynsym -j .rel -j .rela -j .reloc -j .eh_frame \ 34 -j .dynsym -j .rel -j .rela -j .reloc \
35 --target=efi-app-$(ARCH) $< $@
36
37@@ -183,7 +185,7 @@ $(stub_solib): $(stub_objects)
38 .DELETE_ON_ERROR: $(gummboot_solib)
39
40 $(stub): $(stub_solib)
41- $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \
42+ $(AM_V_GEN) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
43 -j .dynsym -j .rel -j .rela -j .reloc \
35 --target=efi-app-$(ARCH) $< $@ 44 --target=efi-app-$(ARCH) $< $@
36 45
37--
381.8.3.4
39
diff --git a/meta/recipes-bsp/gummiboot/gummiboot_git.bb b/meta/recipes-bsp/gummiboot/gummiboot_git.bb
index 7fc908e4fe..91c3db9306 100644
--- a/meta/recipes-bsp/gummiboot/gummiboot_git.bb
+++ b/meta/recipes-bsp/gummiboot/gummiboot_git.bb
@@ -9,8 +9,8 @@ DEPENDS = "gnu-efi util-linux"
9inherit autotools pkgconfig 9inherit autotools pkgconfig
10inherit deploy 10inherit deploy
11 11
12PV = "43+git${SRCPV}" 12PV = "48+git${SRCPV}"
13SRCREV = "4062c51075ba054d4949c714fe06123f9ad3097d" 13SRCREV = "2bcd919c681c952eb867ef1bdb458f1bc49c2d55"
14SRC_URI = "git://anongit.freedesktop.org/gummiboot \ 14SRC_URI = "git://anongit.freedesktop.org/gummiboot \
15 file://fix-objcopy.patch \ 15 file://fix-objcopy.patch \
16 " 16 "