* [PATCH] grub_git: bump version, remove patch
@ 2014-07-11 16:11 Trevor Woerner
2014-07-17 16:53 ` Trevor Woerner
0 siblings, 1 reply; 2+ messages in thread
From: Trevor Woerner @ 2014-07-11 16:11 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi, patches
A previously upstreamed patch has been applied. Bump the version to
incorporate this upstream update.
Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
---
.../grub/grub/asciih-fix-build-warning-error.patch | 34 ----------------------
meta/recipes-bsp/grub/grub_git.bb | 3 +-
2 files changed, 1 insertion(+), 36 deletions(-)
delete mode 100644 meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch
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 48ace56..0000000
--- a/meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 7f89739..f74bae8 100644
--- a/meta/recipes-bsp/grub/grub_git.bb
+++ b/meta/recipes-bsp/grub/grub_git.bb
@@ -17,11 +17,10 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_arm = "1"
PV = "2.00+${SRCPV}"
-SRCREV = "4b8b9135f1676924a8458da528d264bbc7bbb301"
+SRCREV = "87de66d9d83446ecddb29cfbdf7369102c8e209e"
SRC_URI = "git://git.savannah.gnu.org/grub.git \
file://autogen.sh-exclude-pc.patch \
file://grub-2.00-add-oe-kernel.patch \
- file://asciih-fix-build-warning-error.patch \
"
S = "${WORKDIR}/git"
--
2.0.1.563.g66f467c
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] grub_git: bump version, remove patch
2014-07-11 16:11 [PATCH] grub_git: bump version, remove patch Trevor Woerner
@ 2014-07-17 16:53 ` Trevor Woerner
0 siblings, 0 replies; 2+ messages in thread
From: Trevor Woerner @ 2014-07-17 16:53 UTC (permalink / raw)
To: openembedded-core
ping?
On 07/11/14 12:11, Trevor Woerner wrote:
> A previously upstreamed patch has been applied. Bump the version to
> incorporate this upstream update.
>
> Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
> ---
> .../grub/grub/asciih-fix-build-warning-error.patch | 34 ----------------------
> meta/recipes-bsp/grub/grub_git.bb | 3 +-
> 2 files changed, 1 insertion(+), 36 deletions(-)
> delete mode 100644 meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch
>
> 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 48ace56..0000000
> --- a/meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -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 7f89739..f74bae8 100644
> --- a/meta/recipes-bsp/grub/grub_git.bb
> +++ b/meta/recipes-bsp/grub/grub_git.bb
> @@ -17,11 +17,10 @@ DEFAULT_PREFERENCE = "-1"
> DEFAULT_PREFERENCE_arm = "1"
>
> PV = "2.00+${SRCPV}"
> -SRCREV = "4b8b9135f1676924a8458da528d264bbc7bbb301"
> +SRCREV = "87de66d9d83446ecddb29cfbdf7369102c8e209e"
> SRC_URI = "git://git.savannah.gnu.org/grub.git \
> file://autogen.sh-exclude-pc.patch \
> file://grub-2.00-add-oe-kernel.patch \
> - file://asciih-fix-build-warning-error.patch \
> "
>
> S = "${WORKDIR}/git"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-17 16:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-11 16:11 [PATCH] grub_git: bump version, remove patch Trevor Woerner
2014-07-17 16:53 ` Trevor Woerner
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.