summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-07-29 11:20:26 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-31 13:50:46 +0100
commitcfb190a3c9771b382d994702a6e74bb662bf6a8c (patch)
tree85fc94dbf4ec102b1e86fab99ee1be5ea34ebdf7
parent07ba3a1d7320946c22a3dafefcb2aab6b1906b90 (diff)
downloadpoky-cfb190a3c9771b382d994702a6e74bb662bf6a8c.tar.gz
grub: upgrade 2.02 -> 2.04
* For changes in this version, see: http://git.savannah.gnu.org/cgit/grub.git/tree/NEWS?h=grub-2.04 * Remove backported patches and refresh others. * Remove the musl patch as it's no longer needed. * Use configure option --disable-werror instead of passing through CFLAGS. (From OE-Core rev: 07222d213d1da0ccade1c61ed19a7ecdc4966edd) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch13
-rw-r--r--meta/recipes-bsp/grub/files/0001-Unset-need_charset_alias-when-building-for-musl.patch30
-rw-r--r--meta/recipes-bsp/grub/files/0001-grub-setup-Debug-message-cleanup.patch34
-rw-r--r--meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch16
-rw-r--r--meta/recipes-bsp/grub/files/0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch76
-rw-r--r--meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch15
-rw-r--r--meta/recipes-bsp/grub/files/gcc8.patch74
-rw-r--r--meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch21
-rw-r--r--meta/recipes-bsp/grub/grub-efi_2.04.bb (renamed from meta/recipes-bsp/grub/grub-efi_2.02.bb)0
-rw-r--r--meta/recipes-bsp/grub/grub2.inc13
-rw-r--r--meta/recipes-bsp/grub/grub_2.04.bb (renamed from meta/recipes-bsp/grub/grub_2.02.bb)0
11 files changed, 35 insertions, 257 deletions
diff --git a/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch b/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
index ce3238f3a1..6b73878cc0 100644
--- a/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
+++ b/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
@@ -1,4 +1,4 @@
1From fb7b827a56b1f92f882d0f5ef130acc968b23293 Mon Sep 17 00:00:00 2001 1From 96d9aa55d29b24e2490d5647a9efc66940fc400f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 13 Jan 2016 19:17:31 +0000 3Date: Wed, 13 Jan 2016 19:17:31 +0000
4Subject: [PATCH] Disable -mfpmath=sse as well when SSE is disabled 4Subject: [PATCH] Disable -mfpmath=sse as well when SSE is disabled
@@ -22,17 +22,17 @@ cc1: all warnings being treated as errors
22 22
23Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 23Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
24Signed-off-by: Khem Raj <raj.khem@gmail.com> 24Signed-off-by: Khem Raj <raj.khem@gmail.com>
25---
26Upstream-Status: Pending
27 25
26Upstream-Status: Pending
27---
28 configure.ac | 2 +- 28 configure.ac | 2 +-
29 1 file changed, 1 insertion(+), 1 deletion(-) 29 1 file changed, 1 insertion(+), 1 deletion(-)
30 30
31diff --git a/configure.ac b/configure.ac 31diff --git a/configure.ac b/configure.ac
32index 26d2f33..9ce56de 100644 32index 7656f24..0868ea9 100644
33--- a/configure.ac 33--- a/configure.ac
34+++ b/configure.ac 34+++ b/configure.ac
35@@ -783,7 +783,7 @@ fi 35@@ -824,7 +824,7 @@ fi
36 if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$platform" != xemu; then 36 if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$platform" != xemu; then
37 # Some toolchains enable these features by default, but they need 37 # Some toolchains enable these features by default, but they need
38 # registers that aren't set up properly in GRUB. 38 # registers that aren't set up properly in GRUB.
@@ -41,6 +41,3 @@ index 26d2f33..9ce56de 100644
41 fi 41 fi
42 42
43 # GRUB doesn't use float or doubles at all. Yet some toolchains may decide 43 # GRUB doesn't use float or doubles at all. Yet some toolchains may decide
44--
452.7.0
46
diff --git a/meta/recipes-bsp/grub/files/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-bsp/grub/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
deleted file mode 100644
index 67dc115491..0000000000
--- a/meta/recipes-bsp/grub/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Apr 2015 17:02:13 -0700
4Subject: [PATCH] Unset need_charset_alias when building for musl
5
6localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
7which actually shoudl be fixed in gnulib and then all downstream
8projects will get it eventually. For now we apply the fix to
9coreutils
10
11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 lib/gnulib.mk | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18Index: grub-2.00/grub-core/gnulib/Makefile.am
19===================================================================
20--- grub-2.00.orig/grub-core/gnulib/Makefile.am
21+++ grub-2.00/grub-core/gnulib/Makefile.am
22@@ -410,7 +410,7 @@ install-exec-localcharset: all-local
23 case '$(host_os)' in \
24 darwin[56]*) \
25 need_charset_alias=true ;; \
26- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
27+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
28 need_charset_alias=false ;; \
29 *) \
30 need_charset_alias=true ;; \
diff --git a/meta/recipes-bsp/grub/files/0001-grub-setup-Debug-message-cleanup.patch b/meta/recipes-bsp/grub/files/0001-grub-setup-Debug-message-cleanup.patch
deleted file mode 100644
index e01fcdffb0..0000000000
--- a/meta/recipes-bsp/grub/files/0001-grub-setup-Debug-message-cleanup.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 4e9d9358e0cda6d01020005eb6343e3b69f7201a Mon Sep 17 00:00:00 2001
2From: Cao jin <caoj.fnst@cn.fujitsu.com>
3Date: Tue, 3 Jul 2018 18:51:13 +0800
4Subject: [PATCH] grub-setup: Debug message cleanup
5
6Variable "root" is initialized after root device probing and is null in
7current place, so, drop it.
8
9Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
10Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
11---
12Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/grub.git/commit/?id=4e9d9358e0cda6d01020005eb6343e3b69f7201a]
13
14 util/setup.c | 3 +--
15 1 file changed, 1 insertion(+), 2 deletions(-)
16
17diff --git a/util/setup.c b/util/setup.c
18index 80363075d..9c1e1b7da 100644
19--- a/util/setup.c
20+++ b/util/setup.c
21@@ -305,9 +305,8 @@ SETUP (const char *dir,
22 bl.first_block = (struct grub_boot_blocklist *) (core_img
23 + GRUB_DISK_SECTOR_SIZE
24 - sizeof (*bl.block));
25- grub_util_info ("root is `%s', dest is `%s'", root, dest);
26
27- grub_util_info ("Opening dest");
28+ grub_util_info ("Opening dest `%s'", dest);
29 dest_dev = grub_device_open (dest);
30 if (! dest_dev)
31 grub_util_error ("%s", grub_errmsg);
32--
332.17.2 (Apple Git-113)
34
diff --git a/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch b/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch
index d5bfaa177a..69b04aa56f 100644
--- a/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch
+++ b/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch
@@ -1,4 +1,4 @@
1From b512c77222a8b133d7dd71a0dcef081a921d97d4 Mon Sep 17 00:00:00 2001 1From 8f47ed4aaefba087b6ca76e59c9f832b6a0702bc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 13 Jan 2016 19:28:00 +0000 3Date: Wed, 13 Jan 2016 19:28:00 +0000
4Subject: [PATCH] grub.d/10_linux.in: add oe's kernel name 4Subject: [PATCH] grub.d/10_linux.in: add oe's kernel name
@@ -11,18 +11,19 @@ to util/grub.d/20_linux_xen.in to keep compatibility.
11 11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14--- 14
15Upstream-Status: Inappropriate [OE specific] 15Upstream-Status: Inappropriate [OE specific]
16 16
17---
17 util/grub.d/10_linux.in | 6 +++--- 18 util/grub.d/10_linux.in | 6 +++---
18 util/grub.d/20_linux_xen.in | 2 +- 19 util/grub.d/20_linux_xen.in | 2 +-
19 2 files changed, 4 insertions(+), 4 deletions(-) 20 2 files changed, 4 insertions(+), 4 deletions(-)
20 21
21diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in 22diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
22index 859b608..946be5d 100644 23index 4532266..cba2617 100644
23--- a/util/grub.d/10_linux.in 24--- a/util/grub.d/10_linux.in
24+++ b/util/grub.d/10_linux.in 25+++ b/util/grub.d/10_linux.in
25@@ -148,12 +148,12 @@ machine=`uname -m` 26@@ -164,12 +164,12 @@ machine=`uname -m`
26 case "x$machine" in 27 case "x$machine" in
27 xi?86 | xx86_64) 28 xi?86 | xx86_64)
28 list= 29 list=
@@ -39,10 +40,10 @@ index 859b608..946be5d 100644
39 done ;; 40 done ;;
40 esac 41 esac
41diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in 42diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
42index f532fb9..1994244 100644 43index 96179ea..98d16ae 100644
43--- a/util/grub.d/20_linux_xen.in 44--- a/util/grub.d/20_linux_xen.in
44+++ b/util/grub.d/20_linux_xen.in 45+++ b/util/grub.d/20_linux_xen.in
45@@ -138,7 +138,7 @@ EOF 46@@ -154,7 +154,7 @@ EOF
46 } 47 }
47 48
48 linux_list= 49 linux_list=
@@ -51,6 +52,3 @@ index f532fb9..1994244 100644
51 if grub_file_is_not_garbage "$i"; then 52 if grub_file_is_not_garbage "$i"; then
52 basename=$(basename $i) 53 basename=$(basename $i)
53 version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") 54 version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
54--
552.7.0
56
diff --git a/meta/recipes-bsp/grub/files/0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch b/meta/recipes-bsp/grub/files/0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch
deleted file mode 100644
index 61d58c4047..0000000000
--- a/meta/recipes-bsp/grub/files/0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch
+++ /dev/null
@@ -1,76 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 842c390469e2c2e10b5aa36700324cd3bde25875 Mon Sep 17 00:00:00 2001
5From: "H.J. Lu" <hjl.tools@gmail.com>
6Date: Sat, 17 Feb 2018 06:47:28 -0800
7Subject: [PATCH] x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32
8
9Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:
10
11https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a
12
13x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
1432-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as
15R_X86_64_PC32.
16
17Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
18Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
19---
20 grub-core/efiemu/i386/loadcore64.c | 1 +
21 grub-core/kern/x86_64/dl.c | 1 +
22 util/grub-mkimagexx.c | 1 +
23 util/grub-module-verifier.c | 1 +
24 4 files changed, 4 insertions(+)
25
26diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c
27index e49d0b6ff..18facf47f 100644
28--- a/grub-core/efiemu/i386/loadcore64.c
29+++ b/grub-core/efiemu/i386/loadcore64.c
30@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs,
31 break;
32
33 case R_X86_64_PC32:
34+ case R_X86_64_PLT32:
35 err = grub_efiemu_write_value (addr,
36 *addr32 + rel->r_addend
37 + sym.off
38diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
39index 440690673..3a73e6e6c 100644
40--- a/grub-core/kern/x86_64/dl.c
41+++ b/grub-core/kern/x86_64/dl.c
42@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
43 break;
44
45 case R_X86_64_PC32:
46+ case R_X86_64_PLT32:
47 {
48 grub_int64_t value;
49 value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value -
50diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
51index a2bb05439..39d7efb91 100644
52--- a/util/grub-mkimagexx.c
53+++ b/util/grub-mkimagexx.c
54@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
55 break;
56
57 case R_X86_64_PC32:
58+ case R_X86_64_PLT32:
59 {
60 grub_uint32_t *t32 = (grub_uint32_t *) target;
61 *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
62diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c
63index 9179285a5..a79271f66 100644
64--- a/util/grub-module-verifier.c
65+++ b/util/grub-module-verifier.c
66@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = {
67 -1
68 }, (int[]){
69 R_X86_64_PC32,
70+ R_X86_64_PLT32,
71 -1
72 }
73 },
74--
752.11.0
76
diff --git a/meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch b/meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch
index fc5aa4e313..faa7fde232 100644
--- a/meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch
+++ b/meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch
@@ -1,4 +1,4 @@
1From ff8f68cc48fd3c30d55e1d570d51f2e0952c968e Mon Sep 17 00:00:00 2001 1From 72c30928d3d461e0e2d20c5ff33bd96b6991d585 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sat, 25 Jan 2014 23:49:44 -0500 3Date: Sat, 25 Jan 2014 23:49:44 -0500
4Subject: [PATCH] autogen.sh: exclude .pc from po/POTFILES.in 4Subject: [PATCH] autogen.sh: exclude .pc from po/POTFILES.in
@@ -12,23 +12,24 @@ try to read it.
12Upstream-Status: Inappropriate [OE specific] 12Upstream-Status: Inappropriate [OE specific]
13 13
14Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 14Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
15--- 16---
16 autogen.sh | 2 +- 17 autogen.sh | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-) 18 1 file changed, 1 insertion(+), 1 deletion(-)
18 19
19diff --git a/autogen.sh b/autogen.sh 20diff --git a/autogen.sh b/autogen.sh
20index 7424428..843619e 100755 21index ef43270..a7067a7 100755
21--- a/autogen.sh 22--- a/autogen.sh
22+++ b/autogen.sh 23+++ b/autogen.sh
23@@ -5,7 +5,7 @@ set -e 24@@ -13,7 +13,7 @@ fi
24 export LC_COLLATE=C 25 export LC_COLLATE=C
25 unset LC_ALL 26 unset LC_ALL
26 27
27-find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' |sort > po/POTFILES.in 28-find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' ! -ipath './gnulib/*' ! -iname './grub-core/lib/gnulib/*' |sort > po/POTFILES.in
28+find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' ! -path './.pc/*' | sort > po/POTFILES.in 29+find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' ! -ipath './gnulib/*' ! -iname './grub-core/lib/gnulib/*' ! -path './.pc/*' |sort > po/POTFILES.in
29 find util -iname '*.in' ! -name Makefile.in |sort > po/POTFILES-shell.in 30 find util -iname '*.in' ! -name Makefile.in |sort > po/POTFILES-shell.in
30 31
31 echo "Importing unicode..." 32 echo "Importing unicode..."
32-- 33--
331.7.10.4 342.7.4
34 35
diff --git a/meta/recipes-bsp/grub/files/gcc8.patch b/meta/recipes-bsp/grub/files/gcc8.patch
deleted file mode 100644
index fa7331f1b3..0000000000
--- a/meta/recipes-bsp/grub/files/gcc8.patch
+++ /dev/null
@@ -1,74 +0,0 @@
1From 563b1da6e6ae7af46cc8354cadb5dab416989f0a Mon Sep 17 00:00:00 2001
2From: Michael Chang <mchang@suse.com>
3Date: Mon, 26 Mar 2018 16:52:34 +0800
4Subject: Fix packed-not-aligned error on GCC 8
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9When building with GCC 8, there are several errors regarding packed-not-aligned.
10
11./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned]
12
13This patch fixes the build error by cleaning up the ambiguity of placing
14aligned structure in a packed one. In "struct grub_btrfs_time" and "struct
15grub_gpt_part_type", the aligned attribute seems to be superfluous, and also
16has to be packed, to ensure the structure is bit-to-bit mapped to the format
17laid on disk. I think we could blame to copy and paste error here for the
18mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as
19the name suggests. :)
20
21Signed-off-by: Michael Chang <mchang@suse.com>
22Tested-by: Michael Chang <mchang@suse.com>
23Tested-by: Paul Menzel <paulepanter@users.sourceforge.net>
24Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
25
26Upstream-Status: Backport http://git.savannah.gnu.org/cgit/grub.git/commit/?id=563b1da6e6ae7af46cc8354cadb5dab416989f0a
27---
28 grub-core/fs/btrfs.c | 2 +-
29 include/grub/efiemu/runtime.h | 2 +-
30 include/grub/gpt_partition.h | 2 +-
31 3 files changed, 3 insertions(+), 3 deletions(-)
32
33diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
34index 4849c1c..be19544 100644
35--- a/grub-core/fs/btrfs.c
36+++ b/grub-core/fs/btrfs.c
37@@ -175,7 +175,7 @@ struct grub_btrfs_time
38 {
39 grub_int64_t sec;
40 grub_uint32_t nanosec;
41-} __attribute__ ((aligned (4)));
42+} GRUB_PACKED;
43
44 struct grub_btrfs_inode
45 {
46diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h
47index 9b6b729..36d2ded 100644
48--- a/include/grub/efiemu/runtime.h
49+++ b/include/grub/efiemu/runtime.h
50@@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel
51
52 struct efi_variable
53 {
54- grub_efi_guid_t guid;
55+ grub_efi_packed_guid_t guid;
56 grub_uint32_t namelen;
57 grub_uint32_t size;
58 grub_efi_uint32_t attributes;
59diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
60index 1b32f67..9668a68 100644
61--- a/include/grub/gpt_partition.h
62+++ b/include/grub/gpt_partition.h
63@@ -28,7 +28,7 @@ struct grub_gpt_part_type
64 grub_uint16_t data2;
65 grub_uint16_t data3;
66 grub_uint8_t data4[8];
67-} __attribute__ ((aligned(8)));
68+} GRUB_PACKED;
69 typedef struct grub_gpt_part_type grub_gpt_part_type_t;
70
71 #define GRUB_GPT_PARTITION_TYPE_EMPTY \
72--
73cgit v1.0-41-gc330
74
diff --git a/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch b/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch
index ffc2d40d89..26890261b7 100644
--- a/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch
+++ b/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch
@@ -1,13 +1,14 @@
1From 7461a3de38b66edbe2f5593f9bdab9f2704d32bc Mon Sep 17 00:00:00 2001 1From 917133acc701dbc4636165d3b08d15dc5829a06f Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 17 Aug 2016 04:06:34 -0400 3Date: Wed, 17 Aug 2016 04:06:34 -0400
4Subject: [PATCH] grub module explicitly keeps symbole .module_license 4Subject: [PATCH] grub module explicitly keeps symbole .module_license
5 5
6While using oe-core toolchain to strip grub module 'all_video.mod', 6While using oe-core toolchain to strip grub module 'all_video.mod',
7it stripped symbol table: 7it stripped symbol table:
8--------------
9root@localhost:~# objdump -t all_video.mod
10 8
9---------------
10root@localhost:~# objdump -t all_video.mod
11
11all_video.mod: file format elf64-x86-64 12all_video.mod: file format elf64-x86-64
12 13
13SYMBOL TABLE: 14SYMBOL TABLE:
@@ -43,16 +44,16 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
43 grub-core/genmod.sh.in | 2 +- 44 grub-core/genmod.sh.in | 2 +-
44 1 file changed, 1 insertion(+), 1 deletion(-) 45 1 file changed, 1 insertion(+), 1 deletion(-)
45 46
46Index: grub-2.02/grub-core/genmod.sh.in 47diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in
47=================================================================== 48index 1250589..dd14308 100644
48--- grub-2.02.orig/grub-core/genmod.sh.in 49--- a/grub-core/genmod.sh.in
49+++ grub-2.02/grub-core/genmod.sh.in 50+++ b/grub-core/genmod.sh.in
50@@ -56,7 +56,7 @@ if test x@TARGET_APPLE_LINKER@ != x1; th 51@@ -56,7 +56,7 @@ if test x@TARGET_APPLE_LINKER@ != x1; then
51 if test x@platform@ != xemu; then 52 if test x@platform@ != xemu; then
52 @TARGET_STRIP@ --strip-unneeded \ 53 @TARGET_STRIP@ --strip-unneeded \
53 -K grub_mod_init -K grub_mod_fini \ 54 -K grub_mod_init -K grub_mod_fini \
54- -K _grub_mod_init -K _grub_mod_fini \ 55- -K _grub_mod_init -K _grub_mod_fini \
55+ -K _grub_mod_init -K _grub_mod_fini -K .module_license \ 56+ -K _grub_mod_init -K _grub_mod_fini -K .module_license \
56 -R .note.gnu.gold-version -R .note.GNU-stack \ 57 -R .note.gnu.gold-version -R .note.GNU-stack \
57 -R .note -R .comment -R .ARM.exidx $tmpfile || exit 1 58 -R .gnu.build.attributes \
58 fi 59 -R .rel.gnu.build.attributes \
diff --git a/meta/recipes-bsp/grub/grub-efi_2.02.bb b/meta/recipes-bsp/grub/grub-efi_2.04.bb
index 0028a9b6eb..0028a9b6eb 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.02.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.04.bb
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index c5ff10e598..13e21d75bb 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -13,18 +13,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
13 13
14SRC_URI = "https://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ 14SRC_URI = "https://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
15 file://0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch \ 15 file://0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch \
16 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
17 file://autogen.sh-exclude-pc.patch \ 16 file://autogen.sh-exclude-pc.patch \
18 file://grub-module-explicitly-keeps-symbole-.module_license.patch \ 17 file://grub-module-explicitly-keeps-symbole-.module_license.patch \
19 file://0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch \ 18 file://0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch \
20 file://gcc8.patch \
21 file://0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch \
22 file://0001-grub-setup-Debug-message-cleanup.patch \
23" 19"
24SRC_URI[md5sum] = "1116d1f60c840e6dbd67abbc99acb45d" 20SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934"
25SRC_URI[sha256sum] = "660ee136fbcee08858516ed4de2ad87068bfe1b6b8b37896ce3529ff054a726d" 21SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea"
26 22
27DEPENDS = "flex-native bison-native" 23DEPENDS = "flex-native bison-native gettext-native"
28 24
29COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)' 25COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)'
30COMPATIBLE_HOST_armv7a = 'null' 26COMPATIBLE_HOST_armv7a = 'null'
@@ -45,6 +41,7 @@ EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} \
45 --enable-liblzma=no \ 41 --enable-liblzma=no \
46 --enable-libzfs=no \ 42 --enable-libzfs=no \
47 --enable-largefile \ 43 --enable-largefile \
44 --disable-werror \
48" 45"
49 46
50PACKAGECONFIG ??= "" 47PACKAGECONFIG ??= ""
@@ -62,8 +59,6 @@ BUILD_LDFLAGS = ""
62 59
63export PYTHON = "python3" 60export PYTHON = "python3"
64 61
65CFLAGS_append = " -Wno-error"
66
67do_configure_prepend() { 62do_configure_prepend() {
68 ( cd ${S} 63 ( cd ${S}
69 ${S}/autogen.sh ) 64 ${S}/autogen.sh )
diff --git a/meta/recipes-bsp/grub/grub_2.02.bb b/meta/recipes-bsp/grub/grub_2.04.bb
index e0973759fb..e0973759fb 100644
--- a/meta/recipes-bsp/grub/grub_2.02.bb
+++ b/meta/recipes-bsp/grub/grub_2.04.bb