summaryrefslogtreecommitdiffstats
path: root/boot/grub2/0002-grub-core-gettext-gettext.c-main_context-secondary_c.patch
diff options
context:
space:
mode:
authorErico Nunes <nunes.erico@gmail.com>2017-04-26 23:39:46 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-16 14:55:33 +0200
commit5ffafd2353f5d67dc74c7f3784dfe48d4080435e (patch)
treece6f048bc0fdffc95f6d70a711915fd28845370c /boot/grub2/0002-grub-core-gettext-gettext.c-main_context-secondary_c.patch
parentd4afb3288b679e34507756ade659690bb19ad4fb (diff)
downloadbuildroot-5ffafd2353f5d67dc74c7f3784dfe48d4080435e.tar.gz
buildroot-5ffafd2353f5d67dc74c7f3784dfe48d4080435e.zip
grub2: bump up version
After many years since the last release and a long time with grub 2.02 in beta, there is finally a release and it brings many bug fixes and interesting features such as support for ARM. Patch boot/grub2/0001-remove-gets.patch doesn't seem to be required anymore as grub-core/gnulib/stdio.in.h has changed significantly since "053cfcd Import new gnulib." and has another treatment for gets. Patch boot/grub2/0002-grub-core-gettext-gettext.c-main_context-secondary_c.patch was a backport which is present after the bump and therefore is also no longer necessary. Since we're adding a Config.in comment, we also introduce a BR2_TARGET_GRUB2_ARCH_SUPPORTS hidden boolean, in order to avoid repeating the architecture dependencies. Signed-off-by: Erico Nunes <nunes.erico@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> [Thomas: add BR2_TARGET_GRUB2_ARCH_SUPPORTS, remove bogus dependencies on ARM and AArch64, since enabling Grub2 on those architectures is done in another commit.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'boot/grub2/0002-grub-core-gettext-gettext.c-main_context-secondary_c.patch')
-rw-r--r--boot/grub2/0002-grub-core-gettext-gettext.c-main_context-secondary_c.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/boot/grub2/0002-grub-core-gettext-gettext.c-main_context-secondary_c.patch b/boot/grub2/0002-grub-core-gettext-gettext.c-main_context-secondary_c.patch
deleted file mode 100644
index 94be092710..0000000000
--- a/boot/grub2/0002-grub-core-gettext-gettext.c-main_context-secondary_c.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f30c692c1f9ef0e93bee2b408a24baa017f1ca9d Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Thu, 7 Nov 2013 01:01:47 +0100
-Subject: [PATCH] * grub-core/gettext/gettext.c (main_context),
- (secondary_context): Define after defining type and not before.
-
-[Thomas: backport from upstream commit
-f30c692c1f9ef0e93bee2b408a24baa017f1ca9d, and remove ChangeLog
-modifications to avoid conflicts.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- grub-core/gettext/gettext.c | 4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index df73570..4880cef 100644
---- a/grub-core/gettext/gettext.c
-+++ b/grub-core/gettext/gettext.c
-@@ -34,8 +34,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
- http://www.gnu.org/software/autoconf/manual/gettext/MO-Files.html .
- */
-
--static struct grub_gettext_context main_context, secondary_context;
--
- static const char *(*grub_gettext_original) (const char *s);
-
- struct grub_gettext_msg
-@@ -69,6 +67,8 @@ struct grub_gettext_context
- struct grub_gettext_msg *grub_gettext_msg_list;
- };
-
-+static struct grub_gettext_context main_context, secondary_context;
-+
- #define MO_MAGIC_NUMBER 0x950412de
-
- static grub_err_t
---
-2.7.4
-
OpenPOWER on IntegriCloud