diff options
author | Trevor Woerner <trevor.woerner@linaro.org> | 2014-07-11 12:11:01 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-19 00:09:02 +0100 |
commit | c79b4523e1f5047b4af93dbacf8e102d005d1375 (patch) | |
tree | bdaafc18cb2bc7485feb5d75869f3992c642c48a /meta/recipes-bsp/grub/grub | |
parent | 551e456c714662e84eb50dd6d8143b95524ab6d6 (diff) | |
download | poky-c79b4523e1f5047b4af93dbacf8e102d005d1375.tar.gz |
grub_git: bump version, remove patch
A previously upstreamed patch has been applied. Bump the version to
incorporate this upstream update.
(From OE-Core rev: 72f3c0eb12fbad7318573c060b0f84993048fdcc)
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/recipes-bsp/grub/grub')
-rw-r--r-- | meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch | 34 |
1 files changed, 0 insertions, 34 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 deleted file mode 100644 index 48ace56506..0000000000 --- a/meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | util/grub-gen-asciih.c: fix build warning->error | ||
2 | |||
3 | A potential problem is flagged by the compiler and generates a warning. This | ||
4 | warning is promoted to an error via -Werror. This patch fixes the original | ||
5 | issue, avoids the warning, and therefore avoids the build error. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Index: 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 | { | ||