From 7d79a7bfffbc39090b22bb7696cc5dbc832e49b6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 23 Apr 2015 20:35:28 -0700 Subject: grub: Backport const qualifier fix for gcc-5 gcc-5 is stricter and complains about const to non-const conversions, we backport the patch from upstream into 2.00 Change-Id: I17db365fdd253daaa1ab726e2a70ecad0ac7b2ae Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ..._dhcp_vendor-Add-missing-const-qualifiers.patch | 33 ++++++++++++++++++++++ meta/recipes-bsp/grub/grub2.inc | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch diff --git a/meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch b/meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch new file mode 100644 index 0000000000..255e3eb7d6 --- /dev/null +++ b/meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch @@ -0,0 +1,33 @@ +Upstream-Status: Backport + +Original commit: http://git.savannah.gnu.org/cgit/grub.git/commit/grub-core/net/bootp.c?id=f06c2172c0b32052f22e37523445cf8e7affaea3 + +From 149d2a14f4723778ced23f439487201ccbf1a2c9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 23 Apr 2015 07:03:34 +0000 +Subject: [PATCH] parse_dhcp_vendor: Add missing const qualifiers. + +Signed-off-by: Khem Raj +--- + grub-core/net/bootp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c +index bc07d53..44131ed 100644 +--- a/grub-core/net/bootp.c ++++ b/grub-core/net/bootp.c +@@ -52,9 +52,9 @@ set_env_limn_ro (const char *intername, const char *suffix, + } + + static void +-parse_dhcp_vendor (const char *name, void *vend, int limit, int *mask) ++parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask) + { +- grub_uint8_t *ptr, *ptr0; ++ const grub_uint8_t *ptr, *ptr0; + + ptr = ptr0 = vend; + +-- +2.1.4 + diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 08c0b6b257..add45864d1 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -25,6 +25,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \ file://grub-efi-fix-with-glibc-2.20.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ + file://0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch \ " DEPENDS = "flex-native bison-native xz" -- cgit v1.2.3