sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Trevor Woerner 2014-05-29 00:05:54 -04:00 committed by Richard Purdie
parent 1380d51659
commit d047de7ca7
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch Normal file
View File

@ -0,0 +1,34 @@
util/grub-gen-asciih.c: fix build warning->error
A potential problem is flagged by the compiler and generates a warning. This
warning is promoted to an error via -Werror. This patch fixes the original
issue, avoids the warning, and therefore avoids the build error.
Upstream-Status: Pending
Index: git/util/grub-gen-asciih.c
===================================================================
--- git.orig/util/grub-gen-asciih.c
+++ git/util/grub-gen-asciih.c
@@ -131,6 +131,8 @@ write_font_ascii_bitmap (FILE *file, FT_
struct grub_glyph_info glyph;
int char_code;
+ memset (&glyph, 0, sizeof(glyph));
+
fprintf (file, "/* THIS CHUNK OF BYTES IS AUTOMATICALLY GENERATED */\n");
fprintf (file, "unsigned char ascii_bitmaps[] =\n");
fprintf (file, "{\n");
@@ -144,6 +146,12 @@ write_font_ascii_bitmap (FILE *file, FT_
return;
add_glyph (glyph_idx, face, char_code, &glyph);
+ if (glyph.bitmap == 0)
+ {
+ fprintf (stderr, "grub-gen-asciih: add_glyph not successful");
+ exit (1);
+ }
+
if (glyph.width == 8 && glyph.height == 16
&& glyph.x_ofs == 0 && glyph.y_ofs == 0)
{

1
meta/recipes-bsp/grub/grub_git.bb
View File

@ -22,6 +22,7 @@ SRC_URI = "git://git.savannah.gnu.org/grub.git \
file://40_custom \
file://autogen.sh-exclude-pc.patch \
file://grub-2.00-add-oe-kernel.patch \
file://asciih-fix-build-warning-error.patch \
"
S = "${WORKDIR}/git"