[grub] - When the EFI memory map is too large, copy the parts we can to e820 Resolves: rhbz#624806 - Add

[Peter Jones]

commit 4f3e8eb092ab00e134e48b013b3dd3f3d513796c
Author: Peter Jones <pjones at redhat.com>
Date:   Thu Aug 19 16:38:46 2010 -0400

    - When the EFI memory map is too large, copy the parts we can to e820
      Resolves: rhbz#624806
    - Add version command (bcl)
      Resolves: rhbz#621989

 grub-0.97-version-command-rhbz621989.patch |   52 ++++++++++++++++++++++++++++
 grub.spec                                  |    8 ++++
 2 files changed, 60 insertions(+), 0 deletions(-)
---
diff --git a/grub-0.97-version-command-rhbz621989.patch b/grub-0.97-version-command-rhbz621989.patch
new file mode 100644
index 0000000..65ac43e
--- /dev/null
+++ b/grub-0.97-version-command-rhbz621989.patch
@@ -0,0 +1,52 @@
++From 3133f0232277af8a480185a16824bd1328740911 Mon Sep 17 00:00:00 2001
++From: Brian C. Lane <bcl at redhat.com>
++Date: Tue, 10 Aug 2010 15:49:17 -0700
++Subject: [PATCH] Add full version output and version command (#621989)
++
++Resolves: rhbz#621989
++---
++ stage2/builtins.c |   22 +++++++++++++++++++++-
++ 1 files changed, 21 insertions(+), 1 deletions(-)
++
++diff --git a/stage2/builtins.c b/stage2/builtins.c
++index de356d4..1eb1912 100644
++--- a/stage2/builtins.c
+++++ b/stage2/builtins.c
++@@ -5148,7 +5148,26 @@ static struct builtin builtin_vbeprobe =
++   " the information about only the mode."
++ };
++ #endif /* ! PLATFORM_EFI */
++-  
+++
+++
+++/* version */
+++static int
+++version_func (char *arg, int flags)
+++{
+++  grub_printf ("\n    GNU GRUB  version %s  (%dK lower / %dK upper memory)\n\n",
+++                version_string, mbi.mem_lower, mbi.mem_upper);
+++  return 0;
+++}
+++
+++static struct builtin builtin_version =
+++{
+++  "version",
+++  version_func,
+++  BUILTIN_CMDLINE | BUILTIN_HELP_LIST,
+++  "version",
+++  "Display grub version."
+++};
+++
++ 
++ /* The table of builtin commands. Sorted in dictionary order.  */
++ struct builtin *builtin_table[] =
++@@ -5268,5 +5287,6 @@ struct builtin *builtin_table[] =
++   &builtin_vbeprobe,
++ #endif
++   &builtin_verbose,
+++  &builtin_version,
++   0
++ };
++-- 
++1.7.2.1
++
diff --git a/grub.spec b/grub.spec
index c085b30..0c04d7e 100644
--- a/grub.spec
+++ b/grub.spec
@@ -58,6 +58,7 @@ Patch28: grub-0.97-better-get-memory-map-rhbz607213.patch
 Patch29: grub-0.97-add-strnchr.patch
 Patch30: grub-0.97-efimap.patch
 Patch31: grub-efi-large-memory-map.patch
+Patch32: grub-0.97-version-command-rhbz621989.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -99,6 +100,10 @@ systems.
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
+%patch32 -p1
+
+# Modify grub to show the full version number
+sed -i 's/0\.97/%{version}-%{release}/' configure.in
 
 %build
 autoreconf
@@ -164,6 +169,9 @@ fi
 * Thu Aug 19 2010 Peter Jones <pjones at redhat.com> - 0.97-67
 - When the EFI memory map is too large, copy the parts we can to e820
   Resolves: rhbz#624806
+- Add version command (bcl)
+  Resolves: rhbz#621989
+
 
 * Wed Aug 04 2010 Peter Jones <pjones at redhat.com> - 0.97-66
 - Draw the inverted line correctly in the menu