mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
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>
62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
|
Date: Tue, 11 Jun 2013 15:14:05 -0300
|
|
Subject: [PATCH] Disable GRUB video support for IBM power machines
|
|
|
|
Should fix the problem in bugzilla:
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=973205
|
|
---
|
|
grub-core/kern/ieee1275/cmain.c | 5 ++++-
|
|
grub-core/video/ieee1275.c | 9 ++++++---
|
|
include/grub/ieee1275/ieee1275.h | 2 ++
|
|
3 files changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
|
|
index 20cbbd761ec..04df9d2c667 100644
|
|
--- a/grub-core/kern/ieee1275/cmain.c
|
|
+++ b/grub-core/kern/ieee1275/cmain.c
|
|
@@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
|
|
}
|
|
|
|
if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0)
|
|
- grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
|
|
+ {
|
|
+ grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
|
|
+ grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT);
|
|
+ }
|
|
|
|
/* Old Macs have no key repeat, newer ones have fully working one.
|
|
The ones inbetween when repeated key generates an escaoe sequence
|
|
diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c
|
|
index 17a3dbbb575..b8e4b3feb32 100644
|
|
--- a/grub-core/video/ieee1275.c
|
|
+++ b/grub-core/video/ieee1275.c
|
|
@@ -352,9 +352,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
|
|
|
|
GRUB_MOD_INIT(ieee1275_fb)
|
|
{
|
|
- find_display ();
|
|
- if (display)
|
|
- grub_video_register (&grub_video_ieee1275_adapter);
|
|
+ if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT))
|
|
+ {
|
|
+ find_display ();
|
|
+ if (display)
|
|
+ grub_video_register (&grub_video_ieee1275_adapter);
|
|
+ }
|
|
}
|
|
|
|
GRUB_MOD_FINI(ieee1275_fb)
|
|
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
|
|
index 0a599607f31..b5a1d49bbc3 100644
|
|
--- a/include/grub/ieee1275/ieee1275.h
|
|
+++ b/include/grub/ieee1275/ieee1275.h
|
|
@@ -148,6 +148,8 @@ enum grub_ieee1275_flag
|
|
GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN,
|
|
|
|
GRUB_IEEE1275_FLAG_RAW_DEVNAMES,
|
|
+
|
|
+ GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT
|
|
};
|
|
|
|
extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
|