summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTrevor Woerner <trevor.woerner@linaro.org>2014-05-29 00:05:54 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-03 16:49:19 +0100
commitd047de7ca778465eb0847566b9896ff17f847f49 (patch)
tree1f0497aa9b1dc4b031a103928bd40207d36dacd8 /meta
parent1380d516592d5a553c6ea521c0aad2f7ffc997e5 (diff)
downloadpoky-d047de7ca778465eb0847566b9896ff17f847f49.tar.gz
grub_git: fix build warning->error
This patch fixes a build warning which is promoted to an error via -Werror. changes from v1: * put "Upstream-Status" in patch itself, not in OE patch header * fix commit wording (From OE-Core rev: 4b41f4199d77144a629897173cff3d1efcfa85f9) Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch34
-rw-r--r--meta/recipes-bsp/grub/grub_git.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch b/meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch
new file mode 100644
index 0000000000..48ace56506
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch
@@ -0,0 +1,34 @@
1util/grub-gen-asciih.c: fix build warning->error
2
3A potential problem is flagged by the compiler and generates a warning. This
4warning is promoted to an error via -Werror. This patch fixes the original
5issue, avoids the warning, and therefore avoids the build error.
6
7Upstream-Status: Pending
8
9Index: git/util/grub-gen-asciih.c
10===================================================================
11--- git.orig/util/grub-gen-asciih.c
12+++ git/util/grub-gen-asciih.c
13@@ -131,6 +131,8 @@ write_font_ascii_bitmap (FILE *file, FT_
14 struct grub_glyph_info glyph;
15 int char_code;
16
17+ memset (&glyph, 0, sizeof(glyph));
18+
19 fprintf (file, "/* THIS CHUNK OF BYTES IS AUTOMATICALLY GENERATED */\n");
20 fprintf (file, "unsigned char ascii_bitmaps[] =\n");
21 fprintf (file, "{\n");
22@@ -144,6 +146,12 @@ write_font_ascii_bitmap (FILE *file, FT_
23 return;
24 add_glyph (glyph_idx, face, char_code, &glyph);
25
26+ if (glyph.bitmap == 0)
27+ {
28+ fprintf (stderr, "grub-gen-asciih: add_glyph not successful");
29+ exit (1);
30+ }
31+
32 if (glyph.width == 8 && glyph.height == 16
33 && glyph.x_ofs == 0 && glyph.y_ofs == 0)
34 {
diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb
index 1b9497c79a..3edc20a856 100644
--- a/meta/recipes-bsp/grub/grub_git.bb
+++ b/meta/recipes-bsp/grub/grub_git.bb
@@ -22,6 +22,7 @@ SRC_URI = "git://git.savannah.gnu.org/grub.git \
22 file://40_custom \ 22 file://40_custom \
23 file://autogen.sh-exclude-pc.patch \ 23 file://autogen.sh-exclude-pc.patch \
24 file://grub-2.00-add-oe-kernel.patch \ 24 file://grub-2.00-add-oe-kernel.patch \
25 file://asciih-fix-build-warning-error.patch \
25 " 26 "
26 27
27S = "${WORKDIR}/git" 28S = "${WORKDIR}/git"