Skip to content

Commit

Permalink
grub2: update to newer version
Browse files Browse the repository at this point in the history
In order to support PXE-EFI64 booting we need a more up to date
version of GRUB2.

This patch moves the GRUB version to 2.02~beta2+e4a1fe391.

The e4a1fe391 refers to the git hash from the master grub repo:
  git clone git://git.savannah.gnu.org/grub.git

The 2.02~beta2 release did not work so we moved to the latest
available.

Two minor patches are added on top:

version-string.patch:
change the version string to "2.02~beta2+e4a1fe391"

set-default-graphics-mode-to-text.patch:
For EFI64 set the default graphics mode to text
  • Loading branch information
Curt Brune committed Mar 27, 2014
1 parent 12fb5a3 commit 43cc5e7
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 1 deletion.
3 changes: 3 additions & 0 deletions patches/grub/series
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# This series applies on GIT commit 6f2068a6c21dc22f4b131a3882c2eb84c0d9aa61
version-string.patch
set-default-graphics-mode-to-text.patch
22 changes: 22 additions & 0 deletions patches/grub/set-default-graphics-mode-to-text.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
set default graphics mode to text

For EFI set the default graphics mode to text.

This supresses an ugly, but harmless message about no video mode
found.

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 31fb91e..b1f34f8 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -45,8 +45,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
#ifdef GRUB_MACHINE_EFI
#include <grub/efi/efi.h>
#define HAS_VGA_TEXT 0
-#define DEFAULT_VIDEO_MODE "auto"
-#define ACCEPTS_PURE_TEXT 0
+#define DEFAULT_VIDEO_MODE "text"
+#define ACCEPTS_PURE_TEXT 1
#elif defined (GRUB_MACHINE_IEEE1275)
#include <grub/ieee1275/ieee1275.h>
#define HAS_VGA_TEXT 0
20 changes: 20 additions & 0 deletions patches/grub/version-string.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
patch-version-string

Add the git hash from which this release is based to the end of the
existing GRUB version string.

This differentiates it from other releases that do not work.

diff --git a/configure.ac b/configure.ac
index 8888c2f..9614256 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ dnl (such as BUILD_CC, BUILD_CFLAGS, etc.) for the build type and variables
dnl with the prefix "TARGET_" (such as TARGET_CC, TARGET_CFLAGS, etc.) are
dnl used for the target type. See INSTALL for full list of variables.

-AC_INIT([GRUB],[2.02~beta2],[[email protected]])
+AC_INIT([GRUB],[2.02~beta2+e4a1fe391],[[email protected]])

AC_CONFIG_AUX_DIR([build-aux])

1 change: 0 additions & 1 deletion upstream/grub-2.00.tar.xz.sha1

This file was deleted.

1 change: 1 addition & 0 deletions upstream/grub-e4a1fe391.tar.xz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b3f68822f4809e8113c0686f8d50b509f7f7df8b grub-e4a1fe391.tar.xz

0 comments on commit 43cc5e7

Please sign in to comment.