summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-06-28 15:39:49 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-29 11:07:44 +0100
commitf15587a6f47daeddcb277bcbad6c3f45cb2728dd (patch)
tree77c4f122261b2f27b5c2a1631a6c03cb794c07d9 /meta/recipes-bsp
parent01d7d97d2ab541eaffb3636e83c188db5ceed062 (diff)
downloadpoky-f15587a6f47daeddcb277bcbad6c3f45cb2728dd.tar.gz
gnu-efi: update to 3.0.8
(From OE-Core rev: 91dad340e32271d5db681bae34ed5599310e8703) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch14
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch16
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi_3.0.8.bb (renamed from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.6.bb)4
3 files changed, 18 insertions, 16 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch
index 1b2ae1ef06..dc00b8fa4d 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch
@@ -1,7 +1,7 @@
1From 0daa354a16aa3cade56ed423d0f8a04cf1c22f9d Mon Sep 17 00:00:00 2001 1From 3ec8c2a70304eabd5760937a4ec3fbc4068a77ed Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 23 Apr 2015 01:49:31 -0700 3Date: Thu, 23 Apr 2015 01:49:31 -0700
4Subject: [PATCH] lib/Makefile: fix parallel issue 4Subject: [PATCH 2/3] lib/Makefile: fix parallel issue
5 5
6Fixed: 6Fixed:
7Assembler messages: 7Assembler messages:
@@ -17,22 +17,22 @@ Upstream-Status: Pending
17 17
18Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 18Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
19--- 19---
20 lib/Makefile | 2 ++ 20 lib/Makefile | 2 ++
21 1 file changed, 2 insertions(+) 21 1 file changed, 2 insertions(+)
22 22
23diff --git a/lib/Makefile b/lib/Makefile 23diff --git a/lib/Makefile b/lib/Makefile
24index dc4b94a..f64d1ed 100644 24index 048751a..ed39bbb 100644
25--- a/lib/Makefile 25--- a/lib/Makefile
26+++ b/lib/Makefile 26+++ b/lib/Makefile
27@@ -73,6 +73,8 @@ all: libsubdirs libefi.a 27@@ -74,6 +74,8 @@ all: libsubdirs libefi.a
28 libsubdirs: 28 libsubdirs:
29 for sdir in $(SUBDIRS); do mkdir -p $$sdir; done 29 for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
30 30
31+$(OBJS): libsubdirs 31+$(OBJS): libsubdirs
32+ 32+
33 libefi.a: $(OBJS) 33 libefi.a: $(OBJS)
34 $(AR) rv $@ $(OBJS) 34 $(AR) $(ARFLAGS) $@ $(OBJS)
35 35
36-- 36--
371.7.9.5 372.7.4
38 38
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
index 0110260bd8..a9806cfdf6 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
@@ -1,4 +1,4 @@
1From 16865de66db33ca70872199e70d93efccecc8575 Mon Sep 17 00:00:00 2001 1From 48b2cdbcd761105e8ebad412fcbf23db1ac4ef7c Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com> 2From: Saul Wold <sgw@linux.intel.com>
3Date: Sun, 9 Mar 2014 15:22:15 +0200 3Date: Sun, 9 Mar 2014 15:22:15 +0200
4Subject: [PATCH 1/3] Fix parallel make failure for archives 4Subject: [PATCH 1/3] Fix parallel make failure for archives
@@ -17,13 +17,15 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com>
17Signed-off-by: Darren Hart <dvhart@linux.intel.com> 17Signed-off-by: Darren Hart <dvhart@linux.intel.com>
18[Rebased for 3.0.6] 18[Rebased for 3.0.6]
19Signed-off-by: California Sullivan <california.l.sullivan@intel.com> 19Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
20[Rebased for 3.0.8]
21Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
20--- 22---
21 gnuefi/Makefile | 3 ++- 23 gnuefi/Makefile | 3 ++-
22 lib/Makefile | 2 +- 24 lib/Makefile | 2 +-
23 2 files changed, 3 insertions(+), 2 deletions(-) 25 2 files changed, 3 insertions(+), 2 deletions(-)
24 26
25diff --git a/gnuefi/Makefile b/gnuefi/Makefile 27diff --git a/gnuefi/Makefile b/gnuefi/Makefile
26index 2a61699..148106e 100644 28index 2a61699..89b560a 100644
27--- a/gnuefi/Makefile 29--- a/gnuefi/Makefile
28+++ b/gnuefi/Makefile 30+++ b/gnuefi/Makefile
29@@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a 31@@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a
@@ -32,23 +34,23 @@ index 2a61699..148106e 100644
32 34
33-libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS)) 35-libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
34+libgnuefi.a: $(OBJS) 36+libgnuefi.a: $(OBJS)
35+ $(AR) rv $@ $(OBJS) 37+ $(AR) $(ARFLAGS) $@ $(OBJS)
36 38
37 clean: 39 clean:
38 rm -f $(TARGETS) *~ *.o $(OBJS) 40 rm -f $(TARGETS) *~ *.o $(OBJS)
39diff --git a/lib/Makefile b/lib/Makefile 41diff --git a/lib/Makefile b/lib/Makefile
40index b8d1ce7..6ef8107 100644 42index 0e6410d..048751a 100644
41--- a/lib/Makefile 43--- a/lib/Makefile
42+++ b/lib/Makefile 44+++ b/lib/Makefile
43@@ -75,7 +75,7 @@ libsubdirs: 45@@ -75,7 +75,7 @@ libsubdirs:
44 for sdir in $(SUBDIRS); do mkdir -p $$sdir; done 46 for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
45 47
46 libefi.a: $(OBJS) 48 libefi.a: $(OBJS)
47- $(AR) rv -U $@ $^ 49- $(AR) $(ARFLAGS) $@ $^
48+ $(AR) rv $@ $(OBJS) 50+ $(AR) $(ARFLAGS) $@ $(OBJS)
49 51
50 clean: 52 clean:
51 rm -f libefi.a *~ $(OBJS) */*.o 53 rm -f libefi.a *~ $(OBJS) */*.o
52-- 54--
532.9.4 552.7.4
54 56
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.6.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.8.bb
index 2a60717480..dba4733442 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.6.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.8.bb
@@ -18,8 +18,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
18 file://gcc46-compatibility.patch \ 18 file://gcc46-compatibility.patch \
19 " 19 "
20 20
21SRC_URI[md5sum] = "46f633758a8a37db9fd6909fe270c26b" 21SRC_URI[md5sum] = "ae32011cfe6b1c40c0f244b9a49ba181"
22SRC_URI[sha256sum] = "21515902d80fbea23328a61d70d3d51a47204abd1507ebfa27550a7b9bf22c91" 22SRC_URI[sha256sum] = "76006d8ea8d67bcf72f35d09d43e9ef6a69400d6d5d4bf64baf1ab7434e2b722"
23 23
24COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" 24COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
25COMPATIBLE_HOST_armv4 = 'null' 25COMPATIBLE_HOST_armv4 = 'null'