summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-10-27 17:00:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-31 16:09:34 +0000
commit5e040b69c3086a372e015330080107d9230d3e6b (patch)
tree7af1f022a00b35c7f85a4c38f2e8fe74fb77b8b2 /meta
parent3a751d5564fc6ee9aef225653cc7b8630fd25a35 (diff)
downloadpoky-5e040b69c3086a372e015330080107d9230d3e6b.tar.gz
gnu-efi: Upgrade 3.0.9 -> 3.0.10
Part of patch fixed upstream removed. (From OE-Core rev: 82169fd7684389f9cdedd6f91a00698641741a8c) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi/0001-Revert-efilink-fix-build-with-gcc-4.8.patch38
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch18
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi_3.0.10.bb (renamed from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.9.bb)5
3 files changed, 41 insertions, 20 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Revert-efilink-fix-build-with-gcc-4.8.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Revert-efilink-fix-build-with-gcc-4.8.patch
new file mode 100644
index 0000000000..8ab25113a4
--- /dev/null
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Revert-efilink-fix-build-with-gcc-4.8.patch
@@ -0,0 +1,38 @@
1From 1f7b2e5bd6603b30202a66b6317a41e2be85742b Mon Sep 17 00:00:00 2001
2From: Esben Haabendal <esben@haabendal.dk>
3Date: Tue, 26 Mar 2019 13:37:02 +0100
4Subject: Revert "efilink: fix build with gcc 4.8"
5
6This reverts commit 6335e5c697c57d8b5854b8202de3733bcb151ca6, as it breaks
7gcc builds with '-nostdinc' flag.
8
9The fix in 1a53d8f88a452847b25f9689f9a08dbcf82c86e4
10(Fix for problem with undeclared intptr_t type), which is also merged
11fixes the same problem, without causing breakage.
12
13Upstream-Status: Submitted [https://sourceforge.net/p/gnu-efi/code/merge-requests/6/]
14
15Signed-off-by: Esben Haabendal <esben@haabendal.dk>
16Signed-off-by: Adrian Bunk <bunk@stusta.de>
17---
18 inc/efilink.h | 4 ----
19 1 file changed, 4 deletions(-)
20
21diff --git a/inc/efilink.h b/inc/efilink.h
22index b69a6fd..cc5aa2d 100644
23--- a/inc/efilink.h
24+++ b/inc/efilink.h
25@@ -1,10 +1,6 @@
26 #ifndef _EFI_LINK_H
27 #define _EFI_LINK_H
28
29-#if defined(__GNUC__)
30-#include <stdint.h>
31-#endif
32-
33 /*++
34
35 Copyright (c) 1998 Intel Corporation
36--
372.20.1
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 a9806cfdf6..8a0138bbe5 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
@@ -19,25 +19,7 @@ Signed-off-by: Darren Hart <dvhart@linux.intel.com>
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] 20[Rebased for 3.0.8]
21Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 21Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
22---
23 gnuefi/Makefile | 3 ++-
24 lib/Makefile | 2 +-
25 2 files changed, 3 insertions(+), 2 deletions(-)
26 22
27diff --git a/gnuefi/Makefile b/gnuefi/Makefile
28index 2a61699..89b560a 100644
29--- a/gnuefi/Makefile
30+++ b/gnuefi/Makefile
31@@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a
32
33 all: $(TARGETS)
34
35-libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
36+libgnuefi.a: $(OBJS)
37+ $(AR) $(ARFLAGS) $@ $(OBJS)
38
39 clean:
40 rm -f $(TARGETS) *~ *.o $(OBJS)
41diff --git a/lib/Makefile b/lib/Makefile 23diff --git a/lib/Makefile b/lib/Makefile
42index 0e6410d..048751a 100644 24index 0e6410d..048751a 100644
43--- a/lib/Makefile 25--- a/lib/Makefile
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.9.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.10.bb
index 6d4c303353..ac6257fab9 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.9.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.10.bb
@@ -16,10 +16,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
16 file://parallel-make-archives.patch \ 16 file://parallel-make-archives.patch \
17 file://lib-Makefile-fix-parallel-issue.patch \ 17 file://lib-Makefile-fix-parallel-issue.patch \
18 file://gnu-efi-3.0.9-fix-clang-build.patch \ 18 file://gnu-efi-3.0.9-fix-clang-build.patch \
19 file://0001-Revert-efilink-fix-build-with-gcc-4.8.patch \
19 " 20 "
20 21
21SRC_URI[md5sum] = "32af17b917545a693e549af2439c4a99" 22SRC_URI[md5sum] = "960a8379b6f95ee73d7778b70bf2a089"
22SRC_URI[sha256sum] = "6715ea7eae1c7e4fc5041034bd3f107ec2911962ed284a081e491646b12277f0" 23SRC_URI[sha256sum] = "f12082a3a5f0c3e38c67262a9f34245d139ac2cdfc0a0bdcf03c9b1f56fa4fed"
23 24
24COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" 25COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
25COMPATIBLE_HOST_armv4 = 'null' 26COMPATIBLE_HOST_armv4 = 'null'