diff options
| author |   Trevor Woerner <trevor.woerner@linaro.org> | 2014-05-29 00:05:54 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-03 16:45:05 +0100 |
| commit | 4b41f4199d77144a629897173cff3d1efcfa85f9 (patch) | |
| tree | eda288ce3d40609db92887e3baee134576751889 | |
| parent | c322f67808bb36c5fea3fbabd30aa242e408fc50 (diff) | |
| download | openembedded-core-contrib-4b41f4199d77144a629897173cff3d1efcfa85f9.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
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>
| -rw-r--r-- | meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-bsp/grub/grub_git.bb | 1 |
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 @@ +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) + { 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 \ 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" |