diff options
| author | Khem Raj <raj.khem@gmail.com> | 2015-04-23 20:35:28 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-26 09:08:43 +0100 |
| commit | f396bcfdc4f05d0a047903262edc5b52f3c85b6e (patch) | |
| tree | bc2eb81bab8cdd535ad5592e230030976242300f | |
| parent | c8bc2d7913e11278990d1fe82066e26f7fc1c11b (diff) | |
| download | openembedded-core-f396bcfdc4f05d0a047903262edc5b52f3c85b6e.tar.gz openembedded-core-f396bcfdc4f05d0a047903262edc5b52f3c85b6e.tar.bz2 openembedded-core-f396bcfdc4f05d0a047903262edc5b52f3c85b6e.zip | |
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
(From OE-Core rev: ea3d48471db19a2432e4afd86df8caad51ee5166)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Conflicts:
meta/recipes-bsp/grub/grub2.inc
| -rw-r--r-- | meta/recipes-bsp/grub/files/0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-bsp/grub/grub_2.00.bb | 1 |
2 files changed, 34 insertions, 0 deletions
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 <raj.khem@gmail.com> +Date: Thu, 23 Apr 2015 07:03:34 +0000 +Subject: [PATCH] parse_dhcp_vendor: Add missing const qualifiers. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + 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/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb index e2fcbb98f5..d4df6764ab 100644 --- a/meta/recipes-bsp/grub/grub_2.00.bb +++ b/meta/recipes-bsp/grub/grub_2.00.bb @@ -24,6 +24,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ file://grub-2.00-add-oe-kernel.patch \ file://fix-endianness-problem.patch \ file://grub2-remove-sparc64-setup-from-x86-builds.patch \ + file://0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch \ " SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" |