summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTrevor Woerner <trevor.woerner@linaro.org>2014-07-11 12:11:01 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-19 00:09:02 +0100
commitc79b4523e1f5047b4af93dbacf8e102d005d1375 (patch)
treebdaafc18cb2bc7485feb5d75869f3992c642c48a /meta
parent551e456c714662e84eb50dd6d8143b95524ab6d6 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch34
-rw-r--r--meta/recipes-bsp/grub/grub_git.bb3
2 files changed, 1 insertions, 36 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 @@
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 7f89739179..f74bae8eb6 100644
--- a/meta/recipes-bsp/grub/grub_git.bb
+++ b/meta/recipes-bsp/grub/grub_git.bb
@@ -17,11 +17,10 @@ DEFAULT_PREFERENCE = "-1"
17DEFAULT_PREFERENCE_arm = "1" 17DEFAULT_PREFERENCE_arm = "1"
18 18
19PV = "2.00+${SRCPV}" 19PV = "2.00+${SRCPV}"
20SRCREV = "4b8b9135f1676924a8458da528d264bbc7bbb301" 20SRCREV = "87de66d9d83446ecddb29cfbdf7369102c8e209e"
21SRC_URI = "git://git.savannah.gnu.org/grub.git \ 21SRC_URI = "git://git.savannah.gnu.org/grub.git \
22 file://autogen.sh-exclude-pc.patch \ 22 file://autogen.sh-exclude-pc.patch \
23 file://grub-2.00-add-oe-kernel.patch \ 23 file://grub-2.00-add-oe-kernel.patch \
24 file://asciih-fix-build-warning-error.patch \
25 " 24 "
26 25
27S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"