summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-10-31 20:33:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-04 13:31:27 +0000
commit3bb5b837a0dd8d995c5e643831bd530caf11bea3 (patch)
tree8aab6d83998e429785dc5e04f089edfc900d221e
parent3fd06011497770b684642fc8429d72db783748eb (diff)
downloadopenembedded-core-contrib-3bb5b837a0dd8d995c5e643831bd530caf11bea3.tar.gz
gnu-efi: Upgrade 3.0.10 -> 3.0.11
Patch applied upstream removed. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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_3.0.11.bb (renamed from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.10.bb)5
2 files changed, 2 insertions, 41 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
deleted file mode 100644
index 8ab25113a4..0000000000
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Revert-efilink-fix-build-with-gcc-4.8.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1f7b2e5bd6603b30202a66b6317a41e2be85742b Mon Sep 17 00:00:00 2001
-From: Esben Haabendal <esben@haabendal.dk>
-Date: Tue, 26 Mar 2019 13:37:02 +0100
-Subject: Revert "efilink: fix build with gcc 4.8"
-
-This reverts commit 6335e5c697c57d8b5854b8202de3733bcb151ca6, as it breaks
-gcc builds with '-nostdinc' flag.
-
-The fix in 1a53d8f88a452847b25f9689f9a08dbcf82c86e4
-(Fix for problem with undeclared intptr_t type), which is also merged
-fixes the same problem, without causing breakage.
-
-Upstream-Status: Submitted [https://sourceforge.net/p/gnu-efi/code/merge-requests/6/]
-
-Signed-off-by: Esben Haabendal <esben@haabendal.dk>
-Signed-off-by: Adrian Bunk <bunk@stusta.de>
----
- inc/efilink.h | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/inc/efilink.h b/inc/efilink.h
-index b69a6fd..cc5aa2d 100644
---- a/inc/efilink.h
-+++ b/inc/efilink.h
-@@ -1,10 +1,6 @@
- #ifndef _EFI_LINK_H
- #define _EFI_LINK_H
-
--#if defined(__GNUC__)
--#include <stdint.h>
--#endif
--
- /*++
-
- Copyright (c) 1998 Intel Corporation
---
-2.20.1
-
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.10.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.11.bb
index ac6257fab9..9954d7f57a 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.10.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.11.bb
@@ -16,11 +16,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
file://parallel-make-archives.patch \
file://lib-Makefile-fix-parallel-issue.patch \
file://gnu-efi-3.0.9-fix-clang-build.patch \
- file://0001-Revert-efilink-fix-build-with-gcc-4.8.patch \
"
-SRC_URI[md5sum] = "960a8379b6f95ee73d7778b70bf2a089"
-SRC_URI[sha256sum] = "f12082a3a5f0c3e38c67262a9f34245d139ac2cdfc0a0bdcf03c9b1f56fa4fed"
+SRC_URI[md5sum] = "21148bbcccec385a9bfdf5f678959577"
+SRC_URI[sha256sum] = "f28da792a2532e91e18e0101468811739a22cde9eee5eacfd0efb9bf3a61d6b9"
COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
COMPATIBLE_HOST_armv4 = 'null'