Some more cleanup of the 2.02~beta2 rebase, and make Aarch64 work.

Signed-off-by: Peter Jones <pjones@redhat.com>

0001-Migrate-PPC-from-Yaboot-to-Grub2.patch

@@ -1,7 +1,7 @@
 From be4a014a8024153e201eb1f79069ec1584001305 Mon Sep 17 00:00:00 2001
 From: Mark Hamzy <hamzy@us.ibm.com>
 Date: Wed, 28 Mar 2012 14:46:41 -0500
-Subject: [PATCH 02/34] Migrate PPC from Yaboot to Grub2
+Subject: [PATCH 01/37] Migrate PPC from Yaboot to Grub2
 
 Add configuration support for serial terminal consoles.  This will set the
 maximum screen size so that text is not overwritten.

0001-configure.ac-Set-version-to-2.02-beta2.patch

@@ -1,40 +0,0 @@
-From e8f07821cce1bd0ab6d5622c2a42440f15f4fd71 Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Tue, 24 Dec 2013 21:53:23 +0100
-Subject: [PATCH 01/34] 	* configure.ac: Set version to 2.02~beta2.
-
----
- ChangeLog    | 4 ++++
- configure.ac | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 3545ea1..41bcebf 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,5 +1,9 @@
- 2013-12-24  Vladimir Serbinenko  <phcoder@gmail.com>
- 
-+	* configure.ac: Set version to 2.02~beta2.
-+
-+2013-12-24  Vladimir Serbinenko  <phcoder@gmail.com>
-+
- 	* grub-core/disk/efi/efidisk.c (name_devices): Skip Apple ghosts.
- 
- 2013-12-24  Andrey Borzenkov <arvidjaar@gmail.com>
-diff --git a/configure.ac b/configure.ac
-index 2481410..7c5d080 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,7 @@ dnl type, so there is no conflict. Variables with the prefix "TARGET_"
- dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
- dnl type.
- 
--AC_INIT([GRUB],[2.02~beta1],[bug-grub@gnu.org])
-+AC_INIT([GRUB],[2.02~beta2],[bug-grub@gnu.org])
- 
- AC_CONFIG_AUX_DIR([build-aux])
- 
--- 
-1.8.4.2
-

0002-Add-fw_path-variable-revised.patch

@@ -1,7 +1,7 @@
 From 6759845abe79871a4241041915b56f617679e0b5 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 19 Sep 2012 21:22:55 -0300
-Subject: [PATCH 03/34] Add fw_path variable (revised)
+Subject: [PATCH 02/37] Add fw_path variable (revised)
 
 This patch makes grub look for its config file on efi where the app was
 found. It was originally written by Matthew Garrett, and adapted to fix the

0003-Add-support-for-linuxefi.patch

@@ -1,7 +1,7 @@
 From c17e307b40695b73fd972a6a4526424e9a591310 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <mjg@redhat.com>
 Date: Tue, 10 Jul 2012 11:58:52 -0400
-Subject: [PATCH 04/34] Add support for linuxefi
+Subject: [PATCH 03/37] Add support for linuxefi
 
 ---
  grub-core/Makefile.core.def       |   8 +

0004-Use-linuxefi-and-initrdefi-where-appropriate.patch

@@ -1,7 +1,7 @@
 From 9309e5ea7f0c65e9c575508de59c09a0ff732fcb Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 16 Jul 2012 18:57:11 -0400
-Subject: [PATCH 05/34] Use "linuxefi" and "initrdefi" where appropriate.
+Subject: [PATCH 04/37] Use "linuxefi" and "initrdefi" where appropriate.
 
 ---
  util/grub.d/10_linux.in | 18 ++++++++++++++++--

0005-Don-t-allow-insmod-when-secure-boot-is-enabled.patch

@@ -1,7 +1,7 @@
 From 926684b8498a820b2e1446b697ab9c746f5302ba Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Tue, 23 Oct 2012 10:40:49 -0400
-Subject: [PATCH 06/34] Don't allow insmod when secure boot is enabled.
+Subject: [PATCH 05/37] Don't allow insmod when secure boot is enabled.
 
 Hi,
 

0006-Pass-x-hex-hex-straight-through-unmolested.patch

@@ -1,7 +1,7 @@
 From 0e470ac45edd8c3e6cd06d2c6bdd5cdcf389af34 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 1 Oct 2012 13:24:37 -0400
-Subject: [PATCH 07/34] Pass "\x[[:hex:]][[:hex:]]" straight through
+Subject: [PATCH 06/37] Pass "\x[[:hex:]][[:hex:]]" straight through
  unmolested.
 
 ---

0007-Fix-crash-on-http.patch

@@ -1,7 +1,7 @@
 From 24dd7353a3c7691714661ddfdc1de1c0d8386d7f Mon Sep 17 00:00:00 2001
 From: Gustavo Luiz Duarte <gustavold@linux.vnet.ibm.com>
 Date: Tue, 25 Sep 2012 18:40:55 -0400
-Subject: [PATCH 08/34] Fix crash on http
+Subject: [PATCH 07/37] Fix crash on http
 
 Don't free file->data on receiving FIN flag since it is used all over without
 checking. http_close() will be called later to free that memory.

0008-IBM-client-architecture-CAS-reboot-support.patch

@@ -1,7 +1,7 @@
-From 51d201f7a26bba103408e83e872678835c70f7d6 Mon Sep 17 00:00:00 2001
+From 2d1f5f8f92f230c6c1e7cf84deacb1224d8cca1a Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Thu, 20 Sep 2012 18:07:39 -0300
-Subject: [PATCH 09/34] IBM client architecture (CAS) reboot support
+Subject: [PATCH 08/37] IBM client architecture (CAS) reboot support
 
 This is an implementation of IBM client architecture (CAS) reboot for GRUB.
 
@@ -18,17 +18,17 @@ Instead of return to the GRUB menu, it will check if the flag for CAS reboot is
 set. If so, grub will automatically boot the last booted kernel using the same
 parameters
 ---
- grub-core/kern/ieee1275/openfw.c | 63 ++++++++++++++++++++++++++++++++++++++++
+ grub-core/kern/ieee1275/openfw.c | 62 ++++++++++++++++++++++++++++++++++++++++
  grub-core/normal/main.c          | 19 ++++++++++++
  grub-core/script/execute.c       |  7 +++++
  include/grub/ieee1275/ieee1275.h |  2 ++
- 4 files changed, 91 insertions(+)
+ 4 files changed, 90 insertions(+)
 
 diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
-index ddb7783..2f7fbda 100644
+index ddb7783..6db8b98 100644
 --- a/grub-core/kern/ieee1275/openfw.c
 +++ b/grub-core/kern/ieee1275/openfw.c
-@@ -561,3 +561,66 @@ grub_ieee1275_canonicalise_devname (const char *path)
+@@ -561,3 +561,65 @@ grub_ieee1275_canonicalise_devname (const char *path)
    return NULL;
  }
  
@@ -94,7 +94,6 @@ index ddb7783..2f7fbda 100644
 +                                grub_strlen (text), &actual);
 +  return 0;
 +}
-+
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
 index 243b9d6..4ce71fc 100644
 --- a/grub-core/normal/main.c

0009-Add-vlan-tag-support.patch

@@ -1,7 +1,7 @@
-From e8b23062cac51d90f94971779bd69a1305ef3421 Mon Sep 17 00:00:00 2001
+From f002b23fc4b892ae630d8e5cb8f0101ae7321ea5 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 30 Oct 2012 15:19:39 -0200
-Subject: [PATCH 10/34] Add vlan-tag support
+Subject: [PATCH 09/37] Add vlan-tag support
 
 This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allows
 multiple VLANs in a bridged network to share the same physical network link but
@@ -32,7 +32,7 @@ index 89b2822..f43f6b9 100644
        ptr = canon + grub_strlen (canon) - 1;
        while (ptr > canon && (*ptr == ',' || *ptr == ':'))
 diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
-index 2f7fbda..086f119 100644
+index 6db8b98..81276fa 100644
 --- a/grub-core/kern/ieee1275/openfw.c
 +++ b/grub-core/kern/ieee1275/openfw.c
 @@ -23,6 +23,7 @@

0010-Add-X-option-to-printf-functions.patch

@@ -1,7 +1,7 @@
-From 57d2bab2505883efe87bab31a80c42984671e4ac Mon Sep 17 00:00:00 2001
+From 5541dfb70397abc279cf4cb858eb9bf76bceadbd Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 16:58:39 -0200
-Subject: [PATCH 11/34] Add %X option to printf functions.
+Subject: [PATCH 10/37] Add %X option to printf functions.
 
 ---
  grub-core/kern/misc.c | 7 +++++--

0011-DHCP-client-ID-and-UUID-options-added.patch

@@ -1,7 +1,7 @@
-From 1c9b8bec85cd2600da2f8a16ed08820300c02bee Mon Sep 17 00:00:00 2001
+From 35135f5d14fb0f2dc86f76874973f9c5f34f4255 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 17:18:53 -0200
-Subject: [PATCH 12/34] DHCP client ID and UUID options added.
+Subject: [PATCH 11/37] DHCP client ID and UUID options added.
 
 ---
  grub-core/net/bootp.c | 52 +++++++++++++++++++++++++++++++++++++++++++--------

0012-Search-for-specific-config-file-for-netboot.patch

@@ -1,7 +1,7 @@
-From 981b0dc6adaf2686f84fd90afcea28e841661ed2 Mon Sep 17 00:00:00 2001
+From 464d6b12534735a09c2e634c4cab99bc186d34ca Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 27 Nov 2012 17:22:07 -0200
-Subject: [PATCH 13/34] Search for specific config file for netboot
+Subject: [PATCH 12/37] Search for specific config file for netboot
 
 This patch implements a search for a specific configuration when the config
 file is on a remoteserver. It uses the following order:

0013-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch

@@ -1,7 +1,7 @@
-From d36fd225cab91b4f33fe9217f79951ac5a626811 Mon Sep 17 00:00:00 2001
+From 2fc621a2a9869ee83269a0b7a41c40b04fe8258e Mon Sep 17 00:00:00 2001
 From: Fedora Ninjas <grub2-owner@fedoraproject.org>
 Date: Tue, 22 Jan 2013 06:31:38 +0100
-Subject: [PATCH 14/34] blscfg: add blscfg module to parse Boot Loader
+Subject: [PATCH 13/37] blscfg: add blscfg module to parse Boot Loader
  Specification snippets
 
 http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec

0014-Move-bash-completion-script-922997.patch

@@ -1,7 +1,7 @@
-From 2de33dbfb9f5b2a471e546d10c2ddf578aacdf32 Mon Sep 17 00:00:00 2001
+From aa984a032856f825c07fc8112f92582e0b483ebb Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Wed, 3 Apr 2013 14:35:34 -0400
-Subject: [PATCH 15/34] Move bash completion script (#922997)
+Subject: [PATCH 14/37] Move bash completion script (#922997)
 
 Apparently these go in a new place now.
 ---

0015-for-ppc-reset-console-display-attr-when-clear-screen.patch

@@ -1,7 +1,7 @@
-From 89157f2a9b9c270bd6f2d4bc231cb6713c02128b Mon Sep 17 00:00:00 2001
+From 8977267e31aa10ad15ba31b236a2d2bf08c268de Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Wed, 24 Apr 2013 10:51:48 -0300
-Subject: [PATCH 16/34] for ppc, reset console display attr when clear screen
+Subject: [PATCH 15/37] for ppc, reset console display attr when clear screen
 
 This should fix this bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=908519

0016-Don-t-write-messages-to-the-screen.patch

@@ -1,7 +1,7 @@
-From dbd8d3b9c616bf5a9e2b825a25bc441f092a11a2 Mon Sep 17 00:00:00 2001
+From eae0ba1000eaa6bcba04cd4708ef705526eb0a10 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 13:30:20 -0400
-Subject: [PATCH 17/34] Don't write messages to the screen
+Subject: [PATCH 16/37] Don't write messages to the screen
 
 Writing messages to the screen before the menus or boot splash
 happens so quickly it looks like something is wrong and isn't

0017-Don-t-print-GNU-GRUB-header.patch

@@ -1,7 +1,7 @@
-From 71aab2b998c1c0c7e4b599f90f01adf754829c76 Mon Sep 17 00:00:00 2001
+From 2881f5032ed87e9220298cf9c83d30d94a1806ae 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 18/34] Don't print GNU GRUB header
+Subject: [PATCH 17/37] Don't print GNU GRUB header
 
 No one cares.
 ---

0018-Don-t-add-to-highlighted-row.patch

@@ -1,7 +1,7 @@
-From 4dc5d2ee1a2cfe0fe120dd83b69fbdeee63b6c1e Mon Sep 17 00:00:00 2001
+From b3102b1ff224c355cf0433e6709c86eaeb16960f Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 17:49:45 -0400
-Subject: [PATCH 20/34] Don't add '*' to highlighted row
+Subject: [PATCH 18/37] Don't add '*' to highlighted row
 
 It is already highlighted.
 ---
@@ -9,15 +9,15 @@ It is already highlighted.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index daf92b5..2f84fcc 100644
+index 2ff2941..daf92b5 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -242,7 +242,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
        unicode_title[i] = ' ';
  
    if (data->geo.num_entries > 1)
--    grub_putcode (' ', term);
+-    grub_putcode (highlight ? '*' : ' ', data->term);
-+    grub_putcode (' ', data->term);
++    grub_putcode (' ', term);
  
    grub_print_ucs4_menu (unicode_title,
  			unicode_title + len,

0019-Don-t-add-to-highlighted-row.patch

@@ -1,7 +1,7 @@
-From f69af9256a85c2f63ebce23957fa70cdabe0c3ee Mon Sep 17 00:00:00 2001
+From 454c328a5e7ba487feb695a9c0dad54ca993c578 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 17:49:45 -0400
-Subject: [PATCH 19/34] Don't add '*' to highlighted row
+Subject: [PATCH 19/37] Don't add '*' to highlighted row
 
 It is already highlighted.
 ---
@@ -9,15 +9,15 @@ It is already highlighted.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 2ff2941..daf92b5 100644
+index daf92b5..2f84fcc 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -242,7 +242,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
        unicode_title[i] = ' ';
  
    if (data->geo.num_entries > 1)
--    grub_putcode (highlight ? '*' : ' ', data->term);
+-    grub_putcode (' ', term);
-+    grub_putcode (' ', term);
++    grub_putcode (' ', data->term);
  
    grub_print_ucs4_menu (unicode_title,
  			unicode_title + len,

0020-Message-string-cleanups.patch

@@ -1,7 +1,7 @@
-From 8236dcd99b7e259d40317cafce236c8e77e2d9c5 Mon Sep 17 00:00:00 2001
+From ad9df3ea0720e27d3883c59888aeae46361cba5d Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 11:09:04 -0400
-Subject: [PATCH 21/34] Message string cleanups
+Subject: [PATCH 20/37] Message string cleanups
 
 Make use of terminology consistent. Remove jargon.
 ---

0021-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch

@@ -1,7 +1,7 @@
-From 8724eb81bc2549c66e02a90da3e969e5e37d55d1 Mon Sep 17 00:00:00 2001
+From 978679e2e8f568a7a9cccc423588875697c8ea42 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:08:23 -0400
-Subject: [PATCH 22/34] Fix border spacing now that we aren't displaying it
+Subject: [PATCH 21/37] Fix border spacing now that we aren't displaying it
 
 ---
  grub-core/normal/menu_text.c | 6 +++---

0022-Use-the-correct-indentation-for-the-term-help-text.patch

@@ -1,7 +1,7 @@
-From 177935794addb8b5161f8f59375965e6b5e9eae9 Mon Sep 17 00:00:00 2001
+From c8b5bbff3c0537f6c0703c36de3a7d48cb239db9 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:08:49 -0400
-Subject: [PATCH 23/34] Use the correct indentation for the term help text
+Subject: [PATCH 22/37] Use the correct indentation for the term help text
 
 That is consistent with the menu help text
 ---

0023-Indent-menu-entries.patch

@@ -1,7 +1,7 @@
-From 2a7f555009e4b66e9143fc2cea020c97c5eaf253 Mon Sep 17 00:00:00 2001
+From c40c055022f5b5984422e32d5bf588a47147121d Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:30:55 -0400
-Subject: [PATCH 24/34] Indent menu entries
+Subject: [PATCH 23/37] Indent menu entries
 
 ---
  grub-core/normal/menu_text.c | 3 ++-

0024-Fix-margins.patch

@@ -1,7 +1,7 @@
-From b506c9c46234afdf142a4bfa32d159916193f720 Mon Sep 17 00:00:00 2001
+From 02153b5b456d33afff074454ac008fb4391533c4 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 14:59:36 -0400
-Subject: [PATCH 25/34] Fix margins
+Subject: [PATCH 24/37] Fix margins
 
 ---
  grub-core/normal/menu_text.c | 8 +++-----

0025-Add-support-for-UEFI-operating-systems-returned-by-o.patch

@@ -1,7 +1,7 @@
-From c0ed0f4c72c02ce90fd4a4a775b14b7510018216 Mon Sep 17 00:00:00 2001
+From 306ea2bec37abaa5f35507766451061b946139ad Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Wed, 12 Jun 2013 11:51:49 -0400
-Subject: [PATCH 26/34] Add support for UEFI operating systems returned by
+Subject: [PATCH 25/37] Add support for UEFI operating systems returned by
  os-prober
 
 os-prober returns UEFI operating systems in the form:

0026-Disable-GRUB-video-support-for-IBM-power-machines.patch

@@ -1,7 +1,7 @@
-From 5cd617fb2727a545de7a22439bd7d1a8e712e85a Mon Sep 17 00:00:00 2001
+From 7c23b55851824ce06ff8f32db0defe0a5409265e 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 27/34] Disable GRUB video support for IBM power machines
+Subject: [PATCH 26/37] Disable GRUB video support for IBM power machines
 
 Should fix the problem in bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=973205

0027-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch

@@ -1,7 +1,7 @@
-From af7ac4e7b446061fd865b61b90df37871984421b Mon Sep 17 00:00:00 2001
+From 4ff77afc3062ad26fb77319876c323f2f4448cf3 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Fri, 21 Jun 2013 14:44:08 -0400
-Subject: [PATCH 28/34] Use -2 instead of -1 for our right-hand margin, so
+Subject: [PATCH 27/37] Use -2 instead of -1 for our right-hand margin, so
  linewrapping works (#976643).
 
 Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>

0028-Use-linux16-when-appropriate-880840.patch

@@ -1,7 +1,7 @@
-From fbcb0b99d3a4ee0c1d38c965b0dc7cda22d04f28 Mon Sep 17 00:00:00 2001
+From af7aee883ca2308881a49020c83aca12859dc088 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:05:07 -0400
-Subject: [PATCH 29/34] Use linux16 when appropriate (#880840)
+Subject: [PATCH 28/37] Use linux16 when appropriate (#880840)
 
 The kernel group really would prefer that we use the 16 bit entry point
 on x86 bios machines.

0029-Enable-pager-by-default.-985860.patch

@@ -1,7 +1,7 @@
-From 6e1e5aef1da65e05561995ef449a9d9acefc086c Mon Sep 17 00:00:00 2001
+From 06eb9bcde2d8460f00dfdafbcd1aa50bb04809b2 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:09:27 -0400
-Subject: [PATCH 30/34] Enable pager by default. (#985860)
+Subject: [PATCH 29/37] Enable pager by default. (#985860)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
 ---

0030-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch

@@ -1,7 +1,7 @@
-From 172b22b0179a2e01b18a0c2ae2336ce05663abbc Mon Sep 17 00:00:00 2001
+From 03693b39a4673347f24409fabae167b4b1386308 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 28 Oct 2013 10:13:27 -0400
-Subject: [PATCH 31/34] F10 doesn't work on serial, so don't tell the user to
+Subject: [PATCH 30/37] F10 doesn't work on serial, so don't tell the user to
  hit it (#987443)
 
 Signed-off-by: Peter Jones <pjones@redhat.com>

0031-Don-t-say-GNU-Linux-in-generated-menus.patch

@@ -1,7 +1,7 @@
-From b08547f24825204674a1ef4dcbc5ce638ef99a12 Mon Sep 17 00:00:00 2001
+From 283624a8caaa0fb184c200eac370b184a23790c8 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 14 Mar 2011 14:27:42 -0400
-Subject: [PATCH 32/34] Don't say "GNU/Linux" in generated menus.
+Subject: [PATCH 31/37] Don't say "GNU/Linux" in generated menus.
 
 ---
  util/grub.d/10_linux.in     | 4 ++--

0032-Don-t-draw-a-border-around-the-menu.patch

@@ -1,7 +1,7 @@
-From 3209ab4020a0c660bb5df1d8ad5ccd530e465839 Mon Sep 17 00:00:00 2001
+From 869a1495667b5fcff237c38d0a21067e7dded2dc Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Wed, 15 May 2013 16:47:33 -0400
-Subject: [PATCH 33/34] Don't draw a border around the menu
+Subject: [PATCH 32/37] Don't draw a border around the menu
 
 It looks cleaner without it.
 ---

0033-Use-the-standard-margin-for-the-timeout-string.patch

@@ -1,7 +1,7 @@
-From 3a1a0619d212adbaa19fc714997b006ede827d51 Mon Sep 17 00:00:00 2001
+From fdb5da3e0a0a481d7ac25ca1dad141e692eb7e14 Mon Sep 17 00:00:00 2001
 From: William Jon McCann <william.jon.mccann@gmail.com>
 Date: Fri, 7 Jun 2013 10:52:32 -0400
-Subject: [PATCH 34/34] Use the standard margin for the timeout string
+Subject: [PATCH 33/37] Use the standard margin for the timeout string
 
 So that it aligns with the other messages
 ---

0034-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch

@@ -0,0 +1,29 @@
+From 72cc0eaa566ac27b56c84021887ada3ba8c02380 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Fri, 10 Jan 2014 09:36:24 -0500
+Subject: [PATCH 34/37] Fix grub_script_execute_sourcecode() usage on ppc.
+
+593e430c made it not take the extra argc/argv that this code still
+passes it.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ grub-core/normal/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index 6c24a07..6eae828 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -281,7 +281,7 @@ grub_normal_execute (const char *config, int nested, int batch)
+       if (! grub_ieee1275_cas_reboot (script))
+         {
+           char *dummy[1] = { NULL };
+-          if (! grub_script_execute_sourcecode (script, 0, dummy))
++          if (! grub_script_execute_sourcecode (script))
+             boot = 1;
+         }
+       grub_free (script);
+-- 
+1.8.4.2
+

0035-Add-.eh_frame-to-list-of-relocations-stripped.patch

@@ -0,0 +1,25 @@
+From b8390dd8375913be61332cde658506d5d7ae11b0 Mon Sep 17 00:00:00 2001
+From: Fedora Ninjas <grub2-owner@fedoraproject.org>
+Date: Mon, 13 Jan 2014 21:50:59 -0500
+Subject: [PATCH 35/37] Add .eh_frame to list of relocations stripped
+
+---
+ conf/Makefile.common | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/conf/Makefile.common b/conf/Makefile.common
+index e4c301f..6f836d8 100644
+--- a/conf/Makefile.common
++++ b/conf/Makefile.common
+@@ -45,7 +45,7 @@ CFLAGS_KERNEL = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
+ LDFLAGS_KERNEL = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) $(TARGET_LDFLAGS_STATIC_LIBGCC)
+ CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
+ CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+-STRIPFLAGS_KERNEL = -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version
++STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version
+ 
+ CFLAGS_MODULE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
+ LDFLAGS_MODULE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
+-- 
+1.8.4.2
+

0036-arm64-set-correct-length-of-device-path-end-entry.patch

@@ -0,0 +1,43 @@
+From 7cbcbea853d19c54fae31681be7d73c5dd0c0b4b Mon Sep 17 00:00:00 2001
+From: Leif Lindholm <leif.lindholm@linaro.org>
+Date: Tue, 7 Jan 2014 17:52:50 +0000
+Subject: [PATCH 36/37] arm64: set correct length of device path end entry
+
+The length of the Device Path End entry in the grub_linux_boot()
+function was incorrectly set to 0. This triggers an assert failure
+in debug builds of Tianocore.
+
+Set it to sizeof (grub_efi_device_path_t).
+---
+ ChangeLog                      | 4 ++++
+ grub-core/loader/arm64/linux.c | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 41bcebf..cc1ff58 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2014-01-07  Leif Lindholm <leif.lindholm@linaro.org>
++
++	* grub-core/loader/arm64/linux.c: correctly set device path end length.
++
+ 2013-12-24  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+ 	* configure.ac: Set version to 2.02~beta2.
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index 9d15aad..75ad871 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -268,7 +268,7 @@ grub_linux_boot (void)
+ 
+   mempath[1].header.type = GRUB_EFI_END_DEVICE_PATH_TYPE;
+   mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
+-  mempath[1].header.length = 0;
++  mempath[1].header.length = sizeof (grub_efi_device_path_t);
+ 
+   b = grub_efi_system_table->boot_services;
+   status = b->load_image (0, grub_efi_image_handle,
+-- 
+1.8.4.2
+

0037-Make-10_linux-work-with-our-changes-for-linux16-and-.patch

@@ -0,0 +1,85 @@
+From fd50e126118bbe1f09f1d7aa576240a61fefc479 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 14 Jan 2014 13:12:23 -0500
+Subject: [PATCH 37/37] Make 10_linux work with our changes for linux16 and
+ linuxefi on aarch64
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ util/grub.d/10_linux.in | 31 ++++++++++++++++++++++++++++---
+ 1 file changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index c943a1e..2b8c561 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -75,8 +75,18 @@ linux_entry ()
+   args="$4"
+ 
+   sixteenbit=""
++  linuxefi="linux"
++  initrdefi="initrd"
+   case "$machine" in
+-    i?86|x86_64) sixteenbit="16" ;;
++    i?86|x86_64)
++	sixteenbit="16"
++	linuxefi="linuxefi"
++	initrdefi="initrdefi"
++	;;
++    aarch64)
++	linuxefi="linux"
++	initrdefi="initrd"
++	;;
+   esac
+ 
+   if [ -z "$boot_device_id" ]; then
+@@ -133,7 +143,7 @@ linux_entry ()
+   fi
+   if [ -d /sys/firmware/efi ]; then
+     sed "s/^/$submenu_indentation/" << EOF
+-	linuxefi ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
++	${linuxefi} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+ EOF
+   else
+     sed "s/^/$submenu_indentation/" << EOF
+@@ -143,7 +153,7 @@ EOF
+   if test -n "${initrd}" ; then
+     if [ -d /sys/firmware/efi ]; then
+       sed "s/^/$submenu_indentation/" << EOF
+-	initrdefi ${rel_dirname}/${initrd}
++	${initrdefi} ${rel_dirname}/${initrd}
+ EOF
+     else
+       sed "s/^/$submenu_indentation/" << EOF
+@@ -151,6 +161,13 @@ EOF
+ EOF
+     fi
+   fi
++  if test -n "${fdt}" ; then
++    message="$(gettext_printf "Loading fdt ...")"
++    sed "s/^/$submenu_indentation/" << EOF
++	echo	'$(echo "$message" | grub_quote)'
++	devicetree	${rel_dirname}/${fdt}
++EOF
++  fi
+   sed "s/^/$submenu_indentation/" << EOF
+ }
+ EOF
+@@ -211,6 +228,14 @@ while [ "x$list" != "x" ] ; do
+     fi
+   done
+ 
++  fdt=
++  for i in "dtb-${version}" "dtb-${alt_version}"; do
++    if test -e "${dirname}/${i}/foundation-v8.dtb" ; then
++      fdt="${i}/foundation-v8.dtb"
++      break
++    fi
++  done
++
+   config=
+   for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
+     if test -e "${i}" ; then
+-- 
+1.8.4.2
+

grub2.spec

@@ -13,7 +13,8 @@
 
 %if ! 0%{?efi}
 
-%global efiarchs %{ix86} x86_64 ia64
+%global efi_only aarch64
+%global efiarchs %{ix86} x86_64 ia64 %{efi_only}
 
 %ifarch %{ix86}
 %global grubefiarch i386-efi
@@ -25,6 +26,11 @@
 %global grubefiname grubx64.efi
 %global grubeficdname gcdx64.efi
 %endif
+%ifarch aarch64
+%global grubefiarch arm64-efi
+%global grubefiname grubaa64.efi
+%global grubeficdname gcdaa64.efi
+%endif
 
 %if 0%{?rhel}
 %global efidir redhat
@@ -54,45 +60,48 @@ Source3:        README.Fedora
 Source4:	http://unifoundry.com/unifont-5.1.20080820.pcf.gz
 Source5:	theme.tar.bz2
 #Source6:	grub-cd.cfg
-Patch0001: 0001-configure.ac-Set-version-to-2.02-beta2.patch
+Patch0001: 0001-Migrate-PPC-from-Yaboot-to-Grub2.patch
-Patch0002: 0002-Migrate-PPC-from-Yaboot-to-Grub2.patch
+Patch0002: 0002-Add-fw_path-variable-revised.patch
-Patch0003: 0003-Add-fw_path-variable-revised.patch
+Patch0003: 0003-Add-support-for-linuxefi.patch
-Patch0004: 0004-Add-support-for-linuxefi.patch
+Patch0004: 0004-Use-linuxefi-and-initrdefi-where-appropriate.patch
-Patch0005: 0005-Use-linuxefi-and-initrdefi-where-appropriate.patch
+Patch0005: 0005-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
-Patch0006: 0006-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
+Patch0006: 0006-Pass-x-hex-hex-straight-through-unmolested.patch
-Patch0007: 0007-Pass-x-hex-hex-straight-through-unmolested.patch
+Patch0007: 0007-Fix-crash-on-http.patch
-Patch0008: 0008-Fix-crash-on-http.patch
+Patch0008: 0008-IBM-client-architecture-CAS-reboot-support.patch
-Patch0009: 0009-IBM-client-architecture-CAS-reboot-support.patch
+Patch0009: 0009-Add-vlan-tag-support.patch
-Patch0010: 0010-Add-vlan-tag-support.patch
+Patch0010: 0010-Add-X-option-to-printf-functions.patch
-Patch0011: 0011-Add-X-option-to-printf-functions.patch
+Patch0011: 0011-DHCP-client-ID-and-UUID-options-added.patch
-Patch0012: 0012-DHCP-client-ID-and-UUID-options-added.patch
+Patch0012: 0012-Search-for-specific-config-file-for-netboot.patch
-Patch0013: 0013-Search-for-specific-config-file-for-netboot.patch
+Patch0013: 0013-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
-Patch0014: 0014-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+Patch0014: 0014-Move-bash-completion-script-922997.patch
-Patch0015: 0015-Move-bash-completion-script-922997.patch
+Patch0015: 0015-for-ppc-reset-console-display-attr-when-clear-screen.patch
-Patch0016: 0016-for-ppc-reset-console-display-attr-when-clear-screen.patch
+Patch0016: 0016-Don-t-write-messages-to-the-screen.patch
-Patch0017: 0017-Don-t-write-messages-to-the-screen.patch
+Patch0017: 0017-Don-t-print-GNU-GRUB-header.patch
-Patch0018: 0018-Don-t-print-GNU-GRUB-header.patch
+Patch0018: 0018-Don-t-add-to-highlighted-row.patch
 Patch0019: 0019-Don-t-add-to-highlighted-row.patch
-Patch0020: 0020-Don-t-add-to-highlighted-row.patch
+Patch0020: 0020-Message-string-cleanups.patch
-Patch0021: 0021-Message-string-cleanups.patch
+Patch0021: 0021-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
-Patch0022: 0022-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
+Patch0022: 0022-Use-the-correct-indentation-for-the-term-help-text.patch
-Patch0023: 0023-Use-the-correct-indentation-for-the-term-help-text.patch
+Patch0023: 0023-Indent-menu-entries.patch
-Patch0024: 0024-Indent-menu-entries.patch
+Patch0024: 0024-Fix-margins.patch
-Patch0025: 0025-Fix-margins.patch
+Patch0025: 0025-Add-support-for-UEFI-operating-systems-returned-by-o.patch
-Patch0026: 0026-Add-support-for-UEFI-operating-systems-returned-by-o.patch
+Patch0026: 0026-Disable-GRUB-video-support-for-IBM-power-machines.patch
-Patch0027: 0027-Disable-GRUB-video-support-for-IBM-power-machines.patch
+Patch0027: 0027-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
-Patch0028: 0028-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
+Patch0028: 0028-Use-linux16-when-appropriate-880840.patch
-Patch0029: 0029-Use-linux16-when-appropriate-880840.patch
+Patch0029: 0029-Enable-pager-by-default.-985860.patch
-Patch0030: 0030-Enable-pager-by-default.-985860.patch
+Patch0030: 0030-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
-Patch0031: 0031-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
+Patch0031: 0031-Don-t-say-GNU-Linux-in-generated-menus.patch
-Patch0032: 0032-Don-t-say-GNU-Linux-in-generated-menus.patch
+Patch0032: 0032-Don-t-draw-a-border-around-the-menu.patch
-Patch0033: 0033-Don-t-draw-a-border-around-the-menu.patch
+Patch0033: 0033-Use-the-standard-margin-for-the-timeout-string.patch
-Patch0034: 0034-Use-the-standard-margin-for-the-timeout-string.patch
+Patch0034: 0034-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch
+Patch0035: 0035-Add-.eh_frame-to-list-of-relocations-stripped.patch
+Patch0036: 0036-arm64-set-correct-length-of-device-path-end-entry.patch
+Patch0037: 0037-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
 
 BuildRequires:  flex bison binutils python
 BuildRequires:  ncurses-devel xz-devel
 BuildRequires:  freetype-devel libusb-devel
-%ifarch %{sparc} x86_64
+%ifarch %{sparc} x86_64 aarch64
 # sparc builds need 64 bit glibc-devel - also for 32 bit userland
 BuildRequires:  /usr/lib64/crt1.o glibc-static
 %else
@@ -105,8 +114,10 @@ BuildRequires:	texinfo
 BuildRequires:	dejavu-sans-fonts
 BuildRequires:	help2man
 %ifarch %{efiarchs}
+%ifnarch aarch64
 BuildRequires:	pesign >= 0.99-8
 %endif
+%endif
 
 Requires:	gettext os-prober which file
 Requires:	%{name}-tools = %{epoch}:%{version}-%{release}
@@ -188,6 +199,10 @@ git am %{patches}
 cd ..
 mv grub-%{tarversion} grub-efi-%{tarversion}
 %endif
+
+%ifarch %{efi_only}
+ln -s grub-efi-%{tarversion} grub-%{tarversion}
+%else
 %setup -D -q -T -a 0 -n grub-%{tarversion}
 cd grub-%{tarversion}
 # place unifont in the '.' from which configure is run
@@ -198,6 +213,7 @@ git config user.name "Fedora Ninjas"
 git add .
 git commit -a -q -m "%{tarversion} baseline."
 git am %{patches}
+%endif
 
 %build
 %ifarch %{efiarchs}
@@ -222,20 +238,30 @@ cd grub-efi-%{tarversion}
 make %{?_smp_mflags}
 GRUB_MODULES="	all_video boot btrfs cat chain configfile echo efifwsetup \
 		efinet ext2 fat font gfxmenu gfxterm gzio halt hfsplus iso9660 \
-		jpeg linuxefi lvm minicmd normal part_apple part_msdos \
+		jpeg lvm mdraid09 mdraid1x minicmd normal part_apple \
-		part_gpt password_pbkdf2 png reboot search search_fs_uuid \
+		part_msdos part_gpt password_pbkdf2 png reboot search \
-		search_fs_file search_label sleep test video xfs \
+		search_fs_uuid search_fs_file search_label sleep test tftp \
-		mdraid09 mdraid1x blscfg multiboot2 multiboot tftp"
+		video xfs mdraid09 mdraid1x"
+%ifarch aarch64
+GRUB_MODULES="${GRUB_MODULES} linux"
+%else
+GRUB_MODULES+="${GRUB_MODULES} linuxefi multiboot2 multiboot"
+%endif
+./grub-mkimage -O %{grubefiarch} -o %{grubefiname}.orig -p /EFI/%{efidir} \
+		-d grub-core ${GRUB_MODULES}
+%ifarch aarch64
+mv %{grubefiname}.orig %{grubefiname}
+%else
 ./grub-mkimage -O %{grubefiarch} -o %{grubeficdname}.orig -p /EFI/BOOT \
 		-d grub-core ${GRUB_MODULES}
 %pesign -s -i %{grubeficdname}.orig -o %{grubeficdname}
-./grub-mkimage -O %{grubefiarch} -o %{grubefiname}.orig -p /EFI/%{efidir} \
-		-d grub-core ${GRUB_MODULES}
 %pesign -s -i %{grubefiname}.orig -o %{grubefiname}
+%endif
 cd ..
 %endif
 
 cd grub-%{tarversion}
+%ifnarch %{efi_only}
 ./autogen.sh
 # -static is needed so that autoconf script is able to link
 # test that looks for _start symbol on 64 bit platforms
@@ -264,6 +290,7 @@ cd grub-%{tarversion}
 	--disable-werror
 
 make %{?_smp_mflags}
+%endif
 
 sed -i -e 's,(grub),(%{name}),g' \
 	-e 's,grub.info,%{name}.info,g' \
@@ -307,18 +334,22 @@ do
 #        install -m 755 -D $BASE$EXT $TGT
 done
 install -m 755 %{grubefiname} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{grubefiname}
+%ifnarch aarch64
 install -m 755 %{grubeficdname} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{grubeficdname}
+%endif
 install -D -m 644 unicode.pf2 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/fonts/unicode.pf2
 cd ..
 %endif
 
 cd grub-%{tarversion}
+%ifnarch %{efi_only}
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Ghost config file
 install -d $RPM_BUILD_ROOT/boot/%{name}
 touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg
 ln -s ../boot/%{name}/grub.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.cfg
+%endif
 
 cp -a $RPM_BUILD_ROOT%{_datarootdir}/locale/en\@quot $RPM_BUILD_ROOT%{_datarootdir}/locale/en
 
@@ -409,12 +440,14 @@ if [ "$1" = 0 ]; then
 	/sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/%{name}-dev.info.gz || :
 fi
 
+%ifnarch %{efi_only}
 %files -f grub.lang
 %defattr(-,root,root,-)
 %{_libdir}/grub/*-%{platform}/
 %config(noreplace) %{_sysconfdir}/%{name}.cfg
 %ghost %config(noreplace) /boot/%{name}/grub.cfg
 %doc grub-%{tarversion}/COPYING
+%endif
 
 %ifarch %{efiarchs}
 %files efi