diff options
| author | Adrian Bunk <bunk@stusta.de> | 2019-10-31 20:33:06 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-04 13:39:05 +0000 |
| commit | f03d4a72f08c7d0247ea4f122ffce4e924dc59aa (patch) | |
| tree | ed26be26f35fb60d05f9af93cc4669144750b594 | |
| parent | e40596c4d4c51d92b1f42408c60296001c12b7f3 (diff) | |
| download | poky-f03d4a72f08c7d0247ea4f122ffce4e924dc59aa.tar.gz | |
gnu-efi: Upgrade 3.0.10 -> 3.0.11
Patch applied upstream removed.
(From OE-Core rev: 3bb5b837a0dd8d995c5e643831bd530caf11bea3)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi/0001-Revert-efilink-fix-build-with-gcc-4.8.patch | 38 | ||||
| -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 @@ | |||
| 1 | From 1f7b2e5bd6603b30202a66b6317a41e2be85742b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Esben Haabendal <esben@haabendal.dk> | ||
| 3 | Date: Tue, 26 Mar 2019 13:37:02 +0100 | ||
| 4 | Subject: Revert "efilink: fix build with gcc 4.8" | ||
| 5 | |||
| 6 | This reverts commit 6335e5c697c57d8b5854b8202de3733bcb151ca6, as it breaks | ||
| 7 | gcc builds with '-nostdinc' flag. | ||
| 8 | |||
| 9 | The fix in 1a53d8f88a452847b25f9689f9a08dbcf82c86e4 | ||
| 10 | (Fix for problem with undeclared intptr_t type), which is also merged | ||
| 11 | fixes the same problem, without causing breakage. | ||
| 12 | |||
| 13 | Upstream-Status: Submitted [https://sourceforge.net/p/gnu-efi/code/merge-requests/6/] | ||
| 14 | |||
| 15 | Signed-off-by: Esben Haabendal <esben@haabendal.dk> | ||
| 16 | Signed-off-by: Adrian Bunk <bunk@stusta.de> | ||
| 17 | --- | ||
| 18 | inc/efilink.h | 4 ---- | ||
| 19 | 1 file changed, 4 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/inc/efilink.h b/inc/efilink.h | ||
| 22 | index 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 | -- | ||
| 37 | 2.20.1 | ||
| 38 | |||
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 \ | |||
| 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 \ | ||
| 20 | " | 19 | " |
| 21 | 20 | ||
| 22 | SRC_URI[md5sum] = "960a8379b6f95ee73d7778b70bf2a089" | 21 | SRC_URI[md5sum] = "21148bbcccec385a9bfdf5f678959577" |
| 23 | SRC_URI[sha256sum] = "f12082a3a5f0c3e38c67262a9f34245d139ac2cdfc0a0bdcf03c9b1f56fa4fed" | 22 | SRC_URI[sha256sum] = "f28da792a2532e91e18e0101468811739a22cde9eee5eacfd0efb9bf3a61d6b9" |
| 24 | 23 | ||
| 25 | COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" | 24 | COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" |
| 26 | COMPATIBLE_HOST_armv4 = 'null' | 25 | COMPATIBLE_HOST_armv4 = 'null' |
