e1531466e1
This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
43 lines
1.1 KiB
Diff
43 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
|
Date: Wed, 15 May 2013 13:53:48 -0400
|
|
Subject: [PATCH] Don't print GNU GRUB header
|
|
|
|
No one cares.
|
|
---
|
|
grub-core/normal/main.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
index a326b192c89..09d0dfe76f1 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -208,15 +208,16 @@ read_config_file (const char *config)
|
|
/* Initialize the screen. */
|
|
void
|
|
grub_normal_init_page (struct grub_term_output *term,
|
|
- int y)
|
|
+ int y __attribute__((__unused__)))
|
|
{
|
|
+ grub_term_cls (term);
|
|
+
|
|
+#if 0
|
|
grub_ssize_t msg_len;
|
|
int posx;
|
|
char *msg_formatted;
|
|
grub_uint32_t *unicode_msg;
|
|
grub_uint32_t *last_position;
|
|
-
|
|
- grub_term_cls (term);
|
|
|
|
msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION);
|
|
if (!msg_formatted)
|
|
@@ -241,6 +242,7 @@ grub_normal_init_page (struct grub_term_output *term,
|
|
grub_putcode ('\n', term);
|
|
grub_putcode ('\n', term);
|
|
grub_free (unicode_msg);
|
|
+#endif
|
|
}
|
|
|
|
static void
|