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:14:43 +0100 |
commit | 540b92736c66dc70bb2eeaad45065473b20d1569 (patch) | |
tree | 87ba469ccfe8bfba2768e39ac44b4ae8cb84dac4 | |
parent | a93005e6d0263bc91f013649c969aa08a80aa1e5 (diff) | |
download | poky-540b92736c66dc70bb2eeaad45065473b20d1569.tar.gz |
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)
(From OE-Core rev: f396bcfdc4f05d0a047903262edc5b52f3c85b6e)
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 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Original commit: http://git.savannah.gnu.org/cgit/grub.git/commit/grub-core/net/bootp.c?id=f06c2172c0b32052f22e37523445cf8e7affaea3 | ||
4 | |||
5 | From 149d2a14f4723778ced23f439487201ccbf1a2c9 Mon Sep 17 00:00:00 2001 | ||
6 | From: Khem Raj <raj.khem@gmail.com> | ||
7 | Date: Thu, 23 Apr 2015 07:03:34 +0000 | ||
8 | Subject: [PATCH] parse_dhcp_vendor: Add missing const qualifiers. | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | grub-core/net/bootp.c | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c | ||
16 | index bc07d53..44131ed 100644 | ||
17 | --- a/grub-core/net/bootp.c | ||
18 | +++ b/grub-core/net/bootp.c | ||
19 | @@ -52,9 +52,9 @@ set_env_limn_ro (const char *intername, const char *suffix, | ||
20 | } | ||
21 | |||
22 | static void | ||
23 | -parse_dhcp_vendor (const char *name, void *vend, int limit, int *mask) | ||
24 | +parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask) | ||
25 | { | ||
26 | - grub_uint8_t *ptr, *ptr0; | ||
27 | + const grub_uint8_t *ptr, *ptr0; | ||
28 | |||
29 | ptr = ptr0 = vend; | ||
30 | |||
31 | -- | ||
32 | 2.1.4 | ||
33 | |||
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 \ | |||
24 | file://grub-2.00-add-oe-kernel.patch \ | 24 | file://grub-2.00-add-oe-kernel.patch \ |
25 | file://fix-endianness-problem.patch \ | 25 | file://fix-endianness-problem.patch \ |
26 | file://grub2-remove-sparc64-setup-from-x86-builds.patch \ | 26 | file://grub2-remove-sparc64-setup-from-x86-builds.patch \ |
27 | file://0001-parse_dhcp_vendor-Add-missing-const-qualifiers.patch \ | ||
27 | " | 28 | " |
28 | 29 | ||
29 | SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" | 30 | SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" |