summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2017-07-11 17:47:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 14:01:38 +0100
commit157e7a244a70c1812c99bb4a82d78067b4819e6b (patch)
tree013c21437215923dfe4e4271cfe742b504e636ba
parent0df60c7de2e4a3ccbab28e338ee54a12c3008089 (diff)
downloadpoky-157e7a244a70c1812c99bb4a82d78067b4819e6b.tar.gz
gnu-efi: Upgrade package to 3.0.6 and refresh patches
Version 3.0.6 fixes a failure when using the pxe headers and allows us to drop the explicit fall through patch as it was fixed upstream. Other patches were rebased on top of the new version. (From OE-Core rev: 20c1209f6fe0d56aa3698583a1b6d2774fbf4401) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> 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-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch34
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch24
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch54
-rw-r--r--meta/recipes-bsp/gnu-efi/gnu-efi_3.0.6.bb (renamed from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb)5
4 files changed, 51 insertions, 66 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch
deleted file mode 100644
index d0aeb2d560..0000000000
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 676a8a9001f06808b4dbe0a545d76b5d9a8ebf48 Mon Sep 17 00:00:00 2001
2From: Peter Jones <pjones@redhat.com>
3Date: Thu, 2 Feb 2017 13:51:27 -0500
4Subject: [PATCH] Mark our explicit fall through so -Wextra will work in gcc 7
5
6gcc 7 introduces detection of fall-through behavior in switch/case
7statements, and will warn if -Wimplicit-fallthrough is present and there
8is no comment stating that the fall-through is intentional. This is
9also triggered by -Wextra, as it enables -Wimplicit-fallthrough=1.
10
11This patch adds the comment in the one place we use fall-through.
12
13Signed-off-by: Peter Jones <pjones@redhat.com>
14---
15Upstream-Status: Pending
16
17 lib/print.c | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/lib/print.c b/lib/print.c
21index b8a9d38..cb732f0 100644
22--- a/lib/print.c
23+++ b/lib/print.c
24@@ -1131,6 +1131,7 @@ Returns:
25 case 'X':
26 Item.Width = Item.Long ? 16 : 8;
27 Item.Pad = '0';
28+ /* falls through */
29 case 'x':
30 ValueToHex (
31 Item.Scratch,
32--
332.12.2
34
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch
index 0ce6d7b0cb..69efd34e24 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch
@@ -1,3 +1,8 @@
1From 8d16ae374c5d4d9fac45c002605a66cfb8c08be5 Mon Sep 17 00:00:00 2001
2From: Steve Langasek <steve.langasek@ubuntu.com>
3Date: Wed, 9 Sep 2015 08:26:06 +0000
4Subject: [PATCH 3/3] gnu-efi, syslinux: Support gcc < 4.7
5
1don't break with old compilers and -DGNU_EFI_USE_MS_ABI 6don't break with old compilers and -DGNU_EFI_USE_MS_ABI
2It's entirely legitimate to request GNU_EFI_USE_MS_ABI even if the current 7It's entirely legitimate to request GNU_EFI_USE_MS_ABI even if the current
3compiler doesn't support it, and gnu-efi should transparently fall back to 8compiler doesn't support it, and gnu-efi should transparently fall back to
@@ -6,16 +11,25 @@ checking, but at least it will still compile.
6 11
7Author: Steve Langasek <steve.langasek@ubuntu.com> 12Author: Steve Langasek <steve.langasek@ubuntu.com>
8Upstream-Status: Pending 13Upstream-Status: Pending
9Index: gnu-efi-3.0.3/inc/x86_64/efibind.h 14[Rebased for 3.0.6]
10=================================================================== 15Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
11--- gnu-efi-3.0.3.orig/inc/x86_64/efibind.h 16---
12+++ gnu-efi-3.0.3/inc/x86_64/efibind.h 17 inc/x86_64/efibind.h | 2 --
18 1 file changed, 2 deletions(-)
19
20diff --git a/inc/x86_64/efibind.h b/inc/x86_64/efibind.h
21index 4309f9f..02c0af1 100644
22--- a/inc/x86_64/efibind.h
23+++ b/inc/x86_64/efibind.h
13@@ -25,8 +25,6 @@ Revision History 24@@ -25,8 +25,6 @@ Revision History
14 #if defined(GNU_EFI_USE_MS_ABI) 25 #if defined(GNU_EFI_USE_MS_ABI)
15 #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) 26 #if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)))||(defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2)))
16 #define HAVE_USE_MS_ABI 1 27 #define HAVE_USE_MS_ABI 1
17- #else 28- #else
18- #error Compiler is too old for GNU_EFI_USE_MS_ABI 29- #error Compiler is too old for GNU_EFI_USE_MS_ABI
19 #endif 30 #endif
20 #endif 31 #endif
21 32
33--
342.9.4
35
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 e5b47c197a..0110260bd8 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,7 @@
1Fix parallel make failure for archives 1From 16865de66db33ca70872199e70d93efccecc8575 Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com>
3Date: Sun, 9 Mar 2014 15:22:15 +0200
4Subject: [PATCH 1/3] Fix parallel make failure for archives
2 5
3Upstream-Status: Pending 6Upstream-Status: Pending
4 7
@@ -12,31 +15,18 @@ for details.
12 15
13Signed-off-by: Saul Wold <sgw@linux.intel.com> 16Signed-off-by: Saul Wold <sgw@linux.intel.com>
14Signed-off-by: Darren Hart <dvhart@linux.intel.com> 17Signed-off-by: Darren Hart <dvhart@linux.intel.com>
18[Rebased for 3.0.6]
19Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
15--- 20---
16--- 21 gnuefi/Makefile | 3 ++-
17 gnuefi/Makefile | 3 ++- 22 lib/Makefile | 2 +-
18 lib/Makefile | 3 ++- 23 2 files changed, 3 insertions(+), 2 deletions(-)
19 2 files changed, 4 insertions(+), 2 deletions(-)
20 24
21Index: gnu-efi-3.0/lib/Makefile 25diff --git a/gnuefi/Makefile b/gnuefi/Makefile
22=================================================================== 26index 2a61699..148106e 100644
23--- gnu-efi-3.0.orig/lib/Makefile 27--- a/gnuefi/Makefile
24+++ gnu-efi-3.0/lib/Makefile 28+++ b/gnuefi/Makefile
25@@ -66,7 +66,8 @@ all: libsubdirs libefi.a 29@@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a
26 libsubdirs:
27 for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
28
29-libefi.a: $(patsubst %,libefi.a(%),$(OBJS))
30+libefi.a: $(OBJS)
31+ $(AR) rv $@ $(OBJS)
32
33 clean:
34 rm -f libefi.a *~ $(OBJS) */*.o
35Index: gnu-efi-3.0/gnuefi/Makefile
36===================================================================
37--- gnu-efi-3.0.orig/gnuefi/Makefile
38+++ gnu-efi-3.0/gnuefi/Makefile
39@@ -51,7 +51,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a
40 30
41 all: $(TARGETS) 31 all: $(TARGETS)
42 32
@@ -46,3 +36,19 @@ Index: gnu-efi-3.0/gnuefi/Makefile
46 36
47 clean: 37 clean:
48 rm -f $(TARGETS) *~ *.o $(OBJS) 38 rm -f $(TARGETS) *~ *.o $(OBJS)
39diff --git a/lib/Makefile b/lib/Makefile
40index b8d1ce7..6ef8107 100644
41--- a/lib/Makefile
42+++ b/lib/Makefile
43@@ -75,7 +75,7 @@ libsubdirs:
44 for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
45
46 libefi.a: $(OBJS)
47- $(AR) rv -U $@ $^
48+ $(AR) rv $@ $(OBJS)
49
50 clean:
51 rm -f libefi.a *~ $(OBJS) */*.o
52--
532.9.4
54
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.6.bb
index 7346737396..2a60717480 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.6.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://gcc46-compatibility.patch \ 18 file://gcc46-compatibility.patch \
19 file://0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch \
20 " 19 "
21 20
22SRC_URI[md5sum] = "1f719c9c135778aa6b087b89a1cc2423" 21SRC_URI[md5sum] = "46f633758a8a37db9fd6909fe270c26b"
23SRC_URI[sha256sum] = "bd8fcd5914f18fc0e4ba948ab03b00013e528504f529c60739b748f6ef130b22" 22SRC_URI[sha256sum] = "21515902d80fbea23328a61d70d3d51a47204abd1507ebfa27550a7b9bf22c91"
24 23
25COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" 24COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
26COMPATIBLE_HOST_armv4 = 'null' 25COMPATIBLE_HOST_armv4 = 'null'