diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2018-06-28 15:39:49 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-29 11:07:44 +0100 |
commit | f15587a6f47daeddcb277bcbad6c3f45cb2728dd (patch) | |
tree | 77c4f122261b2f27b5c2a1631a6c03cb794c07d9 /meta/recipes-bsp/gnu-efi | |
parent | 01d7d97d2ab541eaffb3636e83c188db5ceed062 (diff) | |
download | poky-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/gnu-efi')
-rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch | 14 | ||||
-rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch | 16 | ||||
-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 @@ | |||
1 | From 0daa354a16aa3cade56ed423d0f8a04cf1c22f9d Mon Sep 17 00:00:00 2001 | 1 | From 3ec8c2a70304eabd5760937a4ec3fbc4068a77ed Mon Sep 17 00:00:00 2001 |
2 | From: Robert Yang <liezhi.yang@windriver.com> | 2 | From: Robert Yang <liezhi.yang@windriver.com> |
3 | Date: Thu, 23 Apr 2015 01:49:31 -0700 | 3 | Date: Thu, 23 Apr 2015 01:49:31 -0700 |
4 | Subject: [PATCH] lib/Makefile: fix parallel issue | 4 | Subject: [PATCH 2/3] lib/Makefile: fix parallel issue |
5 | 5 | ||
6 | Fixed: | 6 | Fixed: |
7 | Assembler messages: | 7 | Assembler messages: |
@@ -17,22 +17,22 @@ Upstream-Status: Pending | |||
17 | 17 | ||
18 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 18 | Signed-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 | ||
23 | diff --git a/lib/Makefile b/lib/Makefile | 23 | diff --git a/lib/Makefile b/lib/Makefile |
24 | index dc4b94a..f64d1ed 100644 | 24 | index 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 | -- |
37 | 1.7.9.5 | 37 | 2.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 @@ | |||
1 | From 16865de66db33ca70872199e70d93efccecc8575 Mon Sep 17 00:00:00 2001 | 1 | From 48b2cdbcd761105e8ebad412fcbf23db1ac4ef7c Mon Sep 17 00:00:00 2001 |
2 | From: Saul Wold <sgw@linux.intel.com> | 2 | From: Saul Wold <sgw@linux.intel.com> |
3 | Date: Sun, 9 Mar 2014 15:22:15 +0200 | 3 | Date: Sun, 9 Mar 2014 15:22:15 +0200 |
4 | Subject: [PATCH 1/3] Fix parallel make failure for archives | 4 | Subject: [PATCH 1/3] Fix parallel make failure for archives |
@@ -17,13 +17,15 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com> | |||
17 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> | 17 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
18 | [Rebased for 3.0.6] | 18 | [Rebased for 3.0.6] |
19 | Signed-off-by: California Sullivan <california.l.sullivan@intel.com> | 19 | Signed-off-by: California Sullivan <california.l.sullivan@intel.com> |
20 | [Rebased for 3.0.8] | ||
21 | Signed-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 | ||
25 | diff --git a/gnuefi/Makefile b/gnuefi/Makefile | 27 | diff --git a/gnuefi/Makefile b/gnuefi/Makefile |
26 | index 2a61699..148106e 100644 | 28 | index 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) |
39 | diff --git a/lib/Makefile b/lib/Makefile | 41 | diff --git a/lib/Makefile b/lib/Makefile |
40 | index b8d1ce7..6ef8107 100644 | 42 | index 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 | -- |
53 | 2.9.4 | 55 | 2.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 | ||
21 | SRC_URI[md5sum] = "46f633758a8a37db9fd6909fe270c26b" | 21 | SRC_URI[md5sum] = "ae32011cfe6b1c40c0f244b9a49ba181" |
22 | SRC_URI[sha256sum] = "21515902d80fbea23328a61d70d3d51a47204abd1507ebfa27550a7b9bf22c91" | 22 | SRC_URI[sha256sum] = "76006d8ea8d67bcf72f35d09d43e9ef6a69400d6d5d4bf64baf1ab7434e2b722" |
23 | 23 | ||
24 | COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" | 24 | COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" |
25 | COMPATIBLE_HOST_armv4 = 'null' | 25 | COMPATIBLE_HOST_armv4 = 'null' |