[grub2] Re-merge RHEL 7 changes and ARM works in progress.
Peter Jones
pjones at fedoraproject.org
Wed Jul 2 15:57:07 UTC 2014
commit 37b39b7a40c73c688641b823c5e1ad6ba4b65617
Author: Peter Jones <pjones at redhat.com>
Date: Wed Jul 2 11:49:28 2014 -0400
Re-merge RHEL 7 changes and ARM works in progress.
0001-fix-EFI-detection-on-Windows.patch | 4 +-
...ern-arm-cache_armv6.S-Remove-.arch-direct.patch | 4 +-
...ss-compiling-the-GRUB-Fix-some-spelling-m.patch | 4 +-
0004-NEWS-First-draft-of-2.02-entry.patch | 4 +-
...nch-master-of-git.sv.gnu.org-srv-git-grub.patch | 4 +-
...osclean-command-in-fact-dates-back-to-1.9.patch | 4 +-
...emove-unused-error.h-from-kern-emu-misc.c.patch | 4 +-
...-on-unavailable-coreboot-tables-if-not-ru.patch | 4 +-
...ew-missing-entries.-Correct-existing-ones.patch | 4 +-
...p-.eh_frame-section-from-arm64-efi-kernel.patch | 4 +-
...-boot-aa64.efi-for-boot-images-on-AArch64.patch | 4 +-
0012-fix-32-bit-compilation-on-MinGW-w64.patch | 4 +-
...nge-grub-mkrescue-to-use-bootaa64.efi-too.patch | 4 +-
...t-correct-length-of-device-path-end-entry.patch | 4 +-
...il.def-grub-macbless-Change-mansection-to.patch | 4 +-
...ple-to-EFI-rescue-image-to-fix-missing-pr.patch | 4 +-
...stdisk.c-is-only-ever-compiled-on-FreeBSD.patch | 4 +-
0018-Prefer-more-portable-test-1-constructs.patch | 4 +-
0019-NEWS-Add-few-missing-entries.patch | 4 +-
...ern-efi-efi.c-Ensure-that-the-result-star.patch | 4 +-
...ount.c-Extend-GCC-warning-workaround-to-g.patch | 4 +-
...-BUILD_LDFLAGS-for-the-cross-compile-case.patch | 4 +-
...ore-term-terminfo.c-Recognize-keys-F1-F12.patch | 4 +-
0024-Fix-ChangeLog-date.patch | 4 +-
...-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch | 4 +-
...XEEXT-support-to-fix-make-clean-on-Window.patch | 4 +-
...-loop-on-MinGW-due-to-libintl.h-pulling-s.patch | 4 +-
...ommands-macbless.c-Rename-FILE-and-DIR-to.patch | 4 +-
...il.def-Link-grub-ofpathname-with-zfs-libs.patch | 4 +-
...kefile.am-default_payload.elf-Add-modules.patch | 4 +-
...emoval-of-cpu-machine-links-on-mingw-msys.patch | 4 +-
...ormal-main.c-read_config_file-Buffer-conf.patch | 4 +-
0033-util-grub-install.c-Fix-a-typo.patch | 4 +-
...FILES-for-genemuinit-instead-of-MOD_FILES.patch | 4 +-
...EPERM-when-modifying-kern.geom.debugflags.patch | 4 +-
...ge-stop-condition-to-avoid-infinite-loops.patch | 4 +-
0037-increase-network-try-interval-gradually.patch | 4 +-
...r-DejaVu-also-in-usr-share-fonts-truetype.patch | 4 +-
...ed-path-to-DejaVuSans-in-configure-summar.patch | 4 +-
...NDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch | 4 +-
...nstall.c-write_to_disk-Add-an-info-messag.patch | 4 +-
...til-grub-install.c-List-available-targets.patch | 4 +-
0043-Fix-several-translatable-strings.patch | 4 +-
...do-not-set-default-prefix-in-grub-mkimage.patch | 4 +-
...64-32-cross-compile-failure-due-to-printf.patch | 4 +-
...erm-serial.c-grub_serial_register-Fix-inv.patch | 4 +-
...l-support-for-partitioned-partx-loop-devi.patch | 4 +-
...erm-at_keyboard.c-Tolerate-missing-keyboa.patch | 4 +-
...gnore-add-missing-files-and-.exe-variants.patch | 4 +-
...kfont.c-Downgrade-warnings-about-unhandle.patch | 4 +-
...isk-ahci.c-Do-not-enable-I-O-decoding-and.patch | 4 +-
...isk-ahci.c-Allocate-and-clean-space-for-a.patch | 4 +-
...grub-core-disk-ahci.c-Add-safety-cleanups.patch | 4 +-
...isk-ahci.c-Properly-handle-transactions-w.patch | 4 +-
...isk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch | 4 +-
...kfont.c-Build-fix-for-argp.h-with-older-g.patch | 4 +-
...krescue.c-Build-fix-for-argp.h-with-older.patch | 4 +-
0058-add-grub_env_set_net_property-function.patch | 4 +-
0059-add-bootpath-parser-for-open-firmware.patch | 4 +-
...isk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch | 4 +-
...ern-i386-coreboot-mmap.c-Filter-out-0xa00.patch | 4 +-
...oader-i386-multiboot_mbi.c-grub_multiboot.patch | 4 +-
...map-i386-uppermem.c-lower_hook-COREBOOT-I.patch | 4 +-
...ern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch | 4 +-
...b-i386-openbsd_bootarg.h-Add-addr-and-fre.patch | 4 +-
...75-check-for-IBM-pseries-emulated-machine.patch | 4 +-
...-loader-arm64-linux.c-Remove-redundant-0x.patch | 4 +-
...ib-relocator.c-Fix-the-case-when-end-of-l.patch | 4 +-
0069-Fix-grub-probe-0-option.patch | 4 +-
...-cryptodisk-and-abstraction-handling-in-g.patch | 4 +-
...et_root-key-comparison-failures-due-to-en.patch | 4 +-
...sdep-linux-getroot.c-grub_util_part_to_di.patch | 4 +-
...-instances-of-memcmp-memcpy-in-the-code-t.patch | 4 +-
...b-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch | 4 +-
0075-Add-missing-endif.patch | 4 +-
...-lib-syslinux_parse.c-Fix-timeout-quoting.patch | 4 +-
...prove-LVM-logical_volumes-string-matching.patch | 4 +-
...vices-with-no-filesystem-UUID-returned-by.patch | 4 +-
...ng-old-kernels-by-placing-GDT-in-conventi.patch | 4 +-
...ern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch | 4 +-
...ommands-verify.c-grub_pubkey_open-Fix-mem.patch | 4 +-
...ommands-verify.c-grub_pubkey_open-Trust-p.patch | 4 +-
...en-asciih.c-add_glyph-Fix-uninitialised-v.patch | 4 +-
...ommands-efi-lsefisystab.c-grub_cmd_lsefis.patch | 4 +-
...oader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch | 4 +-
...rub-install.c-Fix-handling-of-disk-module.patch | 4 +-
...ommands-loadenv.c-check_blocklists-Fix-ov.patch | 4 +-
...osclean-command-in-fact-dates-back-to-1.9.patch | 4 +-
0089-Migrate-PPC-from-Yaboot-to-Grub2.patch | 4 +-
0090-Add-fw_path-variable-revised.patch | 4 +-
0091-Add-support-for-linuxefi.patch | 4 +-
...-linuxefi-and-initrdefi-where-appropriate.patch | 4 +-
...-allow-insmod-when-secure-boot-is-enabled.patch | 4 +-
...ass-x-hex-hex-straight-through-unmolested.patch | 4 +-
0095-Fix-crash-on-http.patch | 4 +-
...BM-client-architecture-CAS-reboot-support.patch | 4 +-
0097-Add-vlan-tag-support.patch | 4 +-
0098-Add-X-option-to-printf-functions.patch | 4 +-
0099-DHCP-client-ID-and-UUID-options-added.patch | 4 +-
...arch-for-specific-config-file-for-netboot.patch | 4 +-
...blscfg-module-to-parse-Boot-Loader-Specif.patch | 4 +-
0102-Move-bash-completion-script-922997.patch | 4 +-
...et-console-display-attr-when-clear-screen.patch | 4 +-
0104-Don-t-write-messages-to-the-screen.patch | 4 +-
0105-Don-t-print-GNU-GRUB-header.patch | 4 +-
0106-Don-t-add-to-highlighted-row.patch | 4 +-
0107-Message-string-cleanups.patch | 4 +-
...-spacing-now-that-we-aren-t-displaying-it.patch | 4 +-
...orrect-indentation-for-the-term-help-text.patch | 4 +-
0110-Indent-menu-entries.patch | 4 +-
0111-Fix-margins.patch | 4 +-
...-for-UEFI-operating-systems-returned-by-o.patch | 4 +-
...GRUB-video-support-for-IBM-power-machines.patch | 4 +-
...ad-of-1-for-our-right-hand-margin-so-line.patch | 4 +-
0115-Use-linux16-when-appropriate-880840.patch | 4 +-
0116-Enable-pager-by-default.-985860.patch | 4 +-
...-work-on-serial-so-don-t-tell-the-user-to.patch | 4 +-
0118-Don-t-say-GNU-Linux-in-generated-menus.patch | 4 +-
0119-Don-t-draw-a-border-around-the-menu.patch | 4 +-
...he-standard-margin-for-the-timeout-string.patch | 4 +-
...ub_script_execute_sourcecode-usage-on-ppc.patch | 4 +-
....eh_frame-to-list-of-relocations-stripped.patch | 4 +-
...ux-work-with-our-changes-for-linux16-and-.patch | 4 +-
0124-Don-t-print-during-fdt-loading-method.patch | 4 +-
...link-when-generating-configuration-by-gru.patch | 4 +-
...-raw-spaces-when-we-re-doing-our-cmdline-.patch | 2 +-
...re-a-password-to-boot-entries-generated-b.patch | 31 +
0128-Don-t-emit-Booting-.-message.patch | 48 +
...nd-ALT-keys-work-as-expected-on-EFI-syste.patch | 304 +++
0130-May-as-well-try-it.patch | 1962 ++++++++++++++++++++
...-prefix-when-fallback-searching-for-grub-.patch | 45 +
...d-etc-before-grub.cfg-on-tftp-config-file.patch | 115 ++
0133-trim-arp-packets-with-abnormal-size.patch | 31 +
...-convert-function-to-support-NVMe-devices.patch | 59 +
0135-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch | 37 +
...se-APM-Mustang-device-tree-for-hardware-t.patch | 29 +
...ault-device-tree-from-the-grub-default-fi.patch | 46 +
...en-SNP-protocol-for-exclusive-use-by-grub.patch | 46 +
0139-Reduce-timer-event-frequency-by-10.patch | 40 +
0140-always-return-error-to-UEFI.patch | 25 +
grub2.spec | 19 +-
141 files changed, 3087 insertions(+), 252 deletions(-)
---
diff --git a/0001-fix-EFI-detection-on-Windows.patch b/0001-fix-EFI-detection-on-Windows.patch
index ec59fc7..e6af56f 100644
--- a/0001-fix-EFI-detection-on-Windows.patch
+++ b/0001-fix-EFI-detection-on-Windows.patch
@@ -1,7 +1,7 @@
From a6e7719bbe05993613a8de69dba14fa092144925 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Wed, 25 Dec 2013 22:36:28 +0400
-Subject: [PATCH 001/125] fix EFI detection on Windows
+Subject: [PATCH 001/140] fix EFI detection on Windows
We are on legacy BIOS if GetFirmwareEnvironmentVariable fails (returns
zero) *and* extended error information is ERROR_INVALID_FUNCTION.
@@ -39,5 +39,5 @@ index f2b9d71..d217efe 100644
platform = PLAT_BIOS;
return;
--
-1.9.0
+1.9.3
diff --git a/0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch b/0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch
index 36e531a..1e03950 100644
--- a/0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch
+++ b/0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch
@@ -1,7 +1,7 @@
From 5bda44d7f98c36f87144869ec58b518f80a69b56 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Wed, 25 Dec 2013 23:31:42 +0100
-Subject: [PATCH 002/125] * grub-core/kern/arm/cache_armv6.S: Remove
+Subject: [PATCH 002/140] * grub-core/kern/arm/cache_armv6.S: Remove
.arch directive.
As these functions are used on pre-ARMv6 CPUs as well we don't want
@@ -39,5 +39,5 @@ index 39da1df..dfaded0 100644
# define DMB mcr p15, 0, r0, c7, c10, 5
# define DSB mcr p15, 0, r0, c7, c10, 4
--
-1.9.0
+1.9.3
diff --git a/0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch b/0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch
index 5ad6d34..a9f8639 100644
--- a/0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch
+++ b/0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch
@@ -1,7 +1,7 @@
From 8ebe593c564edc8ae62086df8a1448e898ef259b Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Fri, 27 Dec 2013 03:03:32 +0000
-Subject: [PATCH 003/125] * INSTALL (Cross-compiling the GRUB): Fix some
+Subject: [PATCH 003/140] * INSTALL (Cross-compiling the GRUB): Fix some
spelling mistakes. * docs/grub.texi (Getting the source code): Likewise.
---
@@ -84,5 +84,5 @@ index c796850..7c6244c 100644
Once you have used @kbd{git clone} to fetch an initial copy of a branch, you
--
-1.9.0
+1.9.3
diff --git a/0004-NEWS-First-draft-of-2.02-entry.patch b/0004-NEWS-First-draft-of-2.02-entry.patch
index 70ebfc6..d17b22f 100644
--- a/0004-NEWS-First-draft-of-2.02-entry.patch
+++ b/0004-NEWS-First-draft-of-2.02-entry.patch
@@ -1,7 +1,7 @@
From c0e2febef52139e0e580e52f553bf3aa521e390c Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Fri, 27 Dec 2013 03:05:38 +0000
-Subject: [PATCH 004/125] * NEWS: First draft of 2.02 entry.
+Subject: [PATCH 004/140] * NEWS: First draft of 2.02 entry.
---
ChangeLog | 4 +++
@@ -150,5 +150,5 @@ index 4bb5f98..577d9fd 100644
* Appearance:
--
-1.9.0
+1.9.3
diff --git a/0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch b/0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch
index 36c3640..50c3e9f 100644
--- a/0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch
+++ b/0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch
@@ -1,7 +1,7 @@
From 9ee79da5bf54babe11178ced48470b5f09d3dda3 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Fri, 27 Dec 2013 11:20:37 +0100
-Subject: [PATCH 005/125] Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
+Subject: [PATCH 005/140] Merge branch 'master' of git.sv.gnu.org:/srv/git/grub
Conflicts:
ChangeLog
@@ -39,5 +39,5 @@ index 82dc61d..da3c2df 100644
* grub-core/osdep/windows/platform.c (get_platform): Fix EFI
--
-1.9.0
+1.9.3
diff --git a/0006-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch b/0006-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
index 7e5dff0..d9b0924 100644
--- a/0006-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
+++ b/0006-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
@@ -1,7 +1,7 @@
From 94763697f5f33614b7bd6da91707a27b6872b750 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Sat, 28 Dec 2013 02:20:27 +0000
-Subject: [PATCH 006/125] * NEWS: The cmosclean command in fact dates back to
+Subject: [PATCH 006/140] * NEWS: The cmosclean command in fact dates back to
1.99. Remove mention of it from 2.02.
---
@@ -37,5 +37,5 @@ index 577d9fd..b74c05f 100644
coreboot.
* Improve opcode parsing in ACPI halt implementation.
--
-1.9.0
+1.9.3
diff --git a/0007-remove-unused-error.h-from-kern-emu-misc.c.patch b/0007-remove-unused-error.h-from-kern-emu-misc.c.patch
index ffa8bfc..77988d0 100644
--- a/0007-remove-unused-error.h-from-kern-emu-misc.c.patch
+++ b/0007-remove-unused-error.h-from-kern-emu-misc.c.patch
@@ -1,7 +1,7 @@
From 904bd6b3cb12977def4f940e90aca3fe557c3bb5 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Sat, 28 Dec 2013 09:01:20 +0400
-Subject: [PATCH 007/125] remove unused error.h from kern/emu/misc.c
+Subject: [PATCH 007/140] remove unused error.h from kern/emu/misc.c
Fixes compilation on mingw32, where include is apparently missing.
---
@@ -35,5 +35,5 @@ index 43471b4..bb606da 100644
#include <stdlib.h>
#include <stdint.h>
--
-1.9.0
+1.9.3
diff --git a/0008-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch b/0008-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch
index 981cf36..e3bee70 100644
--- a/0008-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch
+++ b/0008-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch
@@ -1,7 +1,7 @@
From 23cd074c57ee6f35776fd5122a050bcef6c9eef5 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sat, 28 Dec 2013 17:25:14 +0100
-Subject: [PATCH 008/125] Don't abort() on unavailable coreboot tables
+Subject: [PATCH 008/140] Don't abort() on unavailable coreboot tables
if not running on coreboot.
---
@@ -66,5 +66,5 @@ index 6b150b4..3314f02 100644
grub_video_coreboot_fb_late_init ();
--
-1.9.0
+1.9.3
diff --git a/0009-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch b/0009-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch
index 465d290..6e6f855 100644
--- a/0009-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch
+++ b/0009-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch
@@ -1,7 +1,7 @@
From 3eff91e86e4df2cf8a5e1b26f98e96bf4731f526 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Mon, 30 Dec 2013 06:49:15 +0100
-Subject: [PATCH 009/125] * NEWS: Add few missing entries. Correct
+Subject: [PATCH 009/140] * NEWS: Add few missing entries. Correct
existing ones.
---
@@ -117,5 +117,5 @@ index b74c05f..49a2459 100644
* HFS string is now treated like mac-roman and not UTF-8
* HFS mtime support.
--
-1.9.0
+1.9.3
diff --git a/0010-strip-.eh_frame-section-from-arm64-efi-kernel.patch b/0010-strip-.eh_frame-section-from-arm64-efi-kernel.patch
index f957439..02fe10d 100644
--- a/0010-strip-.eh_frame-section-from-arm64-efi-kernel.patch
+++ b/0010-strip-.eh_frame-section-from-arm64-efi-kernel.patch
@@ -1,7 +1,7 @@
From 9e9507d2e1eaed4fc2ebe2959c5405687485f613 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Mon, 30 Dec 2013 12:56:19 +0000
-Subject: [PATCH 010/125] strip .eh_frame section from arm64-efi kernel
+Subject: [PATCH 010/140] strip .eh_frame section from arm64-efi kernel
Fixes grub-mkimage error "relocation 0x105 is not implemented yet."
---
@@ -35,5 +35,5 @@ index c916246..42443bc 100644
i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x9000';
--
-1.9.0
+1.9.3
diff --git a/0011-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch b/0011-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch
index eb1ad03..1026312 100644
--- a/0011-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch
+++ b/0011-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch
@@ -1,7 +1,7 @@
From 7e782c6996ee433c94fb378cbc8db0fa0f663c84 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Tue, 7 Jan 2014 10:38:54 +0400
-Subject: [PATCH 011/125] use {grub,boot}aa64.efi for boot images on AArch64
+Subject: [PATCH 011/140] use {grub,boot}aa64.efi for boot images on AArch64
According to UEFI 2.4 specification, default boot file name on AArch64
is BOOTAA64.EFI (3.4.1.1 Removable Media Boot Behavior). Also set default
@@ -33,5 +33,5 @@ index 8cfe0ea..4608b80 100644
default:
efi_file = "grub.efi";
--
-1.9.0
+1.9.3
diff --git a/0012-fix-32-bit-compilation-on-MinGW-w64.patch b/0012-fix-32-bit-compilation-on-MinGW-w64.patch
index 85ac044..7a17647 100644
--- a/0012-fix-32-bit-compilation-on-MinGW-w64.patch
+++ b/0012-fix-32-bit-compilation-on-MinGW-w64.patch
@@ -1,7 +1,7 @@
From afda7f47601f36a98074d8d21ffb640256f02267 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Tue, 7 Jan 2014 18:43:02 +0400
-Subject: [PATCH 012/125] fix 32 bit compilation on MinGW-w64
+Subject: [PATCH 012/140] fix 32 bit compilation on MinGW-w64
Use _FILE_OFFSET_BITS macro to distinguish between native MinGW and
32 bit under MinGW-64. The latter does not require fseeko/ftello
@@ -41,5 +41,5 @@ index 36615b2..79efcfa 100644
#endif
--
-1.9.0
+1.9.3
diff --git a/0013-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch b/0013-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch
index ac852ee..3b47fc4 100644
--- a/0013-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch
+++ b/0013-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch
@@ -1,7 +1,7 @@
From 9981c4e3f366b4795655368a78baa058b18711c6 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Tue, 7 Jan 2014 20:34:25 +0400
-Subject: [PATCH 013/125] Change grub-mkrescue to use bootaa64.efi too
+Subject: [PATCH 013/140] Change grub-mkrescue to use bootaa64.efi too
Also add ChangeLog entry for previous change.
---
@@ -40,5 +40,5 @@ index 317879d..0d03e55 100644
imgname);
free (imgname);
--
-1.9.0
+1.9.3
diff --git a/0014-arm64-set-correct-length-of-device-path-end-entry.patch b/0014-arm64-set-correct-length-of-device-path-end-entry.patch
index 5a323d6..5682869 100644
--- a/0014-arm64-set-correct-length-of-device-path-end-entry.patch
+++ b/0014-arm64-set-correct-length-of-device-path-end-entry.patch
@@ -1,7 +1,7 @@
From f493e0d352e1e8ff8cbafee69878d00487a04808 Mon Sep 17 00:00:00 2001
From: Leif Lindholm <leif.lindholm at linaro.org>
Date: Tue, 7 Jan 2014 17:52:50 +0000
-Subject: [PATCH 014/125] arm64: set correct length of device path end entry
+Subject: [PATCH 014/140] 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
@@ -39,5 +39,5 @@ index 9d15aad..75ad871 100644
b = grub_efi_system_table->boot_services;
status = b->load_image (0, grub_efi_image_handle,
--
-1.9.0
+1.9.3
diff --git a/0015-Makefile.util.def-grub-macbless-Change-mansection-to.patch b/0015-Makefile.util.def-grub-macbless-Change-mansection-to.patch
index 05b86e2..c4c6a52 100644
--- a/0015-Makefile.util.def-grub-macbless-Change-mansection-to.patch
+++ b/0015-Makefile.util.def-grub-macbless-Change-mansection-to.patch
@@ -1,7 +1,7 @@
From 1c0db34a9597ecccb3ad4899892fb6ff6e22304d Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Wed, 8 Jan 2014 11:05:20 +0000
-Subject: [PATCH 015/125] * Makefile.util.def (grub-macbless): Change
+Subject: [PATCH 015/140] * Makefile.util.def (grub-macbless): Change
mansection to 8.
---
@@ -35,5 +35,5 @@ index 985e76c..3c99be2 100644
common = grub-core/osdep/init.c;
common = grub-core/kern/emu/argp_common.c;
--
-1.9.0
+1.9.3
diff --git a/0016-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch b/0016-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch
index 15e0d55..e46920b 100644
--- a/0016-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch
+++ b/0016-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch
@@ -1,7 +1,7 @@
From 3aea6cc46177a90056ba60381e6387377fe40c99 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Sun, 12 Jan 2014 15:29:21 +0400
-Subject: [PATCH 016/125] add part_apple to EFI rescue image to fix missing
+Subject: [PATCH 016/140] add part_apple to EFI rescue image to fix missing
prefix
On Mac rescue image is booted from HFS+ partition, so bootpath looks like
@@ -44,5 +44,5 @@ index 0d03e55..34e0b7a 100644
if (source_dirs[GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275])
{
--
-1.9.0
+1.9.3
diff --git a/0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch b/0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch
index 6a0ac81..3226637 100644
--- a/0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch
+++ b/0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch
@@ -1,7 +1,7 @@
From a433d177585c8355c6ede67469a521d05cf1e9d7 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Fri, 17 Jan 2014 02:30:52 +0000
-Subject: [PATCH 017/125] freebsd/hostdisk.c is only ever compiled on FreeBSD
+Subject: [PATCH 017/140] freebsd/hostdisk.c is only ever compiled on FreeBSD
* grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Remove
redundant preprocessor conditional.
@@ -44,5 +44,5 @@ index bd5fddb..eb202dc 100644
return ret;
}
--
-1.9.0
+1.9.3
diff --git a/0018-Prefer-more-portable-test-1-constructs.patch b/0018-Prefer-more-portable-test-1-constructs.patch
index 2502c37..3174a8f 100644
--- a/0018-Prefer-more-portable-test-1-constructs.patch
+++ b/0018-Prefer-more-portable-test-1-constructs.patch
@@ -1,7 +1,7 @@
From 4ec08b960f6de1190dea9fe7e6ab3b4b249840e5 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Fri, 17 Jan 2014 15:24:50 +0000
-Subject: [PATCH 018/125] Prefer more portable test(1) constructs
+Subject: [PATCH 018/140] Prefer more portable test(1) constructs
* util/grub.d/00_header.in (make_timeout): Use && rather than test
-a.
@@ -105,5 +105,5 @@ index 0470e66..7cf8487 100644
continue
fi
--
-1.9.0
+1.9.3
diff --git a/0019-NEWS-Add-few-missing-entries.patch b/0019-NEWS-Add-few-missing-entries.patch
index 54998df..ac0e461 100644
--- a/0019-NEWS-Add-few-missing-entries.patch
+++ b/0019-NEWS-Add-few-missing-entries.patch
@@ -1,7 +1,7 @@
From e18da008f74a3c5f27a191e4f7be80c02a49f2fe Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sat, 18 Jan 2014 16:31:10 +0100
-Subject: [PATCH 019/125] * NEWS: Add few missing entries.
+Subject: [PATCH 019/140] * NEWS: Add few missing entries.
---
ChangeLog | 4 ++++
@@ -96,5 +96,5 @@ index 49a2459..a61df94 100644
improvements to the build system.
* Remove variable length arrays.
--
-1.9.0
+1.9.3
diff --git a/0020-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch b/0020-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch
index f685e43..4ca20ea 100644
--- a/0020-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch
+++ b/0020-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch
@@ -1,7 +1,7 @@
From 29c96f00677e1dd2a9df4de645a7f5fab7b736a1 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sat, 18 Jan 2014 16:41:47 +0100
-Subject: [PATCH 020/125] * grub-core/kern/efi/efi.c: Ensure that the
+Subject: [PATCH 020/140] * grub-core/kern/efi/efi.c: Ensure that the
result starts with / and has no //.
---
@@ -86,5 +86,5 @@ index b253141..b9eb1ab 100644
return name;
}
--
-1.9.0
+1.9.3
diff --git a/0021-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch b/0021-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch
index 53ee84b..fe4bb48 100644
--- a/0021-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch
+++ b/0021-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch
@@ -1,7 +1,7 @@
From fa9e3a9aa30988c2339e9d05c81b5d91534f4049 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sat, 18 Jan 2014 16:43:29 +0100
-Subject: [PATCH 021/125] * util/grub-mount.c: Extend GCC warning
+Subject: [PATCH 021/140] * util/grub-mount.c: Extend GCC warning
workaround to grub-mount.
---
@@ -43,5 +43,5 @@ index 118881e..19de2e6 100644
static const char *root = NULL;
grub_device_t dev = NULL;
--
-1.9.0
+1.9.3
diff --git a/0022-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch b/0022-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch
index c920419..e73ecb3 100644
--- a/0022-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch
+++ b/0022-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch
@@ -1,7 +1,7 @@
From 3bea802b45b9c98f70753370522fa6e47ba8966b Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Sat, 18 Jan 2014 19:50:54 +0400
-Subject: [PATCH 022/125] reintroduce BUILD_LDFLAGS for the cross-compile case
+Subject: [PATCH 022/140] reintroduce BUILD_LDFLAGS for the cross-compile case
This allows providing separate LDFLAGS for build and host environments, which
are not necessary the same for cross-compile case. In particular, it allows
@@ -149,5 +149,5 @@ index 1b3142d..13b7979 100644
# trigtables.c
--
-1.9.0
+1.9.3
diff --git a/0023-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch b/0023-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch
index ba94774..58c02ae 100644
--- a/0023-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch
+++ b/0023-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch
@@ -1,7 +1,7 @@
From ac660e42875162e599f50c085cb646c633cf376d Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sat, 18 Jan 2014 16:57:35 +0100
-Subject: [PATCH 023/125] * grub-core/term/terminfo.c: Recognize keys
+Subject: [PATCH 023/140] * grub-core/term/terminfo.c: Recognize keys
F1-F12.
---
@@ -151,5 +151,5 @@ index 3d48b19..f0d3e3d 100644
}
#undef CONTINUE_READ
--
-1.9.0
+1.9.3
diff --git a/0024-Fix-ChangeLog-date.patch b/0024-Fix-ChangeLog-date.patch
index f0d7981..06fb0b6 100644
--- a/0024-Fix-ChangeLog-date.patch
+++ b/0024-Fix-ChangeLog-date.patch
@@ -1,7 +1,7 @@
From 6e5cf6b00fa82e5a02135ea5e21230ee44c72087 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Sat, 18 Jan 2014 20:01:16 +0400
-Subject: [PATCH 024/125] Fix ChangeLog date
+Subject: [PATCH 024/140] Fix ChangeLog date
---
ChangeLog | 2 +-
@@ -21,5 +21,5 @@ index bdfbf44..fcbf220 100644
* configure.ac: Add support for BUILD_LDFLAGS.
* Makefile.am: Use BUILD_LDFLAGS for build time programs here ...
--
-1.9.0
+1.9.3
diff --git a/0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch b/0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch
index 97ef9e7..56c23c1 100644
--- a/0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch
+++ b/0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch
@@ -1,7 +1,7 @@
From bb3e1a1e8448f3ea9489b5ebfcec799196bc862f Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Sat, 18 Jan 2014 20:04:11 +0400
-Subject: [PATCH 025/125] Use _W64 to detect MinGW W64-32 instead of
+Subject: [PATCH 025/140] Use _W64 to detect MinGW W64-32 instead of
_FILE_OFFSET_BITS
In 94cee4a4c201bb506377b2c26e072eee8cb19d6f I overlooked that config.h
@@ -43,5 +43,5 @@ index 79efcfa..bf6451b 100644
#define ftello ftello64
#endif
--
-1.9.0
+1.9.3
diff --git a/0026-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch b/0026-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch
index 54f73dc..7518aed 100644
--- a/0026-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch
+++ b/0026-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch
@@ -1,7 +1,7 @@
From 5ac7afd762d11b4c91d5756222c3abf5862203de Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Sat, 18 Jan 2014 20:41:24 +0400
-Subject: [PATCH 026/125] add BUILD_EXEEXT support to fix make clean on Windows
+Subject: [PATCH 026/140] add BUILD_EXEEXT support to fix make clean on Windows
Add $(BUILD_EXEEXT) to ensure files are removed. Also add CLEANFILES where
appropriate.
@@ -170,5 +170,5 @@ index 13b7979..826b3dd 100644
# XXX Use Automake's LEX & YACC support
--
-1.9.0
+1.9.3
diff --git a/0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch b/0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch
index 8ba4dc3..b4390bd 100644
--- a/0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch
+++ b/0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch
@@ -1,7 +1,7 @@
From 09194ac15b3c348cbf147e8ea27b982b57a7a778 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Sat, 18 Jan 2014 21:22:57 +0400
-Subject: [PATCH 027/125] fix include loop on MinGW due to libintl.h pulling
+Subject: [PATCH 027/140] fix include loop on MinGW due to libintl.h pulling
stdio.h
In file included from ./include/grub/dl.h:23:0,
@@ -277,5 +277,5 @@ index d393da7..8cc331d 100644
struct grub_procfs_entry
{
--
-1.9.0
+1.9.3
diff --git a/0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch b/0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch
index 24777e9..af6128d 100644
--- a/0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch
+++ b/0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch
@@ -1,7 +1,7 @@
From 9cbb9fc3d79e449affe7ed5e104aa828b72ad2cd Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sat, 18 Jan 2014 19:26:40 +0100
-Subject: [PATCH 028/125] * grub-core/commands/macbless.c: Rename FILE
+Subject: [PATCH 028/140] * grub-core/commands/macbless.c: Rename FILE
and DIR to avoid conflicts.
Reported by: Andrey Borzenkov.
@@ -57,5 +57,5 @@ index c521083..4724edd 100644
static grub_err_t
--
-1.9.0
+1.9.3
diff --git a/0029-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch b/0029-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch
index fa05502..9f3e9a9 100644
--- a/0029-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch
+++ b/0029-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch
@@ -1,7 +1,7 @@
From 6c3fa2da4fd22c3ebda0c6cf69f97d578c04e704 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym at gentoo.org>
Date: Sat, 18 Jan 2014 19:41:15 +0100
-Subject: [PATCH 029/125] * Makefile.util.def: Link grub-ofpathname with
+Subject: [PATCH 029/140] * Makefile.util.def: Link grub-ofpathname with
zfs libs.
---
@@ -35,5 +35,5 @@ index 83df212..a286a89 100644
program = {
--
-1.9.0
+1.9.3
diff --git a/0030-Makefile.am-default_payload.elf-Add-modules.patch b/0030-Makefile.am-default_payload.elf-Add-modules.patch
index 73a5e73..393835b 100644
--- a/0030-Makefile.am-default_payload.elf-Add-modules.patch
+++ b/0030-Makefile.am-default_payload.elf-Add-modules.patch
@@ -1,7 +1,7 @@
From 3f6bd432acbf2244e6f4b83dd3a259392b10afb6 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sat, 18 Jan 2014 19:43:19 +0100
-Subject: [PATCH 030/125] * Makefile.am (default_payload.elf): Add
+Subject: [PATCH 030/140] * Makefile.am (default_payload.elf): Add
modules multiboot cbmemc linux16 gzio echo help.
---
@@ -38,5 +38,5 @@ index aa526f5..97c062d 100644
windowsdir=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows
--
-1.9.0
+1.9.3
diff --git a/0031-fix-removal-of-cpu-machine-links-on-mingw-msys.patch b/0031-fix-removal-of-cpu-machine-links-on-mingw-msys.patch
index 7714277..45e6e7c 100644
--- a/0031-fix-removal-of-cpu-machine-links-on-mingw-msys.patch
+++ b/0031-fix-removal-of-cpu-machine-links-on-mingw-msys.patch
@@ -1,7 +1,7 @@
From d0cf0d7dcd4813a168d2bd94ec77ee0ae8ff860e Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Sat, 18 Jan 2014 22:48:04 +0400
-Subject: [PATCH 031/125] fix removal of {cpu,machine} links on mingw/msys
+Subject: [PATCH 031/140] fix removal of {cpu,machine} links on mingw/msys
At least on Windows 2003 using "ln -s dir1 dir2" in msys shell succeeds,
but results in what looks like hard link. Subsequent "rm -f dir2" (e.g.
@@ -51,5 +51,5 @@ index 32d5477..b2bb88d 100644
[link_dir=yes
else
--
-1.9.0
+1.9.3
diff --git a/0032-grub-core-normal-main.c-read_config_file-Buffer-conf.patch b/0032-grub-core-normal-main.c-read_config_file-Buffer-conf.patch
index 440afe6..923ad67 100644
--- a/0032-grub-core-normal-main.c-read_config_file-Buffer-conf.patch
+++ b/0032-grub-core-normal-main.c-read_config_file-Buffer-conf.patch
@@ -1,7 +1,7 @@
From 221f6e1ac22f66881276d4cb012d588ecfb17e47 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sat, 18 Jan 2014 19:54:09 +0100
-Subject: [PATCH 032/125] * grub-core/normal/main.c (read_config_file):
+Subject: [PATCH 032/140] * grub-core/normal/main.c (read_config_file):
Buffer config file. Reduces boot time.
---
@@ -64,5 +64,5 @@ index c36663f..3a926fc 100644
if (ctmp)
old_file = grub_strdup (ctmp);
--
-1.9.0
+1.9.3
diff --git a/0033-util-grub-install.c-Fix-a-typo.patch b/0033-util-grub-install.c-Fix-a-typo.patch
index 1c25056..736a5b3 100644
--- a/0033-util-grub-install.c-Fix-a-typo.patch
+++ b/0033-util-grub-install.c-Fix-a-typo.patch
@@ -1,7 +1,7 @@
From d353b169aa6b2a9cd03d0c2987da7da059aa6f99 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sat, 18 Jan 2014 20:02:51 +0100
-Subject: [PATCH 033/125] * util/grub-install.c: Fix a typo.
+Subject: [PATCH 033/140] * util/grub-install.c: Fix a typo.
---
ChangeLog | 4 ++++
@@ -36,5 +36,5 @@ index 4608b80..5903f34 100644
if (disk_module && grub_strcmp (disk_module, "ata") == 0)
--
-1.9.0
+1.9.3
diff --git a/0034-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch b/0034-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch
index 447ccbf..5e3f686 100644
--- a/0034-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch
+++ b/0034-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch
@@ -1,7 +1,7 @@
From 85cc4b1abfed85fd8504da4acc391d5936de2812 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Sat, 18 Jan 2014 23:15:40 +0400
-Subject: [PATCH 034/125] use MODULE_FILES for genemuinit* instead of MOD_FILES
+Subject: [PATCH 034/140] use MODULE_FILES for genemuinit* instead of MOD_FILES
MinGW native nm does not support ELF binaries.
---
@@ -87,5 +87,5 @@ index 6b83f59..a99a15d 100644
fi
done
--
-1.9.0
+1.9.3
diff --git a/0035-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch b/0035-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch
index 329d654..ef422f1 100644
--- a/0035-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch
+++ b/0035-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch
@@ -1,7 +1,7 @@
From 97fca4331e317b0491912c3cf3d02a9fac96c419 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Fri, 17 Jan 2014 02:28:46 +0000
-Subject: [PATCH 035/125] Ignore EPERM when modifying kern.geom.debugflags
+Subject: [PATCH 035/140] Ignore EPERM when modifying kern.geom.debugflags
Many tests fail when run as a non-root user on FreeBSD. The failures
all amount to an inability to open files using grub_util_fd_open,
@@ -54,5 +54,5 @@ index eb202dc..6145d07 100644
ret = open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR);
--
-1.9.0
+1.9.3
diff --git a/0036-change-stop-condition-to-avoid-infinite-loops.patch b/0036-change-stop-condition-to-avoid-infinite-loops.patch
index 8d5841a..0060de5 100644
--- a/0036-change-stop-condition-to-avoid-infinite-loops.patch
+++ b/0036-change-stop-condition-to-avoid-infinite-loops.patch
@@ -1,7 +1,7 @@
From 547d1e84df5d57c7600ead4556d43d5dbbe33c4b Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
Date: Tue, 21 Jan 2014 10:49:39 -0200
-Subject: [PATCH 036/125] change stop condition to avoid infinite loops
+Subject: [PATCH 036/140] change stop condition to avoid infinite loops
In net/net.c there is a while (1) that only exits if there is a stop
condition and more then 10 packages or if there is no package received.
@@ -48,5 +48,5 @@ index 0e57e93..56355f3 100644
/* Maybe should be better have a fixed number of packets for each card
and just mark them as used and not used. */
--
-1.9.0
+1.9.3
diff --git a/0037-increase-network-try-interval-gradually.patch b/0037-increase-network-try-interval-gradually.patch
index 45ad186..937d114 100644
--- a/0037-increase-network-try-interval-gradually.patch
+++ b/0037-increase-network-try-interval-gradually.patch
@@ -1,7 +1,7 @@
From d3652ff33623d842fc4422ffd98e4303795e9519 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
Date: Tue, 21 Jan 2014 11:03:51 -0200
-Subject: [PATCH 037/125] increase network try interval gradually
+Subject: [PATCH 037/140] increase network try interval gradually
* grub-core/net/arp.c (grub_net_arp_send_request): Increase network try
interval gradually.
@@ -107,5 +107,5 @@ index de6259e..0e0a605 100644
#endif /* ! GRUB_NET_HEADER */
--
-1.9.0
+1.9.3
diff --git a/0038-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch b/0038-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
index 9b9fa29..793d836 100644
--- a/0038-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
+++ b/0038-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
@@ -1,7 +1,7 @@
From 90d83cda679fef485f7bb1a318bd682c4eb86cb4 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Tue, 21 Jan 2014 19:29:33 +0400
-Subject: [PATCH 038/125] look for DejaVu also in /usr/share/fonts/truetype
+Subject: [PATCH 038/140] look for DejaVu also in /usr/share/fonts/truetype
It is installed in this path on openSUSE.
---
@@ -35,5 +35,5 @@ index cf3de3b..120263e 100644
DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
break 2
--
-1.9.0
+1.9.3
diff --git a/0039-Show-detected-path-to-DejaVuSans-in-configure-summar.patch b/0039-Show-detected-path-to-DejaVuSans-in-configure-summar.patch
index 921115c..ec0bd9f 100644
--- a/0039-Show-detected-path-to-DejaVuSans-in-configure-summar.patch
+++ b/0039-Show-detected-path-to-DejaVuSans-in-configure-summar.patch
@@ -1,7 +1,7 @@
From 3e02e2fbd2089645ac2c482dad59318394b62252 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Tue, 21 Jan 2014 19:41:11 +0400
-Subject: [PATCH 039/125] Show detected path to DejaVuSans in configure summary
+Subject: [PATCH 039/140] Show detected path to DejaVuSans in configure summary
---
ChangeLog | 1 +
@@ -33,5 +33,5 @@ index 120263e..8888c2f 100644
echo starfield theme: No "($starfield_excuse)"
fi
--
-1.9.0
+1.9.3
diff --git a/0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch b/0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch
index 1f6eb9f..9e026fd 100644
--- a/0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch
+++ b/0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch
@@ -1,7 +1,7 @@
From 6e9483ee94033f4bb7b9a17bd032c4af4479abc0 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Tue, 21 Jan 2014 20:54:09 +0400
-Subject: [PATCH 040/125] add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime
+Subject: [PATCH 040/140] add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime
files
Not all toolkits provide static libraries. This patch enables creation of self
@@ -58,5 +58,5 @@ index 97c062d..f02ae0a 100644
EXTRA_DIST += linguas.sh
--
-1.9.0
+1.9.3
diff --git a/0041-util-grub-install.c-write_to_disk-Add-an-info-messag.patch b/0041-util-grub-install.c-write_to_disk-Add-an-info-messag.patch
index 0ca62f0..edddec1 100644
--- a/0041-util-grub-install.c-write_to_disk-Add-an-info-messag.patch
+++ b/0041-util-grub-install.c-write_to_disk-Add-an-info-messag.patch
@@ -1,7 +1,7 @@
From 100e7015f7dcf2cee0c4ddbbd7498a67bac695d0 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Thu, 23 Jan 2014 12:05:36 +0000
-Subject: [PATCH 041/125] * util/grub-install.c (write_to_disk): Add an info
+Subject: [PATCH 041/140] * util/grub-install.c (write_to_disk): Add an info
message.
---
@@ -34,5 +34,5 @@ index 5903f34..787dc90 100644
core_size, core_img);
free (core_img);
--
-1.9.0
+1.9.3
diff --git a/0042-util-grub-install.c-List-available-targets.patch b/0042-util-grub-install.c-List-available-targets.patch
index 8a12d3b..ffd5e2b 100644
--- a/0042-util-grub-install.c-List-available-targets.patch
+++ b/0042-util-grub-install.c-List-available-targets.patch
@@ -1,7 +1,7 @@
From d25ddbcafa537525f606938df0e500c50a5e93e1 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Fri, 24 Jan 2014 18:09:25 +0100
-Subject: [PATCH 042/125] * util/grub-install.c: List available targets.
+Subject: [PATCH 042/140] * util/grub-install.c: List available targets.
---
ChangeLog | 4 ++++
@@ -105,5 +105,5 @@ index 787dc90..2e6226a 100644
return xasprintf (text, program_name, GRUB_BOOT_DIR_NAME "/" GRUB_DIR_NAME);
default:
--
-1.9.0
+1.9.3
diff --git a/0043-Fix-several-translatable-strings.patch b/0043-Fix-several-translatable-strings.patch
index 0795545..261609c 100644
--- a/0043-Fix-several-translatable-strings.patch
+++ b/0043-Fix-several-translatable-strings.patch
@@ -1,7 +1,7 @@
From 2cd73ec6b2efeaff2bdcd40cce0cd3145d9e07d0 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Fri, 24 Jan 2014 18:20:27 +0100
-Subject: [PATCH 043/125] Fix several translatable strings.
+Subject: [PATCH 043/140] Fix several translatable strings.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -74,5 +74,5 @@ index 5e944c2..f4fda6d 100644
{"output", 'o', N_("FILE"), 0, N_("write output to FILE [default=stdout]."), 0},
{"isolinux", 'i', 0, 0, N_("assume input is an isolinux configuration file."), 0},
--
-1.9.0
+1.9.3
diff --git a/0044-do-not-set-default-prefix-in-grub-mkimage.patch b/0044-do-not-set-default-prefix-in-grub-mkimage.patch
index dbbeb1f..38eebef 100644
--- a/0044-do-not-set-default-prefix-in-grub-mkimage.patch
+++ b/0044-do-not-set-default-prefix-in-grub-mkimage.patch
@@ -1,7 +1,7 @@
From 2b2a550c14e70d17af4140e64d08022ed170f0c8 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Sat, 25 Jan 2014 19:54:51 +0400
-Subject: [PATCH 044/125] do not set default prefix in grub-mkimage
+Subject: [PATCH 044/140] do not set default prefix in grub-mkimage
Default prefix is likely wrong on Unix and completely wrong on Windows.
Let caller set it explicitly to avoid any ambiguity.
@@ -71,5 +71,5 @@ index a2bd4c1..1e0bcf1 100644
arguments.memdisk, arguments.pubkeys,
arguments.npubkeys, arguments.config,
--
-1.9.0
+1.9.3
diff --git a/0045-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch b/0045-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch
index fef1a66..e7e7a8f 100644
--- a/0045-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch
+++ b/0045-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch
@@ -1,7 +1,7 @@
From 90efd351fa4f81df97473e1bb8c8234a801f8ebe Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar at gmail.com>
Date: Sat, 25 Jan 2014 21:49:41 +0400
-Subject: [PATCH 045/125] fix Mingw W64-32 cross compile failure due to printf
+Subject: [PATCH 045/140] fix Mingw W64-32 cross compile failure due to printf
redefinition in libintl.h
In file included from util/misc.c:36:0:
@@ -104,5 +104,5 @@ index 63ebb90..2b3322d 100644
f.close ()
fw.close ()
--
-1.9.0
+1.9.3
diff --git a/0046-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch b/0046-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch
index 60e2354..73ee63e 100644
--- a/0046-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch
+++ b/0046-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch
@@ -1,7 +1,7 @@
From c18e39b667adb11624f3f4162c1342b76712d655 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sun, 26 Jan 2014 02:36:05 +0100
-Subject: [PATCH 046/125] * grub-core/term/serial.c
+Subject: [PATCH 046/140] * grub-core/term/serial.c
(grub_serial_register): Fix invalid free. Ensure that pointers are
inited to NULL and that pointers are not accessed after free.
@@ -56,5 +56,5 @@ index b581a76..c9b5574 100644
}
--
-1.9.0
+1.9.3
diff --git a/0047-grub-install-support-for-partitioned-partx-loop-devi.patch b/0047-grub-install-support-for-partitioned-partx-loop-devi.patch
index 913dc28..81d0786 100644
--- a/0047-grub-install-support-for-partitioned-partx-loop-devi.patch
+++ b/0047-grub-install-support-for-partitioned-partx-loop-devi.patch
@@ -1,7 +1,7 @@
From c889057e089d69bd187c8ba134c9669247744628 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym at gentoo.org>
Date: Sun, 26 Jan 2014 02:56:04 +0100
-Subject: [PATCH 047/125] grub-install: support for partitioned partx
+Subject: [PATCH 047/140] grub-install: support for partitioned partx
loop devices.
* grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Detect
@@ -51,5 +51,5 @@ index 772de0a..19581d3 100644
return path;
--
-1.9.0
+1.9.3
diff --git a/0048-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch b/0048-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch
index 036b300..4b50475 100644
--- a/0048-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch
+++ b/0048-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch
@@ -1,7 +1,7 @@
From 379cbd6233fe227544ff3073b60b295fe841b654 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sun, 26 Jan 2014 03:31:10 +0100
-Subject: [PATCH 048/125] * grub-core/term/at_keyboard.c: Tolerate
+Subject: [PATCH 048/140] * grub-core/term/at_keyboard.c: Tolerate
missing keyboard.
---
@@ -36,5 +36,5 @@ index f5071ce..b4257e8 100644
{
e0_received = 1;
--
-1.9.0
+1.9.3
diff --git a/0049-.gitignore-add-missing-files-and-.exe-variants.patch b/0049-.gitignore-add-missing-files-and-.exe-variants.patch
index dfc08c5..4421197 100644
--- a/0049-.gitignore-add-missing-files-and-.exe-variants.patch
+++ b/0049-.gitignore-add-missing-files-and-.exe-variants.patch
@@ -1,7 +1,7 @@
From 58ca3abc65a64d950d6da8b473e91f16d410f1ac Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
Date: Wed, 29 Jan 2014 13:26:00 -0200
-Subject: [PATCH 049/125] .gitignore: add missing files and .exe variants.
+Subject: [PATCH 049/140] .gitignore: add missing files and .exe variants.
---
.gitignore | 7 +++++++
@@ -30,5 +30,5 @@ index d37d4a6..a49f5f1 100644
2013-12-14 Vladimir Serbinenko <phcoder at gmail.com>
--
-1.9.0
+1.9.3
diff --git a/0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch b/0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch
index 3863f89..1b7ac9b 100644
--- a/0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch
+++ b/0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch
@@ -1,7 +1,7 @@
From f21c40f33c95d908cee32a5063f285d22574a507 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Wed, 29 Jan 2014 23:41:48 +0100
-Subject: [PATCH 050/125] * util/grub-mkfont.c: Downgrade warnings about
+Subject: [PATCH 050/140] * util/grub-mkfont.c: Downgrade warnings about
unhandled features to debug.
---
@@ -73,5 +73,5 @@ index 3cb02ad..3de07ee 100644
}
}
--
-1.9.0
+1.9.3
diff --git a/0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch b/0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch
index d411536..e65fd49 100644
--- a/0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch
+++ b/0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch
@@ -1,7 +1,7 @@
From 5795341bb64a4e101d7c067d688b19a41dd50662 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Wed, 29 Jan 2014 23:43:25 +0100
-Subject: [PATCH 051/125] * grub-core/disk/ahci.c: Do not enable I/O
+Subject: [PATCH 051/140] * grub-core/disk/ahci.c: Do not enable I/O
decoding and keep enabling busmaster for the end.
---
@@ -53,5 +53,5 @@ index 0b13fb8..18c1327 100644
if (adevs[i])
{
--
-1.9.0
+1.9.3
diff --git a/0052-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch b/0052-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch
index 50eb17d..2dd4902 100644
--- a/0052-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch
+++ b/0052-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch
@@ -1,7 +1,7 @@
From 50cb0018044359180aa57e6aa7ec944def83bbcc Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Wed, 29 Jan 2014 23:45:18 +0100
-Subject: [PATCH 052/125] * grub-core/disk/ahci.c: Allocate and clean
+Subject: [PATCH 052/140] * grub-core/disk/ahci.c: Allocate and clean
space for all possible 32 slots to avoid pointing to uninited area.
---
@@ -51,5 +51,5 @@ index 18c1327..d63fd09 100644
= grub_dma_get_phys (adevs[i]->command_table_chunk);
--
-1.9.0
+1.9.3
diff --git a/0053-grub-core-disk-ahci.c-Add-safety-cleanups.patch b/0053-grub-core-disk-ahci.c-Add-safety-cleanups.patch
index 56562d1..2e61f07 100644
--- a/0053-grub-core-disk-ahci.c-Add-safety-cleanups.patch
+++ b/0053-grub-core-disk-ahci.c-Add-safety-cleanups.patch
@@ -1,7 +1,7 @@
From 3f00de9c207fb4b3f9e45fd775650404ce087aac Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Wed, 29 Jan 2014 23:46:17 +0100
-Subject: [PATCH 053/125] * grub-core/disk/ahci.c: Add safety cleanups.
+Subject: [PATCH 053/140] * grub-core/disk/ahci.c: Add safety cleanups.
---
ChangeLog | 4 ++++
@@ -58,5 +58,5 @@ index d63fd09..643e691 100644
while ((dev->hba->ports[dev->port].command & GRUB_AHCI_HBA_PORT_CMD_CR))
if (grub_get_time_ms () > endtime)
--
-1.9.0
+1.9.3
diff --git a/0054-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch b/0054-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch
index 7976cd7..1b9c5a1 100644
--- a/0054-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch
+++ b/0054-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch
@@ -1,7 +1,7 @@
From 5e8c619b17cdf70b30d37412738b149d80874c28 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Wed, 29 Jan 2014 23:49:51 +0100
-Subject: [PATCH 054/125] * grub-core/disk/ahci.c: Properly handle
+Subject: [PATCH 054/140] * grub-core/disk/ahci.c: Properly handle
transactions with no transferred data.
---
@@ -50,5 +50,5 @@ index 643e691..fdd40c6 100644
| (parms->write ? GRUB_AHCI_CONFIG_WRITE : GRUB_AHCI_CONFIG_READ)
| (parms->taskfile.cmd == 8 ? (1 << 8) : 0);
--
-1.9.0
+1.9.3
diff --git a/0055-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch b/0055-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch
index a287d35..3bfe1d5 100644
--- a/0055-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch
+++ b/0055-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch
@@ -1,7 +1,7 @@
From 45dd39fb467d061a550113fd5e5431209f0db73c Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Wed, 29 Jan 2014 23:50:49 +0100
-Subject: [PATCH 055/125] * grub-core/disk/ahci.c: Increase timeout.
+Subject: [PATCH 055/140] * grub-core/disk/ahci.c: Increase timeout.
Some SSDs take up to 7 seconds to recover if last poweroff was bad.
---
@@ -38,5 +38,5 @@ index fdd40c6..5e4a639 100644
if (grub_get_time_ms () > endtime)
{
--
-1.9.0
+1.9.3
diff --git a/0056-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch b/0056-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch
index 9e4b89a..3d92347 100644
--- a/0056-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch
+++ b/0056-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch
@@ -1,7 +1,7 @@
From 767cf43a2e5c738df50155cc8729ad0f57d6ab47 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Mon, 3 Feb 2014 14:34:27 +0100
-Subject: [PATCH 056/125] * util/grub-mkfont.c: Build fix for argp.h
+Subject: [PATCH 056/140] * util/grub-mkfont.c: Build fix for argp.h
with older gcc.
---
@@ -38,5 +38,5 @@ index 3de07ee..e6485b4 100644
#include <assert.h>
--
-1.9.0
+1.9.3
diff --git a/0057-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch b/0057-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch
index d7f3d71..94d3a8d 100644
--- a/0057-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch
+++ b/0057-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch
@@ -1,7 +1,7 @@
From 3365d3eb4062cee9581f3560ec3e93f8c8ababb2 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Mon, 3 Feb 2014 14:35:51 +0100
-Subject: [PATCH 057/125] * util/grub-mkrescue.c: Build fix for argp.h
+Subject: [PATCH 057/140] * util/grub-mkrescue.c: Build fix for argp.h
with older gcc.
---
@@ -40,5 +40,5 @@ index 34e0b7a..e719839 100644
#include <sys/types.h>
#include <sys/wait.h>
--
-1.9.0
+1.9.3
diff --git a/0058-add-grub_env_set_net_property-function.patch b/0058-add-grub_env_set_net_property-function.patch
index 3908353..0425eb6 100644
--- a/0058-add-grub_env_set_net_property-function.patch
+++ b/0058-add-grub_env_set_net_property-function.patch
@@ -1,7 +1,7 @@
From 533058df7c164a4d3498dfaa626923904597f162 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
Date: Tue, 4 Feb 2014 18:41:38 -0200
-Subject: [PATCH 058/125] add grub_env_set_net_property function
+Subject: [PATCH 058/140] add grub_env_set_net_property function
* grub-core/net/bootp.c: Remove set_env_limn_ro.
* grub-core/net/net.c: Add grub_env_set_net_property.
@@ -195,5 +195,5 @@ index 0e0a605..538baa3 100644
grub_net_poll_cards (unsigned time, int *stop_condition);
--
-1.9.0
+1.9.3
diff --git a/0059-add-bootpath-parser-for-open-firmware.patch b/0059-add-bootpath-parser-for-open-firmware.patch
index 8915d7b..72b29d5 100644
--- a/0059-add-bootpath-parser-for-open-firmware.patch
+++ b/0059-add-bootpath-parser-for-open-firmware.patch
@@ -1,7 +1,7 @@
From 1a768cc5a65094e19c216caf92dd190317df25fc Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
Date: Tue, 4 Feb 2014 19:00:55 -0200
-Subject: [PATCH 059/125] add bootpath parser for open firmware
+Subject: [PATCH 059/140] add bootpath parser for open firmware
It enables net boot even when there is no bootp/dhcp server.
@@ -207,5 +207,5 @@ index dc54bea..8e42513 100644
/* Maps a device alias to a pathname. */
extern grub_ieee1275_phandle_t EXPORT_VAR(grub_ieee1275_chosen);
--
-1.9.0
+1.9.3
diff --git a/0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch b/0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch
index 62e41dc..4cdfbc9 100644
--- a/0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch
+++ b/0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch
@@ -1,7 +1,7 @@
From 7f4e3839c9b872f0981e1ecdecfa2bd91065f99c Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Thu, 20 Feb 2014 10:11:43 +0100
-Subject: [PATCH 060/125] * grub-core/disk/ahci.c: Ignore NPORTS field
+Subject: [PATCH 060/140] * grub-core/disk/ahci.c: Ignore NPORTS field
and rely on PI exclusively.
---
@@ -36,5 +36,5 @@ index 5e4a639..89365cd 100644
grub_dprintf ("ahci", "%d AHCI ports, PI = 0x%x\n", nports,
hba->ports_implemented);
--
-1.9.0
+1.9.3
diff --git a/0061-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch b/0061-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch
index 2fda096..5e4e8a7 100644
--- a/0061-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch
+++ b/0061-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch
@@ -1,7 +1,7 @@
From c65d7e05498edecd560753768114b574f7c3543d Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Fri, 28 Feb 2014 09:47:57 +0100
-Subject: [PATCH 061/125] * grub-core/kern/i386/coreboot/mmap.c: Filter
+Subject: [PATCH 061/140] * grub-core/kern/i386/coreboot/mmap.c: Filter
out 0xa0000-0x100000 region.
---
@@ -78,5 +78,5 @@ index 1197975..4d29f6b 100644
return 0;
--
-1.9.0
+1.9.3
diff --git a/0062-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch b/0062-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch
index 1ea10c7..ba0f20b 100644
--- a/0062-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch
+++ b/0062-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch
@@ -1,7 +1,7 @@
From 4530afc725782bbb92d4681fc338acebc4604b45 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Fri, 28 Feb 2014 09:48:57 +0100
-Subject: [PATCH 062/125] * grub-core/loader/i386/multiboot_mbi.c
+Subject: [PATCH 062/140] * grub-core/loader/i386/multiboot_mbi.c
(grub_multiboot_make_mbi): Limit location to 640K.
---
@@ -38,5 +38,5 @@ index 7431aa4..f10c087 100644
GRUB_RELOCATOR_PREFERENCE_NONE, 0);
if (err)
--
-1.9.0
+1.9.3
diff --git a/0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch b/0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch
index a6ca9dd..b1682fd 100644
--- a/0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch
+++ b/0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch
@@ -1,7 +1,7 @@
From e85cc7078e669509d3a22c4e76f94cdd53335fff Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Fri, 28 Feb 2014 09:50:47 +0100
-Subject: [PATCH 063/125] * grub-core/mmap/i386/uppermem.c (lower_hook)
+Subject: [PATCH 063/140] * grub-core/mmap/i386/uppermem.c (lower_hook)
[COREBOOT]: Ignore low tables for low memory calculations.
---
@@ -43,5 +43,5 @@ index bd8b429..a6be989 100644
}
--
-1.9.0
+1.9.3
diff --git a/0064-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch b/0064-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch
index 4df3110..b22b446 100644
--- a/0064-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch
+++ b/0064-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch
@@ -1,7 +1,7 @@
From 37e3b5e42930e8cd4e801e4203dc2fde335b4b10 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Fri, 28 Feb 2014 10:07:11 +0100
-Subject: [PATCH 064/125] * grub-core/kern/i386/pc/mmap.c: Fallback to
+Subject: [PATCH 064/140] * grub-core/kern/i386/pc/mmap.c: Fallback to
EISA memory map if E820 failed to return any regions.
---
@@ -84,5 +84,5 @@ index 8009e83..f1375f3 100644
grub_uint32_t eisa_mmap = grub_get_eisa_mmap ();
--
-1.9.0
+1.9.3
diff --git a/0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch b/0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch
index 2f67767..e677487 100644
--- a/0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch
+++ b/0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch
@@ -1,7 +1,7 @@
From 1cdf2c717c0f4a2efac0e5dc8b5c564f930c537a Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Fri, 28 Feb 2014 10:50:05 +0100
-Subject: [PATCH 065/125] * include/grub/i386/openbsd_bootarg.h: Add
+Subject: [PATCH 065/140] * include/grub/i386/openbsd_bootarg.h: Add
addr and frequency fields. * grub-core/loader/i386/bsd.c
(grub_cmd_openbsd): Fill addr field.
MIME-Version: 1.0
@@ -66,5 +66,5 @@ index 01ca486..9ebe6b4 100644
struct grub_openbsd_bootarg_pcibios
--
-1.9.0
+1.9.3
diff --git a/0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch b/0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch
index 454dc2d..aaa6858 100644
--- a/0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch
+++ b/0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch
@@ -1,7 +1,7 @@
From 2a20b05871d51635060ab58c1b63ac2ee9f8a359 Mon Sep 17 00:00:00 2001
From: Nikunj A Dadhania <nikunj at linux.vnet.ibm.com>
Date: Thu, 20 Mar 2014 16:57:12 +0530
-Subject: [PATCH 066/125] ieee1275: check for IBM pseries emulated machine
+Subject: [PATCH 066/140] ieee1275: check for IBM pseries emulated machine
is_qemu is not being set lead to disabling of feature like
GRUB_IEEE1275_FLAG_HAS_CURSORONOFF. This resulted in cursor not being
@@ -29,5 +29,5 @@ index d92ae14..3e12e6b 100644
if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0)
grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
--
-1.9.0
+1.9.3
diff --git a/0067-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch b/0067-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch
index 6bff740..40a4965 100644
--- a/0067-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch
+++ b/0067-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch
@@ -1,7 +1,7 @@
From 530b22a1c04a08fbdb4dcbc3d34bc610af17cc68 Mon Sep 17 00:00:00 2001
From: Fu Wei <fu.wei at linaro.org>
Date: Wed, 26 Mar 2014 08:13:07 +0100
-Subject: [PATCH 067/125] * grub-core/loader/arm64/linux.c: Remove
+Subject: [PATCH 067/140] * grub-core/loader/arm64/linux.c: Remove
redundant "0x".
---
@@ -35,5 +35,5 @@ index 65129c2..f1d10a1 100644
}
--
-1.9.0
+1.9.3
diff --git a/0068-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch b/0068-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch
index fc4a44f..a50a45f 100644
--- a/0068-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch
+++ b/0068-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch
@@ -1,7 +1,7 @@
From 5d1749ea5730be5c9c32228461b784317a500f4b Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Wed, 26 Mar 2014 08:48:30 +0100
-Subject: [PATCH 068/125] * grub-core/lib/relocator.c: Fix the case when
+Subject: [PATCH 068/140] * grub-core/lib/relocator.c: Fix the case when
end of leftover is used.
---
@@ -35,5 +35,5 @@ index 9f9770b..cb11ea5 100644
&= ((1 << (8 - (start % 8))) - 1);
grub_memset (lo->freebytes + (offstart + 7) / 8, 0,
--
-1.9.0
+1.9.3
diff --git a/0069-Fix-grub-probe-0-option.patch b/0069-Fix-grub-probe-0-option.patch
index 3483987..5070e96 100644
--- a/0069-Fix-grub-probe-0-option.patch
+++ b/0069-Fix-grub-probe-0-option.patch
@@ -1,7 +1,7 @@
From fdf24f98bc9e4632bfe7f280872cbbf40942ae7b Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Mon, 31 Mar 2014 13:51:17 +0100
-Subject: [PATCH 069/125] Fix grub-probe -0 option
+Subject: [PATCH 069/140] Fix grub-probe -0 option
* util/grub-probe,c (options): Make -0 work again (broken by
conversion to argp).
@@ -51,5 +51,5 @@ index 1f3b59f..80509be 100644
/* Free resources. */
--
-1.9.0
+1.9.3
diff --git a/0070-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch b/0070-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch
index 0e46c75..d79df32 100644
--- a/0070-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch
+++ b/0070-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch
@@ -1,7 +1,7 @@
From 0a65563c2b355c0eb7412b46f015556691f1b5d1 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Mon, 31 Mar 2014 14:48:33 +0100
-Subject: [PATCH 070/125] Fix partmap, cryptodisk, and abstraction handling in
+Subject: [PATCH 070/140] Fix partmap, cryptodisk, and abstraction handling in
grub-mkconfig.
Commit 588744d0dc655177d5883bdcb8f72ff5160109ed caused grub-mkconfig
@@ -362,5 +362,5 @@ index 80509be..ecb7b6b 100644
continue;
}
--
-1.9.0
+1.9.3
diff --git a/0071-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch b/0071-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch
index 7d631ad..100e67f 100644
--- a/0071-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch
+++ b/0071-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch
@@ -1,7 +1,7 @@
From bd2125649cbeae60a5caff05d5a39c88a4e6eff6 Mon Sep 17 00:00:00 2001
From: Thomas Falcon <tlfalcon at linux.vnet.ibm.com>
Date: Mon, 31 Mar 2014 15:32:30 +0100
-Subject: [PATCH 071/125] btrfs: fix get_root key comparison failures due to
+Subject: [PATCH 071/140] btrfs: fix get_root key comparison failures due to
endianness
* grub-core/fs/btrfs.c (get_root): Convert
@@ -40,5 +40,5 @@ index 89666b6..f7b6c15 100644
key_in.type = GRUB_BTRFS_ITEM_TYPE_ROOT_ITEM;
err = lower_bound (data, &key_in, &key_out,
--
-1.9.0
+1.9.3
diff --git a/0072-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch b/0072-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch
index 8438558..bd06735 100644
--- a/0072-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch
+++ b/0072-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch
@@ -1,7 +1,7 @@
From c3d9e64a61d17e57ef941a6a46e5a148c51c8519 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Thu, 3 Apr 2014 21:31:12 +0200
-Subject: [PATCH 072/125] * grub-core/osdep/linux/getroot.c
+Subject: [PATCH 072/140] * grub-core/osdep/linux/getroot.c
(grub_util_part_to_disk): Support NVMe device names.
---
@@ -51,5 +51,5 @@ index 19581d3..7007193 100644
return path;
--
-1.9.0
+1.9.3
diff --git a/0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch b/0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch
index d55bd61..d38b0fe 100644
--- a/0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch
+++ b/0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch
@@ -1,7 +1,7 @@
From cb2cfc87fad111a539e9645f6a96d0a89a28c8ab Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Fri, 4 Apr 2014 07:58:42 +0200
-Subject: [PATCH 073/125] Replace few instances of memcmp/memcpy in the code
+Subject: [PATCH 073/140] Replace few instances of memcmp/memcpy in the code
that should be grub_memcmp/grub_memcpy.
---
@@ -98,5 +98,5 @@ index 19985f0..41ef910 100644
else
{
--
-1.9.0
+1.9.3
diff --git a/0074-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch b/0074-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch
index 7a21954..f371ab1 100644
--- a/0074-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch
+++ b/0074-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch
@@ -1,7 +1,7 @@
From 91152c6e2944e9ad3583482140f8991b972fec08 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Fri, 4 Apr 2014 08:02:38 +0200
-Subject: [PATCH 074/125] * include/grub/libgcc.h: Remove ctzsi2 and ctzdi2.
+Subject: [PATCH 074/140] * include/grub/libgcc.h: Remove ctzsi2 and ctzdi2.
They're no longer pulled from libgcc.
---
@@ -43,5 +43,5 @@ index fdc6611..97233d7 100644
#ifdef HAVE__RESTGPR_14_X
void EXPORT_FUNC (_restgpr_14_x) (void);
--
-1.9.0
+1.9.3
diff --git a/0075-Add-missing-endif.patch b/0075-Add-missing-endif.patch
index 620dc59..f51502a 100644
--- a/0075-Add-missing-endif.patch
+++ b/0075-Add-missing-endif.patch
@@ -1,7 +1,7 @@
From fb1b02802aa368f43c8d0a871e017c14cb39b180 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Fri, 4 Apr 2014 08:11:15 +0200
-Subject: [PATCH 075/125] Add missing #endif
+Subject: [PATCH 075/140] Add missing #endif
---
include/grub/libgcc.h | 1 +
@@ -20,5 +20,5 @@ index 97233d7..8e93b67 100644
#ifdef HAVE__RESTGPR_14_X
void EXPORT_FUNC (_restgpr_14_x) (void);
--
-1.9.0
+1.9.3
diff --git a/0076-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch b/0076-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch
index 157678a..7b0a30d 100644
--- a/0076-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch
+++ b/0076-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch
@@ -1,7 +1,7 @@
From fb62186fefaca6b302eb61081bb6281042ff7283 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sun, 6 Apr 2014 00:44:44 +0200
-Subject: [PATCH 076/125] * grub-core/lib/syslinux_parse.c: Fix timeout
+Subject: [PATCH 076/140] * grub-core/lib/syslinux_parse.c: Fix timeout
quoting.
---
@@ -35,5 +35,5 @@ index 21fa175..6bc504b 100644
if (err)
return err;
--
-1.9.0
+1.9.3
diff --git a/0077-Improve-LVM-logical_volumes-string-matching.patch b/0077-Improve-LVM-logical_volumes-string-matching.patch
index 30bf96c..12100e1 100644
--- a/0077-Improve-LVM-logical_volumes-string-matching.patch
+++ b/0077-Improve-LVM-logical_volumes-string-matching.patch
@@ -1,7 +1,7 @@
From d576e05a7bfe25413f70b54f671f305397bacf5e Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Thu, 10 Apr 2014 14:42:41 +0100
-Subject: [PATCH 077/125] Improve LVM "logical_volumes" string matching
+Subject: [PATCH 077/140] Improve LVM "logical_volumes" string matching
* grub-core/disk/lvm.c (grub_lvm_detect): Search for
"logical_volumes" block a little more accurately.
@@ -41,5 +41,5 @@ index 483c17e..862a966 100644
/* And add all the lvs to the volume group. */
while (1)
--
-1.9.0
+1.9.3
diff --git a/0078-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch b/0078-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch
index 82792e1..387cbe9 100644
--- a/0078-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch
+++ b/0078-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch
@@ -1,7 +1,7 @@
From 0942ce33c5b88d85a6b81f4b3dd75c32fdf21978 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Thu, 10 Apr 2014 16:54:33 +0100
-Subject: [PATCH 078/125] Tolerate devices with no filesystem UUID returned by
+Subject: [PATCH 078/140] Tolerate devices with no filesystem UUID returned by
os-prober
* util/grub.d/30_os-prober.in: Tolerate devices with no filesystem
@@ -79,5 +79,5 @@ index 7cf8487..6f38c82 100644
hurd)
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
--
-1.9.0
+1.9.3
diff --git a/0079-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch b/0079-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch
index 33e156a..0cab331 100644
--- a/0079-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch
+++ b/0079-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch
@@ -1,7 +1,7 @@
From 42c1756fd0ff7d94dcc8e9be2e429a2a976f6d41 Mon Sep 17 00:00:00 2001
From: Piotr Krysiuk <piotras at gmail.com>
Date: Sun, 20 Apr 2014 15:58:45 +0200
-Subject: [PATCH 079/125] Allow loading old kernels by placing GDT in
+Subject: [PATCH 079/140] Allow loading old kernels by placing GDT in
conventional memory.
---
@@ -45,5 +45,5 @@ index d2a1b27..ffaf25f 100644
if (err)
return err;
--
-1.9.0
+1.9.3
diff --git a/0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch b/0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch
index 964b51d..6943e6e 100644
--- a/0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch
+++ b/0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch
@@ -1,7 +1,7 @@
From ec4609b70a7deebf6381297aae95dd4bf05bd008 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Sun, 20 Apr 2014 16:12:41 +0200
-Subject: [PATCH 080/125] * grub-core/kern/misc.c (__bzero): Don't
+Subject: [PATCH 080/140] * grub-core/kern/misc.c (__bzero): Don't
compile in GRUB_UTIL.
Reported by: Yves Blusseau <blusseau at zetam.org>.
@@ -39,5 +39,5 @@ index 54db2e1..c5c815d 100644
__bzero (void *s, grub_size_t n)
{
--
-1.9.0
+1.9.3
diff --git a/0081-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch b/0081-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch
index e3454c5..1e89d64 100644
--- a/0081-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch
+++ b/0081-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch
@@ -1,7 +1,7 @@
From 4a307e8fe1298f88641a40c8a8008363aa4b9c17 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Mon, 12 May 2014 10:01:48 +0200
-Subject: [PATCH 081/125] * grub-core/commands/verify.c
+Subject: [PATCH 081/140] * grub-core/commands/verify.c
(grub_pubkey_open): Fix memdisk check.
---
@@ -36,5 +36,5 @@ index a9dfd88..6349ccf 100644
fsuf = grub_malloc (grub_strlen (filename) + sizeof (".sig"));
if (!fsuf)
--
-1.9.0
+1.9.3
diff --git a/0082-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch b/0082-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch
index 2b92647..a65bb26 100644
--- a/0082-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch
+++ b/0082-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch
@@ -1,7 +1,7 @@
From 61fdf8bebdeaed4b601f0eca847282780380191f Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder at gmail.com>
Date: Thu, 15 May 2014 14:36:48 +0200
-Subject: [PATCH 082/125] * grub-core/commands/verify.c
+Subject: [PATCH 082/140] * grub-core/commands/verify.c
(grub_pubkey_open): Trust procfs.
---
@@ -39,5 +39,5 @@ index 6349ccf..525bdd1 100644
fsuf = grub_malloc (grub_strlen (filename) + sizeof (".sig"));
if (!fsuf)
--
-1.9.0
+1.9.3
diff --git a/0083-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch b/0083-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch
index ea807fd..ab79e12 100644
--- a/0083-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch
+++ b/0083-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch
@@ -1,7 +1,7 @@
From 473348e663de53939fc077a1e1ef262405712dd8 Mon Sep 17 00:00:00 2001
From: Trevor Woerner <trevor.woerner at linaro.org>
Date: Sat, 21 Jun 2014 20:26:47 +0200
-Subject: [PATCH 083/125] * util/grub-gen-asciih.c (add_glyph): Fix
+Subject: [PATCH 083/140] * util/grub-gen-asciih.c (add_glyph): Fix
uninitialised variable.
---
@@ -69,5 +69,5 @@ index e01447a..e35dcb7 100644
if (glyph.width == 8 && glyph.height == 16
--
-1.9.0
+1.9.3
diff --git a/0084-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch b/0084-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch
index 02e54c7..9ce7923 100644
--- a/0084-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch
+++ b/0084-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch
@@ -1,7 +1,7 @@
From 9de53cc99ce4c8e404e645443d07324bd9cfc157 Mon Sep 17 00:00:00 2001
From: Stephane Rochoy <sheda>
Date: Sun, 22 Jun 2014 01:34:57 +0200
-Subject: [PATCH 084/125] * grub-core/commands/efi/lsefisystab.c
+Subject: [PATCH 084/140] * grub-core/commands/efi/lsefisystab.c
(grub_cmd_lsefisystab): Show EFI system table physical address.
---
@@ -35,5 +35,5 @@ index eda8c5f..8717db9 100644
st->hdr.signature, st->hdr.revision);
{
--
-1.9.0
+1.9.3
diff --git a/0085-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch b/0085-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch
index 0ea46b8..7e1091e 100644
--- a/0085-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch
+++ b/0085-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch
@@ -1,7 +1,7 @@
From 3be166827cecb977ad47ac4d3d89ec92688307a4 Mon Sep 17 00:00:00 2001
From: Stephane Rochoy <sheda>
Date: Sun, 22 Jun 2014 01:35:52 +0200
-Subject: [PATCH 085/125] * grub-core/loader/i386/bsd.c
+Subject: [PATCH 085/140] * grub-core/loader/i386/bsd.c
(grub_netbsd_boot): Pass pointer to EFI system table.
---
@@ -68,5 +68,5 @@ index e48c19b..9b4f460 100644
+
#endif
--
-1.9.0
+1.9.3
diff --git a/0086-util-grub-install.c-Fix-handling-of-disk-module.patch b/0086-util-grub-install.c-Fix-handling-of-disk-module.patch
index 3256788..100c45c 100644
--- a/0086-util-grub-install.c-Fix-handling-of-disk-module.patch
+++ b/0086-util-grub-install.c-Fix-handling-of-disk-module.patch
@@ -1,7 +1,7 @@
From d45ed8a6bf7c0c0abacb268da1f6d569743f16a0 Mon Sep 17 00:00:00 2001
From: Glenn Washburn <development at efficientek.com>
Date: Sun, 22 Jun 2014 01:45:11 +0200
-Subject: [PATCH 086/125] * util/grub-install.c: Fix handling of
+Subject: [PATCH 086/140] * util/grub-install.c: Fix handling of
--disk-module.
---
@@ -43,5 +43,5 @@ index e9c6a46..7d61c32 100644
"This option is only available on BIOS target."), 2},
{"no-nvram", OPTION_NO_NVRAM, 0, 0,
--
-1.9.0
+1.9.3
diff --git a/0087-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch b/0087-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch
index 7b41e25..24af60e 100644
--- a/0087-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch
+++ b/0087-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch
@@ -2,7 +2,7 @@ From a9c472a7eeec6816868dbccce6decaef3b3c62bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=9F=D0=B5=D1=85=D0=BE?=
=?UTF-8?q?=D0=B2?= <roman_pekhov>
Date: Sun, 22 Jun 2014 03:51:50 +0400
-Subject: [PATCH 087/125] * grub-core/commands/loadenv.c
+Subject: [PATCH 087/140] * grub-core/commands/loadenv.c
(check_blocklists): Fix overlap check.
---
@@ -54,5 +54,5 @@ index 6af8112..acd93d1 100644
/* This might be actually valid, but it is unbelievable that
any filesystem makes such a silly allocation. */
--
-1.9.0
+1.9.3
diff --git a/0088-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch b/0088-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
index 1f49561..c66b951 100644
--- a/0088-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
+++ b/0088-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
@@ -1,7 +1,7 @@
From e4ecf3a1f8eef683feae27ed84c85eb8aeb79e11 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Sat, 28 Dec 2013 02:20:27 +0000
-Subject: [PATCH 088/125] * NEWS: The cmosclean command in fact dates back to
+Subject: [PATCH 088/140] * NEWS: The cmosclean command in fact dates back to
1.99. Remove mention of it from 2.02.
---
@@ -22,5 +22,5 @@ index a61df94..f621c65 100644
* Use the TSC as a possible time source on i386-ieee1275.
* Merge PowerPC grub-mkrescue implementation with the common one.
--
-1.9.0
+1.9.3
diff --git a/0089-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0089-Migrate-PPC-from-Yaboot-to-Grub2.patch
index 39d07c9..7c7b498 100644
--- a/0089-Migrate-PPC-from-Yaboot-to-Grub2.patch
+++ b/0089-Migrate-PPC-from-Yaboot-to-Grub2.patch
@@ -1,7 +1,7 @@
From f01392a68f7f20bcc064a7d28e10805509701c4d Mon Sep 17 00:00:00 2001
From: Mark Hamzy <hamzy at us.ibm.com>
Date: Wed, 28 Mar 2012 14:46:41 -0500
-Subject: [PATCH 089/125] Migrate PPC from Yaboot to Grub2
+Subject: [PATCH 089/140] 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.
@@ -150,5 +150,5 @@ index 0000000..10d6658
+ terminfo -g ${X}x${Y} ${TERMINAL}
+EOF
--
-1.9.0
+1.9.3
diff --git a/0090-Add-fw_path-variable-revised.patch b/0090-Add-fw_path-variable-revised.patch
index f20abd1..ae25235 100644
--- a/0090-Add-fw_path-variable-revised.patch
+++ b/0090-Add-fw_path-variable-revised.patch
@@ -1,7 +1,7 @@
From 5bd3e1f888eeddc2575608516220ffa7b8270c7a Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
Date: Wed, 19 Sep 2012 21:22:55 -0300
-Subject: [PATCH 090/125] Add fw_path variable (revised)
+Subject: [PATCH 090/140] 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
@@ -77,5 +77,5 @@ index 3a926fc..6f4970f 100644
prefix = grub_env_get ("prefix");
if (prefix)
--
-1.9.0
+1.9.3
diff --git a/0091-Add-support-for-linuxefi.patch b/0091-Add-support-for-linuxefi.patch
index a998cdd..7032b2b 100644
--- a/0091-Add-support-for-linuxefi.patch
+++ b/0091-Add-support-for-linuxefi.patch
@@ -1,7 +1,7 @@
From 70e7bfb2caa9d0f52187b4f6e84762c6459c5903 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg at redhat.com>
Date: Tue, 10 Jul 2012 11:58:52 -0400
-Subject: [PATCH 091/125] Add support for linuxefi
+Subject: [PATCH 091/140] Add support for linuxefi
---
grub-core/Makefile.core.def | 8 +
@@ -478,5 +478,5 @@ index da0ca3b..fc36bda 100644
/* Boot parameters for Linux based on 2.6.12. This is used by the setup
--
-1.9.0
+1.9.3
diff --git a/0092-Use-linuxefi-and-initrdefi-where-appropriate.patch b/0092-Use-linuxefi-and-initrdefi-where-appropriate.patch
index 762c562..3a1f33c 100644
--- a/0092-Use-linuxefi-and-initrdefi-where-appropriate.patch
+++ b/0092-Use-linuxefi-and-initrdefi-where-appropriate.patch
@@ -1,7 +1,7 @@
From acc83cfa76a6457be73b1e748a80deb3967e2364 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Mon, 16 Jul 2012 18:57:11 -0400
-Subject: [PATCH 092/125] Use "linuxefi" and "initrdefi" where appropriate.
+Subject: [PATCH 092/140] Use "linuxefi" and "initrdefi" where appropriate.
---
util/grub.d/10_linux.in | 18 ++++++++++++++++--
@@ -46,5 +46,5 @@ index 00d1931..ad34cc0 100644
sed "s/^/$submenu_indentation/" << EOF
}
--
-1.9.0
+1.9.3
diff --git a/0093-Don-t-allow-insmod-when-secure-boot-is-enabled.patch b/0093-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
index 5e7f4c4..c27ae1f 100644
--- a/0093-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
+++ b/0093-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
@@ -1,7 +1,7 @@
From fe7b32ab9e58470fdf930d8efc7c9ebcd69e6ef3 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson at ubuntu.com>
Date: Tue, 23 Oct 2012 10:40:49 -0400
-Subject: [PATCH 093/125] Don't allow insmod when secure boot is enabled.
+Subject: [PATCH 093/140] Don't allow insmod when secure boot is enabled.
Hi,
@@ -113,5 +113,5 @@ index 9370fd5..a000c38 100644
EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
const grub_efi_device_path_t *dp2);
--
-1.9.0
+1.9.3
diff --git a/0094-Pass-x-hex-hex-straight-through-unmolested.patch b/0094-Pass-x-hex-hex-straight-through-unmolested.patch
index ed4751c..0ca3369 100644
--- a/0094-Pass-x-hex-hex-straight-through-unmolested.patch
+++ b/0094-Pass-x-hex-hex-straight-through-unmolested.patch
@@ -1,7 +1,7 @@
From a4f335a93d417c7f51f715d55ae59621fc9772ad Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Mon, 1 Oct 2012 13:24:37 -0400
-Subject: [PATCH 094/125] Pass "\x[[:hex:]][[:hex:]]" straight through
+Subject: [PATCH 094/140] Pass "\x[[:hex:]][[:hex:]]" straight through
unmolested.
---
@@ -179,5 +179,5 @@ index afd5513..8f01c1b 100644
case '$':
if (escaped)
--
-1.9.0
+1.9.3
diff --git a/0095-Fix-crash-on-http.patch b/0095-Fix-crash-on-http.patch
index 7423137..dcab15f 100644
--- a/0095-Fix-crash-on-http.patch
+++ b/0095-Fix-crash-on-http.patch
@@ -1,7 +1,7 @@
From e5a51c7c96d347cd6cbb7a2aa11f5dd7358c802a Mon Sep 17 00:00:00 2001
From: Gustavo Luiz Duarte <gustavold at linux.vnet.ibm.com>
Date: Tue, 25 Sep 2012 18:40:55 -0400
-Subject: [PATCH 095/125] Fix crash on http
+Subject: [PATCH 095/140] 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.
@@ -24,5 +24,5 @@ index 4684f8b..ef9538c 100644
if (!data->sock)
{
--
-1.9.0
+1.9.3
diff --git a/0096-IBM-client-architecture-CAS-reboot-support.patch b/0096-IBM-client-architecture-CAS-reboot-support.patch
index 4a80b5b..0eb0438 100644
--- a/0096-IBM-client-architecture-CAS-reboot-support.patch
+++ b/0096-IBM-client-architecture-CAS-reboot-support.patch
@@ -1,7 +1,7 @@
From 9d1411ffa7290c1cbdc9ee95bb5fcc5506e63e0f Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
Date: Thu, 20 Sep 2012 18:07:39 -0300
-Subject: [PATCH 096/125] IBM client architecture (CAS) reboot support
+Subject: [PATCH 096/140] IBM client architecture (CAS) reboot support
This is an implementation of IBM client architecture (CAS) reboot for GRUB.
@@ -170,5 +170,5 @@ index 8e42513..9f26c69 100644
#define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));)
--
-1.9.0
+1.9.3
diff --git a/0097-Add-vlan-tag-support.patch b/0097-Add-vlan-tag-support.patch
index 1eeffe9..3cc1013 100644
--- a/0097-Add-vlan-tag-support.patch
+++ b/0097-Add-vlan-tag-support.patch
@@ -1,7 +1,7 @@
From c987623113e2d03e80f0ba1e108bf0a800628f85 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
Date: Tue, 30 Oct 2012 15:19:39 -0200
-Subject: [PATCH 097/125] Add vlan-tag support
+Subject: [PATCH 097/140] 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
@@ -182,5 +182,5 @@ index 538baa3..a799e6b 100644
+
#endif /* ! GRUB_NET_HEADER */
--
-1.9.0
+1.9.3
diff --git a/0098-Add-X-option-to-printf-functions.patch b/0098-Add-X-option-to-printf-functions.patch
index 59e0f75..a25ee19 100644
--- a/0098-Add-X-option-to-printf-functions.patch
+++ b/0098-Add-X-option-to-printf-functions.patch
@@ -1,7 +1,7 @@
From d7aaf1651f4b36721f73331753d017d33d7879b4 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
Date: Tue, 27 Nov 2012 16:58:39 -0200
-Subject: [PATCH 098/125] Add %X option to printf functions.
+Subject: [PATCH 098/140] Add %X option to printf functions.
---
grub-core/kern/misc.c | 7 +++++--
@@ -54,5 +54,5 @@ index c5c815d..a56cfe7 100644
case 'd':
{
--
-1.9.0
+1.9.3
diff --git a/0099-DHCP-client-ID-and-UUID-options-added.patch b/0099-DHCP-client-ID-and-UUID-options-added.patch
index 4c55c1b..09f2717 100644
--- a/0099-DHCP-client-ID-and-UUID-options-added.patch
+++ b/0099-DHCP-client-ID-and-UUID-options-added.patch
@@ -1,7 +1,7 @@
From 2f3846a557e4ddf83f44e166d959ee460bedf8e1 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
Date: Tue, 27 Nov 2012 17:18:53 -0200
-Subject: [PATCH 099/125] DHCP client ID and UUID options added.
+Subject: [PATCH 099/140] DHCP client ID and UUID options added.
---
grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----
@@ -141,5 +141,5 @@ index a799e6b..59e5975 100644
};
--
-1.9.0
+1.9.3
diff --git a/0100-Search-for-specific-config-file-for-netboot.patch b/0100-Search-for-specific-config-file-for-netboot.patch
index 2c466fe..0283e69 100644
--- a/0100-Search-for-specific-config-file-for-netboot.patch
+++ b/0100-Search-for-specific-config-file-for-netboot.patch
@@ -1,7 +1,7 @@
From bf19a1e123fd09552165bd0d2b19ccf438c0a46c Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
Date: Tue, 27 Nov 2012 17:22:07 -0200
-Subject: [PATCH 100/125] Search for specific config file for netboot
+Subject: [PATCH 100/140] 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:
@@ -199,5 +199,5 @@ index 59e5975..88fc71c 100644
+
#endif /* ! GRUB_NET_HEADER */
--
-1.9.0
+1.9.3
diff --git a/0101-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0101-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
index ac9ceea..9f6c1bf 100644
--- a/0101-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+++ b/0101-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
@@ -1,7 +1,7 @@
From ddfb160353df14e9f88affe7498512a553146872 Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <grub2-owner at fedoraproject.org>
Date: Tue, 22 Jan 2013 06:31:38 +0100
-Subject: [PATCH 101/125] blscfg: add blscfg module to parse Boot Loader
+Subject: [PATCH 101/140] blscfg: add blscfg module to parse Boot Loader
Specification snippets
http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
@@ -247,5 +247,5 @@ index 0000000..4274aca
+ grub_unregister_extcmd (cmd);
+}
--
-1.9.0
+1.9.3
diff --git a/0102-Move-bash-completion-script-922997.patch b/0102-Move-bash-completion-script-922997.patch
index ce872c1..180e274 100644
--- a/0102-Move-bash-completion-script-922997.patch
+++ b/0102-Move-bash-completion-script-922997.patch
@@ -1,7 +1,7 @@
From f60046d87e55646d36c21520c5f6391c184ec8ad Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Wed, 3 Apr 2013 14:35:34 -0400
-Subject: [PATCH 102/125] Move bash completion script (#922997)
+Subject: [PATCH 102/140] Move bash completion script (#922997)
Apparently these go in a new place now.
---
@@ -22,5 +22,5 @@ index 136287c..0bcdb06 100644
$(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status
--
-1.9.0
+1.9.3
diff --git a/0103-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0103-for-ppc-reset-console-display-attr-when-clear-screen.patch
index bef0ba5..aad42fb 100644
--- a/0103-for-ppc-reset-console-display-attr-when-clear-screen.patch
+++ b/0103-for-ppc-reset-console-display-attr-when-clear-screen.patch
@@ -1,7 +1,7 @@
From e52a5b66e765740deea4dbd201ab802c408184b9 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
Date: Wed, 24 Apr 2013 10:51:48 -0300
-Subject: [PATCH 103/125] for ppc, reset console display attr when clear screen
+Subject: [PATCH 103/140] for ppc, reset console display attr when clear screen
This should fix this bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=908519
@@ -23,5 +23,5 @@ index f0d3e3d..7cb7909 100644
data->reverse_video_off = grub_strdup ("\e[m");
if (grub_strcmp ("ieee1275", str) == 0)
--
-1.9.0
+1.9.3
diff --git a/0104-Don-t-write-messages-to-the-screen.patch b/0104-Don-t-write-messages-to-the-screen.patch
index 9f4f086..b020cbc 100644
--- a/0104-Don-t-write-messages-to-the-screen.patch
+++ b/0104-Don-t-write-messages-to-the-screen.patch
@@ -1,7 +1,7 @@
From 0ee337319fc8c21da04bca1cabb51b3445dba3fd Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann at gmail.com>
Date: Wed, 15 May 2013 13:30:20 -0400
-Subject: [PATCH 104/125] Don't write messages to the screen
+Subject: [PATCH 104/140] 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
@@ -154,5 +154,5 @@ index ad34cc0..e762e1f 100644
EOF
fi
--
-1.9.0
+1.9.3
diff --git a/0105-Don-t-print-GNU-GRUB-header.patch b/0105-Don-t-print-GNU-GRUB-header.patch
index 2dcb13a..7e034d9 100644
--- a/0105-Don-t-print-GNU-GRUB-header.patch
+++ b/0105-Don-t-print-GNU-GRUB-header.patch
@@ -1,7 +1,7 @@
From e3cabcd95237fadbad8e6a0e36222d97d16b5365 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann at gmail.com>
Date: Wed, 15 May 2013 13:53:48 -0400
-Subject: [PATCH 105/125] Don't print GNU GRUB header
+Subject: [PATCH 105/140] Don't print GNU GRUB header
No one cares.
---
@@ -29,5 +29,5 @@ index 85d2a28..3777cd2 100644
static void
--
-1.9.0
+1.9.3
diff --git a/0106-Don-t-add-to-highlighted-row.patch b/0106-Don-t-add-to-highlighted-row.patch
index c2b3c81..393f63c 100644
--- a/0106-Don-t-add-to-highlighted-row.patch
+++ b/0106-Don-t-add-to-highlighted-row.patch
@@ -1,7 +1,7 @@
From c89f05d148a1a1416513d22f62d23504b35dd230 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann at gmail.com>
Date: Wed, 15 May 2013 17:49:45 -0400
-Subject: [PATCH 106/125] Don't add '*' to highlighted row
+Subject: [PATCH 106/140] Don't add '*' to highlighted row
It is already highlighted.
---
@@ -22,5 +22,5 @@ index 2ff2941..2f84fcc 100644
grub_print_ucs4_menu (unicode_title,
unicode_title + len,
--
-1.9.0
+1.9.3
diff --git a/0107-Message-string-cleanups.patch b/0107-Message-string-cleanups.patch
index e1797d2..ebc6a72 100644
--- a/0107-Message-string-cleanups.patch
+++ b/0107-Message-string-cleanups.patch
@@ -1,7 +1,7 @@
From 6c33a9b3a96a5e8c782a8eef97f5d95a3a542921 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann at gmail.com>
Date: Fri, 7 Jun 2013 11:09:04 -0400
-Subject: [PATCH 107/125] Message string cleanups
+Subject: [PATCH 107/140] Message string cleanups
Make use of terminology consistent. Remove jargon.
---
@@ -67,5 +67,5 @@ index 2f84fcc..9d20c6b 100644
{
grub_print_error ();
--
-1.9.0
+1.9.3
diff --git a/0108-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch b/0108-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
index dbb7a5f..911c39d 100644
--- a/0108-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
+++ b/0108-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
@@ -1,7 +1,7 @@
From 6227514ebbfcf1744060eb4bf1b39b669221809d Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann at gmail.com>
Date: Fri, 7 Jun 2013 14:08:23 -0400
-Subject: [PATCH 108/125] Fix border spacing now that we aren't displaying it
+Subject: [PATCH 108/140] Fix border spacing now that we aren't displaying it
---
grub-core/normal/menu_text.c | 6 +++---
@@ -28,5 +28,5 @@ index 9d20c6b..aa3454f 100644
geo->timeout_lines = 2;
--
-1.9.0
+1.9.3
diff --git a/0109-Use-the-correct-indentation-for-the-term-help-text.patch b/0109-Use-the-correct-indentation-for-the-term-help-text.patch
index 3641870..245d9d1 100644
--- a/0109-Use-the-correct-indentation-for-the-term-help-text.patch
+++ b/0109-Use-the-correct-indentation-for-the-term-help-text.patch
@@ -1,7 +1,7 @@
From 9cc9edb600ad1acc1598910ed95a8482ff3de6e2 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann at gmail.com>
Date: Fri, 7 Jun 2013 14:08:49 -0400
-Subject: [PATCH 109/125] Use the correct indentation for the term help text
+Subject: [PATCH 109/140] Use the correct indentation for the term help text
That is consistent with the menu help text
---
@@ -24,5 +24,5 @@ index 3777cd2..0da2a52 100644
grub_print_message_indented (msg_formatted, 0, 0, term);
grub_putcode ('\n', term);
--
-1.9.0
+1.9.3
diff --git a/0110-Indent-menu-entries.patch b/0110-Indent-menu-entries.patch
index b0a8038..c21770a 100644
--- a/0110-Indent-menu-entries.patch
+++ b/0110-Indent-menu-entries.patch
@@ -1,7 +1,7 @@
From e52c695e09447f6fbc51c23f1745d50c6db5c7b8 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann at gmail.com>
Date: Fri, 7 Jun 2013 14:30:55 -0400
-Subject: [PATCH 110/125] Indent menu entries
+Subject: [PATCH 110/140] Indent menu entries
---
grub-core/normal/menu_text.c | 3 ++-
@@ -22,5 +22,5 @@ index aa3454f..01b6f1c 100644
grub_print_ucs4_menu (unicode_title,
unicode_title + len,
--
-1.9.0
+1.9.3
diff --git a/0111-Fix-margins.patch b/0111-Fix-margins.patch
index 7aa4eb8..1e210f7 100644
--- a/0111-Fix-margins.patch
+++ b/0111-Fix-margins.patch
@@ -1,7 +1,7 @@
From a623d490ea6a94cc7db68400d3fea5b0c25ccb9c Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann at gmail.com>
Date: Fri, 7 Jun 2013 14:59:36 -0400
-Subject: [PATCH 111/125] Fix margins
+Subject: [PATCH 111/140] Fix margins
---
grub-core/normal/menu_text.c | 8 +++-----
@@ -33,5 +33,5 @@ index 01b6f1c..ead3391 100644
- geo->timeout_lines /* timeout */
- 1 /* empty final line */;
--
-1.9.0
+1.9.3
diff --git a/0112-Add-support-for-UEFI-operating-systems-returned-by-o.patch b/0112-Add-support-for-UEFI-operating-systems-returned-by-o.patch
index eae6afa..9a2c7f0 100644
--- a/0112-Add-support-for-UEFI-operating-systems-returned-by-o.patch
+++ b/0112-Add-support-for-UEFI-operating-systems-returned-by-o.patch
@@ -1,7 +1,7 @@
From 5980cac9e0320a3eb65e7fb73487a565d21361da Mon Sep 17 00:00:00 2001
From: Matthew Garrett <matthew.garrett at nebula.com>
Date: Wed, 12 Jun 2013 11:51:49 -0400
-Subject: [PATCH 112/125] Add support for UEFI operating systems returned by
+Subject: [PATCH 112/140] Add support for UEFI operating systems returned by
os-prober
os-prober returns UEFI operating systems in the form:
@@ -47,5 +47,5 @@ index 6f38c82..9f955ab 100644
esac
done
--
-1.9.0
+1.9.3
diff --git a/0113-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0113-Disable-GRUB-video-support-for-IBM-power-machines.patch
index 7230092..9157983 100644
--- a/0113-Disable-GRUB-video-support-for-IBM-power-machines.patch
+++ b/0113-Disable-GRUB-video-support-for-IBM-power-machines.patch
@@ -1,7 +1,7 @@
From 3fd909cbba26f1f76a64aa095937b00cd1785570 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
Date: Tue, 11 Jun 2013 15:14:05 -0300
-Subject: [PATCH 113/125] Disable GRUB video support for IBM power machines
+Subject: [PATCH 113/140] Disable GRUB video support for IBM power machines
Should fix the problem in bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=973205
@@ -61,5 +61,5 @@ index 6a21f5d..663935d 100644
extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
--
-1.9.0
+1.9.3
diff --git a/0114-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch b/0114-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
index 7ed1420..43a9bb3 100644
--- a/0114-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
+++ b/0114-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
@@ -1,7 +1,7 @@
From 6550cd89b1dee8c9ad866cbf10bf72dc2ff8a8bc Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Fri, 21 Jun 2013 14:44:08 -0400
-Subject: [PATCH 114/125] Use -2 instead of -1 for our right-hand margin, so
+Subject: [PATCH 114/140] Use -2 instead of -1 for our right-hand margin, so
linewrapping works (#976643).
Signed-off-by: Peter Jones <grub2-owner at fedoraproject.org>
@@ -23,5 +23,5 @@ index ead3391..bc1fc71 100644
geo->first_entry_y = 3; /* three empty lines*/
--
-1.9.0
+1.9.3
diff --git a/0115-Use-linux16-when-appropriate-880840.patch b/0115-Use-linux16-when-appropriate-880840.patch
index edc8da6..aeeba47 100644
--- a/0115-Use-linux16-when-appropriate-880840.patch
+++ b/0115-Use-linux16-when-appropriate-880840.patch
@@ -1,7 +1,7 @@
From ba749818b7a53df63d887cb17497f82c78ca934c Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Mon, 28 Oct 2013 10:05:07 -0400
-Subject: [PATCH 115/125] Use linux16 when appropriate (#880840)
+Subject: [PATCH 115/140] Use linux16 when appropriate (#880840)
The kernel group really would prefer that we use the 16 bit entry point
on x86 bios machines.
@@ -48,5 +48,5 @@ index e762e1f..600bfd2 100644
fi
fi
--
-1.9.0
+1.9.3
diff --git a/0116-Enable-pager-by-default.-985860.patch b/0116-Enable-pager-by-default.-985860.patch
index 23f9203..f35b8f0 100644
--- a/0116-Enable-pager-by-default.-985860.patch
+++ b/0116-Enable-pager-by-default.-985860.patch
@@ -1,7 +1,7 @@
From 26f2fbd4fb424ad097ea99578864ae526b79f732 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Mon, 28 Oct 2013 10:09:27 -0400
-Subject: [PATCH 116/125] Enable pager by default. (#985860)
+Subject: [PATCH 116/140] Enable pager by default. (#985860)
Signed-off-by: Peter Jones <pjones at redhat.com>
---
@@ -22,5 +22,5 @@ index ce2ec81..fefa7dd 100644
load_env
fi
--
-1.9.0
+1.9.3
diff --git a/0117-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch b/0117-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
index 704a0ea..4de9021 100644
--- a/0117-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
+++ b/0117-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
@@ -1,7 +1,7 @@
From 3e8fad7dba63db810a9626d472de5270b2d1bb75 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Mon, 28 Oct 2013 10:13:27 -0400
-Subject: [PATCH 117/125] F10 doesn't work on serial, so don't tell the user to
+Subject: [PATCH 117/140] F10 doesn't work on serial, so don't tell the user to
hit it (#987443)
Signed-off-by: Peter Jones <pjones at redhat.com>
@@ -23,5 +23,5 @@ index bc1fc71..6202c2a 100644
STANDARD_MARGIN, STANDARD_MARGIN,
term, dry_run);
--
-1.9.0
+1.9.3
diff --git a/0118-Don-t-say-GNU-Linux-in-generated-menus.patch b/0118-Don-t-say-GNU-Linux-in-generated-menus.patch
index 6916ba9..a489c73 100644
--- a/0118-Don-t-say-GNU-Linux-in-generated-menus.patch
+++ b/0118-Don-t-say-GNU-Linux-in-generated-menus.patch
@@ -1,7 +1,7 @@
From 03d405d9b503c435f3a975c5789a0bda9650a753 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Mon, 14 Mar 2011 14:27:42 -0400
-Subject: [PATCH 118/125] Don't say "GNU/Linux" in generated menus.
+Subject: [PATCH 118/140] Don't say "GNU/Linux" in generated menus.
---
util/grub.d/10_linux.in | 4 ++--
@@ -41,5 +41,5 @@ index a608435..79d4e38 100644
fi
--
-1.9.0
+1.9.3
diff --git a/0119-Don-t-draw-a-border-around-the-menu.patch b/0119-Don-t-draw-a-border-around-the-menu.patch
index 8569fea..8c1cf93 100644
--- a/0119-Don-t-draw-a-border-around-the-menu.patch
+++ b/0119-Don-t-draw-a-border-around-the-menu.patch
@@ -1,7 +1,7 @@
From 6bf4deb61df3ecb1e2d108195efa5ac980baa961 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann at gmail.com>
Date: Wed, 15 May 2013 16:47:33 -0400
-Subject: [PATCH 119/125] Don't draw a border around the menu
+Subject: [PATCH 119/140] Don't draw a border around the menu
It looks cleaner without it.
---
@@ -70,5 +70,5 @@ index 6202c2a..beddd7f 100644
grub_term_highlight_color = old_color_highlight;
geo->timeout_y = geo->first_entry_y + geo->num_entries
--
-1.9.0
+1.9.3
diff --git a/0120-Use-the-standard-margin-for-the-timeout-string.patch b/0120-Use-the-standard-margin-for-the-timeout-string.patch
index daccecd..76516c6 100644
--- a/0120-Use-the-standard-margin-for-the-timeout-string.patch
+++ b/0120-Use-the-standard-margin-for-the-timeout-string.patch
@@ -1,7 +1,7 @@
From a3e6964bd3242bd042489bb510e63fc0224fede4 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann at gmail.com>
Date: Fri, 7 Jun 2013 10:52:32 -0400
-Subject: [PATCH 120/125] Use the standard margin for the timeout string
+Subject: [PATCH 120/140] Use the standard margin for the timeout string
So that it aligns with the other messages
---
@@ -39,5 +39,5 @@ index beddd7f..33b208b 100644
}
--
-1.9.0
+1.9.3
diff --git a/0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch b/0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch
index 19ba050..05293d9 100644
--- a/0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch
+++ b/0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch
@@ -1,7 +1,7 @@
From a7a033ed92a55dd44314ed20f720a3d32fa9c684 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Fri, 10 Jan 2014 09:36:24 -0500
-Subject: [PATCH 121/125] Fix grub_script_execute_sourcecode() usage on ppc.
+Subject: [PATCH 121/140] Fix grub_script_execute_sourcecode() usage on ppc.
593e430c made it not take the extra argc/argv that this code still
passes it.
@@ -25,5 +25,5 @@ index 0da2a52..f66c03c 100644
}
grub_free (script);
--
-1.9.0
+1.9.3
diff --git a/0122-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0122-Add-.eh_frame-to-list-of-relocations-stripped.patch
index 449d530..921055d 100644
--- a/0122-Add-.eh_frame-to-list-of-relocations-stripped.patch
+++ b/0122-Add-.eh_frame-to-list-of-relocations-stripped.patch
@@ -1,7 +1,7 @@
From 9120cc5592d26a945ead586b71820fb9708f5062 Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <grub2-owner at fedoraproject.org>
Date: Mon, 13 Jan 2014 21:50:59 -0500
-Subject: [PATCH 122/125] Add .eh_frame to list of relocations stripped
+Subject: [PATCH 122/140] Add .eh_frame to list of relocations stripped
---
conf/Makefile.common | 2 +-
@@ -21,5 +21,5 @@ index e4c301f..6f836d8 100644
CFLAGS_MODULE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
LDFLAGS_MODULE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
--
-1.9.0
+1.9.3
diff --git a/0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch b/0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
index 4811f03..41e2a1d 100644
--- a/0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
+++ b/0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
@@ -1,7 +1,7 @@
From 1c9518bb506f8f4fa6b388571c76797705e7b566 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Tue, 14 Jan 2014 13:12:23 -0500
-Subject: [PATCH 123/125] Make 10_linux work with our changes for linux16 and
+Subject: [PATCH 123/140] Make 10_linux work with our changes for linux16 and
linuxefi on aarch64
Signed-off-by: Peter Jones <pjones at redhat.com>
@@ -81,5 +81,5 @@ index c943a1e..2b8c561 100644
for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
if test -e "${i}" ; then
--
-1.9.0
+1.9.3
diff --git a/0124-Don-t-print-during-fdt-loading-method.patch b/0124-Don-t-print-during-fdt-loading-method.patch
index 44fa894..d2783a4 100644
--- a/0124-Don-t-print-during-fdt-loading-method.patch
+++ b/0124-Don-t-print-during-fdt-loading-method.patch
@@ -1,7 +1,7 @@
From aa8c71086da3a28382b8bd958bac1c5d3b2b2be3 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Tue, 14 Jan 2014 16:15:46 -0500
-Subject: [PATCH 124/125] Don't print during fdt loading method.
+Subject: [PATCH 124/140] Don't print during fdt loading method.
Signed-off-by: Peter Jones <pjones at redhat.com>
---
@@ -23,5 +23,5 @@ index 2b8c561..acf2e0e 100644
EOF
fi
--
-1.9.0
+1.9.3
diff --git a/0125-Honor-a-symlink-when-generating-configuration-by-gru.patch b/0125-Honor-a-symlink-when-generating-configuration-by-gru.patch
index 5056519..1abbfa6 100644
--- a/0125-Honor-a-symlink-when-generating-configuration-by-gru.patch
+++ b/0125-Honor-a-symlink-when-generating-configuration-by-gru.patch
@@ -1,7 +1,7 @@
From 37ad82c4f11e293e30eea26302624691e80f19b8 Mon Sep 17 00:00:00 2001
From: Marcel Kolaja <mkolaja at redhat.com>
Date: Tue, 21 Jan 2014 10:57:08 -0500
-Subject: [PATCH 125/125] Honor a symlink when generating configuration by
+Subject: [PATCH 125/140] Honor a symlink when generating configuration by
grub2-mkconfig
Honor a symlink when generating configuration by grub2-mkconfig, so that
@@ -25,5 +25,5 @@ index ca040dd..b00f9e6 100644
fi
--
-1.9.0
+1.9.3
diff --git a/0126-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch b/0126-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
index 728e388..e6ea988 100644
--- a/0126-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
+++ b/0126-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
@@ -1,7 +1,7 @@
From ee6df3680adbe2bb8165c98ed0e39f6258cd873e Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede at redhat.com>
Date: Mon, 30 Jun 2014 14:16:46 -0400
-Subject: [PATCH 126/126] Don't munge raw spaces when we're doing our cmdline
+Subject: [PATCH 126/140] Don't munge raw spaces when we're doing our cmdline
escaping (#923374)
Signed-off-by: Peter Jones <pjones at redhat.com>
diff --git a/0127-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0127-Don-t-require-a-password-to-boot-entries-generated-b.patch
new file mode 100644
index 0000000..45031d3
--- /dev/null
+++ b/0127-Don-t-require-a-password-to-boot-entries-generated-b.patch
@@ -0,0 +1,31 @@
+From 0ce7596ab544955073318a4ed650d7d0615b933e Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Tue, 11 Feb 2014 11:14:50 -0500
+Subject: [PATCH 127/140] Don't require a password to boot entries generated by
+ grub-mkconfig.
+
+When we set a password, we just want that to mean you can't /edit/ an entry.
+
+Resolves: rhbz#1030176
+
+Signed-off-by: Peter Jones <pjones at redhat.com>
+---
+ util/grub.d/10_linux.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index acf2e0e..136abd7 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -26,7 +26,7 @@ datarootdir="@datarootdir@"
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+
+-CLASS="--class gnu-linux --class gnu --class os"
++CLASS="--class gnu-linux --class gnu --class os --unrestricted"
+
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+ OS="$(sed 's, release .*$,,g' /etc/system-release)"
+--
+1.9.3
+
diff --git a/0128-Don-t-emit-Booting-.-message.patch b/0128-Don-t-emit-Booting-.-message.patch
new file mode 100644
index 0000000..a8b73ec
--- /dev/null
+++ b/0128-Don-t-emit-Booting-.-message.patch
@@ -0,0 +1,48 @@
+From 34f60bd4d04b142667c5fc0a4287b118834e71bb Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Tue, 18 Feb 2014 09:37:49 -0500
+Subject: [PATCH 128/140] Don't emit "Booting ..." message.
+
+UI team still hates this stuff, so we're disabling it for RHEL 7.
+
+Resolves: rhbz#1023142
+
+Signed-off-by: Peter Jones <pjones at redhat.com>
+---
+ grub-core/normal/menu.c | 2 ++
+ grub-core/normal/menu_entry.c | 3 ---
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
+index b47991a..cc27c37 100644
+--- a/grub-core/normal/menu.c
++++ b/grub-core/normal/menu.c
+@@ -810,9 +810,11 @@ static void
+ notify_booting (grub_menu_entry_t entry,
+ void *userdata __attribute__((unused)))
+ {
++#if 0
+ grub_printf (" ");
+ grub_printf_ (N_("Booting `%s'"), entry->title);
+ grub_printf ("\n\n");
++#endif
+ }
+
+ /* Callback invoked when a default menu entry executed because of a timeout
+diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
+index b485df8..62e5db1 100644
+--- a/grub-core/normal/menu_entry.c
++++ b/grub-core/normal/menu_entry.c
+@@ -1156,9 +1156,6 @@ run (struct screen *screen)
+ char *dummy[1] = { NULL };
+
+ grub_cls ();
+- grub_printf (" ");
+- grub_printf_ (N_("Booting a command list"));
+- grub_printf ("\n\n");
+
+ errs_before = grub_err_printed_errors;
+
+--
+1.9.3
+
diff --git a/0129-Make-CTRL-and-ALT-keys-work-as-expected-on-EFI-syste.patch b/0129-Make-CTRL-and-ALT-keys-work-as-expected-on-EFI-syste.patch
new file mode 100644
index 0000000..fd8e557
--- /dev/null
+++ b/0129-Make-CTRL-and-ALT-keys-work-as-expected-on-EFI-syste.patch
@@ -0,0 +1,304 @@
+From fe42ce5fc9eec355027a533861dfe7f2eeefc63c Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Mon, 3 Feb 2014 15:21:46 -0500
+Subject: [PATCH 129/140] Make CTRL and ALT keys work as expected on EFI
+ systems (version 5).
+
+This is version 4.
+
+Changes from version 1:
+- handles SHIFT as a modifier
+- handles F11 and F12 keys
+- uses the handle provided by the system table to find our _EX protocol.
+
+Changes from version 2:
+- eliminate duplicate keycode translation.
+
+Changes from version 3:
+- Do not add the shift modifier for any ascii character between space
+ (0x20) and DEL (0x7f); the combination of the modifier and many of the
+ keys causes it not to be recognized at all. Specifically, if we
+ include the modifier on any querty punctuation character, i.e.
+ anything the string "~!@#$%^&*()_+{}|:\"<>?" represents in C, it stops
+ being recognized whatsoever.
+
+Changes from version 4:
+- Always initialize term->data from locate protocol (i.e. make it
+ unconditional.)
+
+Signed-off-by: Peter Jones <pjones at redhat.com>
+---
+ grub-core/term/efi/console.c | 118 +++++++++++++++++++++++++++++++++++--------
+ include/grub/efi/api.h | 65 +++++++++++++++++++++++-
+ 2 files changed, 161 insertions(+), 22 deletions(-)
+
+diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c
+index a37eb84..677eab5 100644
+--- a/grub-core/term/efi/console.c
++++ b/grub-core/term/efi/console.c
+@@ -104,26 +104,12 @@ const unsigned efi_codes[] =
+ GRUB_TERM_KEY_DC, GRUB_TERM_KEY_PPAGE, GRUB_TERM_KEY_NPAGE, GRUB_TERM_KEY_F1,
+ GRUB_TERM_KEY_F2, GRUB_TERM_KEY_F3, GRUB_TERM_KEY_F4, GRUB_TERM_KEY_F5,
+ GRUB_TERM_KEY_F6, GRUB_TERM_KEY_F7, GRUB_TERM_KEY_F8, GRUB_TERM_KEY_F9,
+- GRUB_TERM_KEY_F10, 0, 0, '\e'
++ GRUB_TERM_KEY_F10, GRUB_TERM_KEY_F10, GRUB_TERM_KEY_F11, '\e'
+ };
+
+-
+ static int
+-grub_console_getkey (struct grub_term_input *term __attribute__ ((unused)))
++grub_efi_translate_key (grub_efi_input_key_t key)
+ {
+- grub_efi_simple_input_interface_t *i;
+- grub_efi_input_key_t key;
+- grub_efi_status_t status;
+-
+- if (grub_efi_is_finished)
+- return 0;
+-
+- i = grub_efi_system_table->con_in;
+- status = efi_call_2 (i->read_key_stroke, i, &key);
+-
+- if (status != GRUB_EFI_SUCCESS)
+- return GRUB_TERM_NO_KEY;
+-
+ if (key.scan_code == 0)
+ {
+ /* Some firmware implementations use VT100-style codes against the spec.
+@@ -139,9 +125,98 @@ grub_console_getkey (struct grub_term_input *term __attribute__ ((unused)))
+ else if (key.scan_code < ARRAY_SIZE (efi_codes))
+ return efi_codes[key.scan_code];
+
++ if (key.unicode_char >= 0x20 && key.unicode_char <= 0x7f)
++ return key.unicode_char;
++
+ return GRUB_TERM_NO_KEY;
+ }
+
++static int
++grub_console_getkey_con (struct grub_term_input *term __attribute__ ((unused)))
++{
++ grub_efi_simple_input_interface_t *i;
++ grub_efi_input_key_t key;
++ grub_efi_status_t status;
++
++ i = grub_efi_system_table->con_in;
++ status = efi_call_2 (i->read_key_stroke, i, &key);
++
++ if (status != GRUB_EFI_SUCCESS)
++ return GRUB_TERM_NO_KEY;
++
++ return grub_efi_translate_key(key);
++}
++
++static int
++grub_console_getkey_ex(struct grub_term_input *term)
++{
++ grub_efi_key_data_t key_data;
++ grub_efi_status_t status;
++ grub_efi_uint32_t kss;
++ int key = -1;
++
++ grub_efi_simple_text_input_ex_interface_t *text_input = term->data;
++
++ status = efi_call_2 (text_input->read_key_stroke, text_input, &key_data);
++
++ if (status != GRUB_EFI_SUCCESS)
++ return GRUB_TERM_NO_KEY;
++
++ kss = key_data.key_state.key_shift_state;
++ key = grub_efi_translate_key(key_data.key);
++
++ if (key == GRUB_TERM_NO_KEY)
++ return GRUB_TERM_NO_KEY;
++
++ if (kss & GRUB_EFI_SHIFT_STATE_VALID)
++ {
++ if ((kss & GRUB_EFI_LEFT_SHIFT_PRESSED
++ || kss & GRUB_EFI_RIGHT_SHIFT_PRESSED)
++ && !(key >= 0x20 && key <= 0x7f))
++ key |= GRUB_TERM_SHIFT;
++ if (kss & GRUB_EFI_LEFT_ALT_PRESSED || kss & GRUB_EFI_RIGHT_ALT_PRESSED)
++ key |= GRUB_TERM_ALT;
++ if (kss & GRUB_EFI_LEFT_CONTROL_PRESSED
++ || kss & GRUB_EFI_RIGHT_CONTROL_PRESSED)
++ key |= GRUB_TERM_CTRL;
++ }
++
++ return key;
++}
++
++static grub_err_t
++grub_efi_console_input_init (struct grub_term_input *term)
++{
++ grub_efi_guid_t text_input_ex_guid =
++ GRUB_EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID;
++
++ if (grub_efi_is_finished)
++ return 0;
++
++ grub_efi_simple_text_input_ex_interface_t *text_input = term->data;
++ if (text_input)
++ return 0;
++
++ text_input = grub_efi_open_protocol(grub_efi_system_table->console_in_handler,
++ &text_input_ex_guid,
++ GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
++ term->data = (void *)text_input;
++
++ return 0;
++}
++
++static int
++grub_console_getkey (struct grub_term_input *term)
++{
++ if (grub_efi_is_finished)
++ return 0;
++
++ if (term->data)
++ return grub_console_getkey_ex(term);
++ else
++ return grub_console_getkey_con(term);
++}
++
+ static struct grub_term_coordinate
+ grub_console_getwh (struct grub_term_output *term __attribute__ ((unused)))
+ {
+@@ -243,7 +318,7 @@ grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)),
+ }
+
+ static grub_err_t
+-grub_efi_console_init (struct grub_term_output *term)
++grub_efi_console_output_init (struct grub_term_output *term)
+ {
+ grub_efi_set_text_mode (1);
+ grub_console_setcursor (term, 1);
+@@ -251,7 +326,7 @@ grub_efi_console_init (struct grub_term_output *term)
+ }
+
+ static grub_err_t
+-grub_efi_console_fini (struct grub_term_output *term)
++grub_efi_console_output_fini (struct grub_term_output *term)
+ {
+ grub_console_setcursor (term, 0);
+ grub_efi_set_text_mode (0);
+@@ -262,13 +337,14 @@ static struct grub_term_input grub_console_term_input =
+ {
+ .name = "console",
+ .getkey = grub_console_getkey,
++ .init = grub_efi_console_input_init,
+ };
+
+ static struct grub_term_output grub_console_term_output =
+ {
+ .name = "console",
+- .init = grub_efi_console_init,
+- .fini = grub_efi_console_fini,
++ .init = grub_efi_console_output_init,
++ .fini = grub_efi_console_output_fini,
+ .putchar = grub_console_putchar,
+ .getwh = grub_console_getwh,
+ .getxy = grub_console_getxy,
+@@ -291,8 +367,8 @@ grub_console_init (void)
+ return;
+ }
+
+- grub_term_register_input ("console", &grub_console_term_input);
+ grub_term_register_output ("console", &grub_console_term_output);
++ grub_term_register_input ("console", &grub_console_term_input);
+ }
+
+ void
+diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
+index e5dd543..1423403 100644
+--- a/include/grub/efi/api.h
++++ b/include/grub/efi/api.h
+@@ -111,7 +111,7 @@
+ { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
+ }
+
+-#define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \
++#define GRUB_EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \
+ { 0xdd9e7534, 0x7762, 0x4698, \
+ { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa } \
+ }
+@@ -952,6 +952,32 @@ struct grub_efi_input_key
+ };
+ typedef struct grub_efi_input_key grub_efi_input_key_t;
+
++typedef grub_efi_uint8_t grub_efi_key_toggle_state_t;
++struct grub_efi_key_state
++{
++ grub_efi_uint32_t key_shift_state;
++ grub_efi_key_toggle_state_t key_toggle_state;
++};
++typedef struct grub_efi_key_state grub_efi_key_state_t;
++
++#define GRUB_EFI_SHIFT_STATE_VALID 0x80000000
++#define GRUB_EFI_RIGHT_SHIFT_PRESSED 0x00000001
++#define GRUB_EFI_LEFT_SHIFT_PRESSED 0x00000002
++#define GRUB_EFI_RIGHT_CONTROL_PRESSED 0x00000004
++#define GRUB_EFI_LEFT_CONTROL_PRESSED 0x00000008
++#define GRUB_EFI_RIGHT_ALT_PRESSED 0x00000010
++#define GRUB_EFI_LEFT_ALT_PRESSED 0x00000020
++#define GRUB_EFI_RIGHT_LOGO_PRESSED 0x00000040
++#define GRUB_EFI_LEFT_LOGO_PRESSED 0x00000080
++#define GRUB_EFI_MENU_KEY_PRESSED 0x00000100
++#define GRUB_EFI_SYS_REQ_PRESSED 0x00000200
++
++#define GRUB_EFI_TOGGLE_STATE_VALID 0x80
++#define GRUB_EFI_KEY_STATE_EXPOSED 0x40
++#define GRUB_EFI_SCROLL_LOCK_ACTIVE 0x01
++#define GRUB_EFI_NUM_LOCK_ACTIVE 0x02
++#define GRUB_EFI_CAPS_LOCK_ACTIVE 0x04
++
+ struct grub_efi_simple_text_output_mode
+ {
+ grub_efi_int32_t max_mode;
+@@ -1294,6 +1320,43 @@ struct grub_efi_simple_input_interface
+ };
+ typedef struct grub_efi_simple_input_interface grub_efi_simple_input_interface_t;
+
++struct grub_efi_key_data {
++ grub_efi_input_key_t key;
++ grub_efi_key_state_t key_state;
++};
++typedef struct grub_efi_key_data grub_efi_key_data_t;
++
++typedef grub_efi_status_t (*grub_efi_key_notify_function_t) (
++ grub_efi_key_data_t *key_data
++ );
++
++struct grub_efi_simple_text_input_ex_interface
++{
++ grub_efi_status_t
++ (*reset) (struct grub_efi_simple_text_input_ex_interface *this,
++ grub_efi_boolean_t extended_verification);
++
++ grub_efi_status_t
++ (*read_key_stroke) (struct grub_efi_simple_text_input_ex_interface *this,
++ grub_efi_key_data_t *key_data);
++
++ grub_efi_event_t wait_for_key;
++
++ grub_efi_status_t
++ (*set_state) (struct grub_efi_simple_text_input_ex_interface *this,
++ grub_efi_key_toggle_state_t *key_toggle_state);
++
++ grub_efi_status_t
++ (*register_key_notify) (struct grub_efi_simple_text_input_ex_interface *this,
++ grub_efi_key_data_t *key_data,
++ grub_efi_key_notify_function_t key_notification_function);
++
++ grub_efi_status_t
++ (*unregister_key_notify) (struct grub_efi_simple_text_input_ex_interface *this,
++ void *notification_handle);
++};
++typedef struct grub_efi_simple_text_input_ex_interface grub_efi_simple_text_input_ex_interface_t;
++
+ struct grub_efi_simple_text_output_interface
+ {
+ grub_efi_status_t
+--
+1.9.3
+
diff --git a/0130-May-as-well-try-it.patch b/0130-May-as-well-try-it.patch
new file mode 100644
index 0000000..8a6bfcc
--- /dev/null
+++ b/0130-May-as-well-try-it.patch
@@ -0,0 +1,1962 @@
+From bd4b1ae40c743174fc0236851855dfaf6094f875 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Tue, 4 Mar 2014 11:00:23 -0500
+Subject: [PATCH 130/140] May as well try it.
+
+---
+ conf/Makefile.extra-dist | 1 -
+ configure.ac | 23 ++++++
+ docs/Makefile.am | 2 -
+ docs/man/grub-bios-setup.h2m | 6 --
+ docs/man/grub-editenv.h2m | 5 --
+ docs/man/grub-emu.h2m | 6 --
+ docs/man/grub-file.h2m | 2 -
+ docs/man/grub-fstest.h2m | 4 -
+ docs/man/grub-glue-efi.h2m | 4 -
+ docs/man/grub-install.h2m | 6 --
+ docs/man/grub-kbdcomp.h2m | 10 ---
+ docs/man/grub-macbless.h2m | 4 -
+ docs/man/grub-macho2img.h2m | 4 -
+ docs/man/grub-menulst2cfg.h2m | 4 -
+ docs/man/grub-mkconfig.h2m | 4 -
+ docs/man/grub-mkfont.h2m | 4 -
+ docs/man/grub-mkimage.h2m | 6 --
+ docs/man/grub-mklayout.h2m | 10 ---
+ docs/man/grub-mknetdir.h2m | 4 -
+ docs/man/grub-mkpasswd-pbkdf2.h2m | 4 -
+ docs/man/grub-mkrelpath.h2m | 4 -
+ docs/man/grub-mkrescue.h2m | 4 -
+ docs/man/grub-mkstandalone.h2m | 4 -
+ docs/man/grub-mount.h2m | 2 -
+ docs/man/grub-ofpathname.h2m | 4 -
+ docs/man/grub-pe2elf.h2m | 4 -
+ docs/man/grub-probe.h2m | 4 -
+ docs/man/grub-reboot.h2m | 5 --
+ docs/man/grub-render-label.h2m | 3 -
+ docs/man/grub-script-check.h2m | 4 -
+ docs/man/grub-set-default.h2m | 5 --
+ docs/man/grub-sparc64-setup.h2m | 6 --
+ docs/man/grub-syslinux2cfg.h2m | 4 -
+ gentpl.py | 5 +-
+ util/grub-bios-setup.8 | 54 +++++++++++++
+ util/grub-editenv.1 | 46 +++++++++++
+ util/grub-file.1 | 165 ++++++++++++++++++++++++++++++++++++++
+ util/grub-fstest.1 | 99 +++++++++++++++++++++++
+ util/grub-glue-efi.1 | 31 +++++++
+ util/grub-install.8 | 129 +++++++++++++++++++++++++++++
+ util/grub-kbdcomp.1 | 19 +++++
+ util/grub-macbless.1 | 22 +++++
+ util/grub-menulst2cfg.1 | 12 +++
+ util/grub-mkconfig.8 | 17 ++++
+ util/grub-mkfont.1 | 87 ++++++++++++++++++++
+ util/grub-mkimage.1 | 95 ++++++++++++++++++++++
+ util/grub-mklayout.1 | 27 +++++++
+ util/grub-mknetdir.1 | 12 +++
+ util/grub-mkpasswd-pbkdf2.1 | 27 +++++++
+ util/grub-mkrelpath.1 | 12 +++
+ util/grub-mkrescue.1 | 123 ++++++++++++++++++++++++++++
+ util/grub-mkstandalone.1 | 100 +++++++++++++++++++++++
+ util/grub-ofpathname.8 | 12 +++
+ util/grub-probe.8 | 80 ++++++++++++++++++
+ util/grub-reboot.8 | 21 +++++
+ util/grub-render-label.1 | 51 ++++++++++++
+ util/grub-script-check.1 | 21 +++++
+ util/grub-set-default.8 | 21 +++++
+ util/grub-sparc64-setup.8 | 12 +++
+ 59 files changed, 1319 insertions(+), 147 deletions(-)
+ delete mode 100644 docs/man/grub-bios-setup.h2m
+ delete mode 100644 docs/man/grub-editenv.h2m
+ delete mode 100644 docs/man/grub-emu.h2m
+ delete mode 100644 docs/man/grub-file.h2m
+ delete mode 100644 docs/man/grub-fstest.h2m
+ delete mode 100644 docs/man/grub-glue-efi.h2m
+ delete mode 100644 docs/man/grub-install.h2m
+ delete mode 100644 docs/man/grub-kbdcomp.h2m
+ delete mode 100644 docs/man/grub-macbless.h2m
+ delete mode 100644 docs/man/grub-macho2img.h2m
+ delete mode 100644 docs/man/grub-menulst2cfg.h2m
+ delete mode 100644 docs/man/grub-mkconfig.h2m
+ delete mode 100644 docs/man/grub-mkfont.h2m
+ delete mode 100644 docs/man/grub-mkimage.h2m
+ delete mode 100644 docs/man/grub-mklayout.h2m
+ delete mode 100644 docs/man/grub-mknetdir.h2m
+ delete mode 100644 docs/man/grub-mkpasswd-pbkdf2.h2m
+ delete mode 100644 docs/man/grub-mkrelpath.h2m
+ delete mode 100644 docs/man/grub-mkrescue.h2m
+ delete mode 100644 docs/man/grub-mkstandalone.h2m
+ delete mode 100644 docs/man/grub-mount.h2m
+ delete mode 100644 docs/man/grub-ofpathname.h2m
+ delete mode 100644 docs/man/grub-pe2elf.h2m
+ delete mode 100644 docs/man/grub-probe.h2m
+ delete mode 100644 docs/man/grub-reboot.h2m
+ delete mode 100644 docs/man/grub-render-label.h2m
+ delete mode 100644 docs/man/grub-script-check.h2m
+ delete mode 100644 docs/man/grub-set-default.h2m
+ delete mode 100644 docs/man/grub-sparc64-setup.h2m
+ delete mode 100644 docs/man/grub-syslinux2cfg.h2m
+ create mode 100644 util/grub-bios-setup.8
+ create mode 100644 util/grub-editenv.1
+ create mode 100644 util/grub-file.1
+ create mode 100644 util/grub-fstest.1
+ create mode 100644 util/grub-glue-efi.1
+ create mode 100644 util/grub-install.8
+ create mode 100644 util/grub-kbdcomp.1
+ create mode 100644 util/grub-macbless.1
+ create mode 100644 util/grub-menulst2cfg.1
+ create mode 100644 util/grub-mkconfig.8
+ create mode 100644 util/grub-mkfont.1
+ create mode 100644 util/grub-mkimage.1
+ create mode 100644 util/grub-mklayout.1
+ create mode 100644 util/grub-mknetdir.1
+ create mode 100644 util/grub-mkpasswd-pbkdf2.1
+ create mode 100644 util/grub-mkrelpath.1
+ create mode 100644 util/grub-mkrescue.1
+ create mode 100644 util/grub-mkstandalone.1
+ create mode 100644 util/grub-ofpathname.8
+ create mode 100644 util/grub-probe.8
+ create mode 100644 util/grub-reboot.8
+ create mode 100644 util/grub-render-label.1
+ create mode 100644 util/grub-script-check.1
+ create mode 100644 util/grub-set-default.8
+ create mode 100644 util/grub-sparc64-setup.8
+
+diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
+index 51f08c1..e914dfd 100644
+--- a/conf/Makefile.extra-dist
++++ b/conf/Makefile.extra-dist
+@@ -10,7 +10,6 @@ EXTRA_DIST += unicode
+ EXTRA_DIST += util/import_gcry.py
+ EXTRA_DIST += util/import_unicode.py
+
+-EXTRA_DIST += docs/man
+ EXTRA_DIST += docs/autoiso.cfg
+ EXTRA_DIST += docs/grub.cfg
+ EXTRA_DIST += docs/osdetect.cfg
+diff --git a/configure.ac b/configure.ac
+index 8888c2f..2632e2d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,6 +70,29 @@ grub_TRANSFORM([grub-set-default])
+ grub_TRANSFORM([grub-sparc64-setup])
+ grub_TRANSFORM([grub-render-label])
+ grub_TRANSFORM([grub-file])
++grub_TRANSFORM([grub-bios-setup.3])
++grub_TRANSFORM([grub-editenv.1])
++grub_TRANSFORM([grub-fstest.3])
++grub_TRANSFORM([grub-glue-efi.3])
++grub_TRANSFORM([grub-install.1])
++grub_TRANSFORM([grub-kbdcomp.3])
++grub_TRANSFORM([grub-menulst2cfg.1])
++grub_TRANSFORM([grub-mkconfig.1])
++grub_TRANSFORM([grub-mkfont.3])
++grub_TRANSFORM([grub-mkimage.1])
++grub_TRANSFORM([grub-mklayout.3])
++grub_TRANSFORM([grub-mknetdir.3])
++grub_TRANSFORM([grub-mkpasswd-pbkdf2.3])
++grub_TRANSFORM([grub-mkrelpath.3])
++grub_TRANSFORM([grub-mkrescue.1])
++grub_TRANSFORM([grub-mkstandalone.3])
++grub_TRANSFORM([grub-ofpathname.3])
++grub_TRANSFORM([grub-probe.3])
++grub_TRANSFORM([grub-reboot.3])
++grub_TRANSFORM([grub-render-label.3])
++grub_TRANSFORM([grub-script-check.3])
++grub_TRANSFORM([grub-set-default.1])
++grub_TRANSFORM([grub-sparc64-setup.3])
+
+ # Optimization flag. Allow user to override.
+ if test "x$TARGET_CFLAGS" = x; then
+diff --git a/docs/Makefile.am b/docs/Makefile.am
+index 93eb396..ab28f19 100644
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -5,5 +5,3 @@ info_TEXINFOS = grub.texi grub-dev.texi
+ grub_TEXINFOS = fdl.texi
+
+ EXTRA_DIST = font_char_metrics.png font_char_metrics.txt
+-
+-
+diff --git a/docs/man/grub-bios-setup.h2m b/docs/man/grub-bios-setup.h2m
+deleted file mode 100644
+index ac6ede3..0000000
+--- a/docs/man/grub-bios-setup.h2m
++++ /dev/null
+@@ -1,6 +0,0 @@
+-[NAME]
+-grub-bios-setup \- set up a device to boot using GRUB
+-[SEE ALSO]
+-.BR grub-install (8),
+-.BR grub-mkimage (1),
+-.BR grub-mkrescue (1)
+diff --git a/docs/man/grub-editenv.h2m b/docs/man/grub-editenv.h2m
+deleted file mode 100644
+index 3859d3d..0000000
+--- a/docs/man/grub-editenv.h2m
++++ /dev/null
+@@ -1,5 +0,0 @@
+-[NAME]
+-grub-editenv \- edit GRUB environment block
+-[SEE ALSO]
+-.BR grub-reboot (8),
+-.BR grub-set-default (8)
+diff --git a/docs/man/grub-emu.h2m b/docs/man/grub-emu.h2m
+deleted file mode 100644
+index ef1c000..0000000
+--- a/docs/man/grub-emu.h2m
++++ /dev/null
+@@ -1,6 +0,0 @@
+-[NAME]
+-grub-emu \- GRUB emulator
+-[SEE ALSO]
+-If you are trying to install GRUB, then you should use
+-.BR grub-install (8)
+-rather than this program.
+diff --git a/docs/man/grub-file.h2m b/docs/man/grub-file.h2m
+deleted file mode 100644
+index e09bb4d..0000000
+--- a/docs/man/grub-file.h2m
++++ /dev/null
+@@ -1,2 +0,0 @@
+-[NAME]
+-grub-file \- check file type
+diff --git a/docs/man/grub-fstest.h2m b/docs/man/grub-fstest.h2m
+deleted file mode 100644
+index 9676b15..0000000
+--- a/docs/man/grub-fstest.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-fstest \- debug tool for GRUB filesystem drivers
+-[SEE ALSO]
+-.BR grub-probe (8)
+diff --git a/docs/man/grub-glue-efi.h2m b/docs/man/grub-glue-efi.h2m
+deleted file mode 100644
+index c1c6ded..0000000
+--- a/docs/man/grub-glue-efi.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-glue-efi \- generate a fat binary for EFI
+-[DESCRIPTION]
+-grub-glue-efi processes ia32 and amd64 EFI images and glues them according to Apple format.
+diff --git a/docs/man/grub-install.h2m b/docs/man/grub-install.h2m
+deleted file mode 100644
+index 8cbbc87..0000000
+--- a/docs/man/grub-install.h2m
++++ /dev/null
+@@ -1,6 +0,0 @@
+-[NAME]
+-grub-install \- install GRUB to a device
+-[SEE ALSO]
+-.BR grub-mkconfig (8),
+-.BR grub-mkimage (1),
+-.BR grub-mkrescue (1)
+diff --git a/docs/man/grub-kbdcomp.h2m b/docs/man/grub-kbdcomp.h2m
+deleted file mode 100644
+index d81f915..0000000
+--- a/docs/man/grub-kbdcomp.h2m
++++ /dev/null
+@@ -1,10 +0,0 @@
+-[NAME]
+-grub-kbdcomp \- generate a GRUB keyboard layout file
+-[DESCRIPTION]
+-grub-kbdcomp processes a X keyboard layout description in
+-.BR keymaps (5)
+-format into a format that can be used by GRUB's
+-.B keymap
+-command.
+-[SEE ALSO]
+-.BR grub-mklayout (8)
+diff --git a/docs/man/grub-macbless.h2m b/docs/man/grub-macbless.h2m
+deleted file mode 100644
+index 0197c00..0000000
+--- a/docs/man/grub-macbless.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-macbless \- bless a mac file/directory
+-[SEE ALSO]
+-.BR grub-install (1)
+diff --git a/docs/man/grub-macho2img.h2m b/docs/man/grub-macho2img.h2m
+deleted file mode 100644
+index d79aaee..0000000
+--- a/docs/man/grub-macho2img.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-macho2img \- convert Mach-O to raw image
+-[SEE ALSO]
+-.BR grub-mkimage (1)
+diff --git a/docs/man/grub-menulst2cfg.h2m b/docs/man/grub-menulst2cfg.h2m
+deleted file mode 100644
+index c2e0055..0000000
+--- a/docs/man/grub-menulst2cfg.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-menulst2cfg \- transform legacy menu.lst into grub.cfg
+-[SEE ALSO]
+-.BR grub-mkconfig (8)
+diff --git a/docs/man/grub-mkconfig.h2m b/docs/man/grub-mkconfig.h2m
+deleted file mode 100644
+index 9b42f81..0000000
+--- a/docs/man/grub-mkconfig.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-mkconfig \- generate a GRUB configuration file
+-[SEE ALSO]
+-.BR grub-install (8)
+diff --git a/docs/man/grub-mkfont.h2m b/docs/man/grub-mkfont.h2m
+deleted file mode 100644
+index d46fe60..0000000
+--- a/docs/man/grub-mkfont.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-mkfont \- make GRUB font files
+-[SEE ALSO]
+-.BR grub-mkconfig (8)
+diff --git a/docs/man/grub-mkimage.h2m b/docs/man/grub-mkimage.h2m
+deleted file mode 100644
+index f0fbc2b..0000000
+--- a/docs/man/grub-mkimage.h2m
++++ /dev/null
+@@ -1,6 +0,0 @@
+-[NAME]
+-grub-mkimage \- make a bootable image of GRUB
+-[SEE ALSO]
+-.BR grub-install (8),
+-.BR grub-mkrescue (1),
+-.BR grub-mknetdir (8)
+diff --git a/docs/man/grub-mklayout.h2m b/docs/man/grub-mklayout.h2m
+deleted file mode 100644
+index 1e43409..0000000
+--- a/docs/man/grub-mklayout.h2m
++++ /dev/null
+@@ -1,10 +0,0 @@
+-[NAME]
+-grub-mklayout \- generate a GRUB keyboard layout file
+-[DESCRIPTION]
+-grub-mklayout processes a keyboard layout description in
+-.BR keymaps (5)
+-format into a format that can be used by GRUB's
+-.B keymap
+-command.
+-[SEE ALSO]
+-.BR grub-mkconfig (8)
+diff --git a/docs/man/grub-mknetdir.h2m b/docs/man/grub-mknetdir.h2m
+deleted file mode 100644
+index a2ef13e..0000000
+--- a/docs/man/grub-mknetdir.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-mknetdir \- prepare a GRUB netboot directory.
+-[SEE ALSO]
+-.BR grub-mkimage (1)
+diff --git a/docs/man/grub-mkpasswd-pbkdf2.h2m b/docs/man/grub-mkpasswd-pbkdf2.h2m
+deleted file mode 100644
+index 4d202f3..0000000
+--- a/docs/man/grub-mkpasswd-pbkdf2.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-mkpasswd-pbkdf2 \- generate hashed password for GRUB
+-[SEE ALSO]
+-.BR grub-mkconfig (8)
+diff --git a/docs/man/grub-mkrelpath.h2m b/docs/man/grub-mkrelpath.h2m
+deleted file mode 100644
+index d01f396..0000000
+--- a/docs/man/grub-mkrelpath.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-mkrelpath \- make a system path relative to its root
+-[SEE ALSO]
+-.BR grub-probe (8)
+diff --git a/docs/man/grub-mkrescue.h2m b/docs/man/grub-mkrescue.h2m
+deleted file mode 100644
+index a427f02..0000000
+--- a/docs/man/grub-mkrescue.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-mkrescue \- make a GRUB rescue image
+-[SEE ALSO]
+-.BR grub-mkimage (1)
+diff --git a/docs/man/grub-mkstandalone.h2m b/docs/man/grub-mkstandalone.h2m
+deleted file mode 100644
+index c773139..0000000
+--- a/docs/man/grub-mkstandalone.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-mkstandalone \- make a memdisk-based GRUB image
+-[SEE ALSO]
+-.BR grub-mkimage (1)
+diff --git a/docs/man/grub-mount.h2m b/docs/man/grub-mount.h2m
+deleted file mode 100644
+index 8d16898..0000000
+--- a/docs/man/grub-mount.h2m
++++ /dev/null
+@@ -1,2 +0,0 @@
+-[NAME]
+-grub-mount \- export GRUB filesystem with FUSE
+diff --git a/docs/man/grub-ofpathname.h2m b/docs/man/grub-ofpathname.h2m
+deleted file mode 100644
+index 74b43ee..0000000
+--- a/docs/man/grub-ofpathname.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-ofpathname \- find OpenBOOT path for a device
+-[SEE ALSO]
+-.BR grub-probe (8)
+diff --git a/docs/man/grub-pe2elf.h2m b/docs/man/grub-pe2elf.h2m
+deleted file mode 100644
+index 7ca29bd..0000000
+--- a/docs/man/grub-pe2elf.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-pe2elf \- convert PE image to ELF
+-[SEE ALSO]
+-.BR grub-mkimage (1)
+diff --git a/docs/man/grub-probe.h2m b/docs/man/grub-probe.h2m
+deleted file mode 100644
+index 6e1ffdc..0000000
+--- a/docs/man/grub-probe.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-probe \- probe device information for GRUB
+-[SEE ALSO]
+-.BR grub-fstest (1)
+diff --git a/docs/man/grub-reboot.h2m b/docs/man/grub-reboot.h2m
+deleted file mode 100644
+index e4acace..0000000
+--- a/docs/man/grub-reboot.h2m
++++ /dev/null
+@@ -1,5 +0,0 @@
+-[NAME]
+-grub-reboot \- set the default boot entry for GRUB, for the next boot only
+-[SEE ALSO]
+-.BR grub-set-default (8),
+-.BR grub-editenv (1)
+diff --git a/docs/man/grub-render-label.h2m b/docs/man/grub-render-label.h2m
+deleted file mode 100644
+index 50ae524..0000000
+--- a/docs/man/grub-render-label.h2m
++++ /dev/null
+@@ -1,3 +0,0 @@
+-[NAME]
+-grub-render-label \- generate a .disk_label for Apple Macs.
+-
+diff --git a/docs/man/grub-script-check.h2m b/docs/man/grub-script-check.h2m
+deleted file mode 100644
+index 3653682..0000000
+--- a/docs/man/grub-script-check.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-script-check \- check grub.cfg for syntax errors
+-[SEE ALSO]
+-.BR grub-mkconfig (8)
+diff --git a/docs/man/grub-set-default.h2m b/docs/man/grub-set-default.h2m
+deleted file mode 100644
+index 7945001..0000000
+--- a/docs/man/grub-set-default.h2m
++++ /dev/null
+@@ -1,5 +0,0 @@
+-[NAME]
+-grub-set-default \- set the saved default boot entry for GRUB
+-[SEE ALSO]
+-.BR grub-reboot (8),
+-.BR grub-editenv (1)
+diff --git a/docs/man/grub-sparc64-setup.h2m b/docs/man/grub-sparc64-setup.h2m
+deleted file mode 100644
+index 18f803a..0000000
+--- a/docs/man/grub-sparc64-setup.h2m
++++ /dev/null
+@@ -1,6 +0,0 @@
+-[NAME]
+-grub-sparc64-setup \- set up a device to boot using GRUB
+-[SEE ALSO]
+-.BR grub-install (8),
+-.BR grub-mkimage (1),
+-.BR grub-mkrescue (1)
+diff --git a/docs/man/grub-syslinux2cfg.h2m b/docs/man/grub-syslinux2cfg.h2m
+deleted file mode 100644
+index ad25c8a..0000000
+--- a/docs/man/grub-syslinux2cfg.h2m
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[NAME]
+-grub-syslinux2cfg \- transform syslinux config into grub.cfg
+-[SEE ALSO]
+-.BR grub-menulst2cfg (8)
+diff --git a/gentpl.py b/gentpl.py
+index bdcae1a..889cc91 100644
+--- a/gentpl.py
++++ b/gentpl.py
+@@ -792,10 +792,7 @@ def manpage(defn, adddeps):
+
+ output("if COND_MAN_PAGES\n")
+ gvar_add("man_MANS", name + "." + mansection)
+- rule(name + "." + mansection, name + " " + adddeps, """
+-chmod a+x """ + name + """
+-PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=""" + mansection + """ -i $(top_srcdir)/docs/man/""" + name + """.h2m -o $@ """ + name + """
+-""")
++ rule(name + "." + mansection, name + " " + adddeps, "cat $(top_srcdir)/util/" + name + "." + mansection + " | $(top_builddir)/config.status --file=$@:-")
+ gvar_add("CLEANFILES", name + "." + mansection)
+ output("endif\n")
+
+diff --git a/util/grub-bios-setup.8 b/util/grub-bios-setup.8
+new file mode 100644
+index 0000000..56f582b
+--- /dev/null
++++ b/util/grub-bios-setup.8
+@@ -0,0 +1,54 @@
++.TH GRUB-BIOS-SETUP 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-bios-setup\fR \(em Set up images to boot from a device.
++
++.SH SYNOPSIS
++\fBgrub-bios-setup\fR [-a | --allow-floppy] [-b | --boot-image=\fIFILE\fR]
++.RS 17
++[-c | --core-image=\fIFILE\fR] [-d | --directory=\fIDIR\fR]
++.RE
++.RS 17
++[-f | --force] [-m | --device-map=\fIFILE\fR]
++.RE
++.RS 17
++[-s | --skip-fs-probe] [-v | --verbose] \fIDEVICE\fR
++
++.SH DESCRIPTION
++You should not normally run this program directly. Use grub-install instead.
++
++.SH OPTIONS
++.TP
++\fB--allow-floppy\fR
++Make the device also bootable as a floppy. This option is the default for
++/dev/fdX devices. Some BIOSes will not boot images created with this option.
++
++.TP
++\fB--boot-image\fR=\fIFILE\fR
++Use FILE as the boot image. The default value is \fBboot.img\fR.
++
++.TP
++\fB--core-image\fR=\fIFILE\fR
++Use FILE as ther core image. The default value is \fBcore.img\fR.
++
++.TP
++\fB--directory\fR=\fIDIR\fR
++Use GRUB files in the directory DIR. The default value is \fB/boot/grub\fR.
++
++.TP
++\fB--force\fR
++Install even if problems are detected.
++
++.TP
++\fB--device-map\fR=\fIFILE\fR
++Use FILE as the device map. The default value is /boot/grub/device.map .
++
++.TP
++\fB--skip-fs-probe\fR
++Do not probe DEVICE for filesystems.
++
++.TP
++\fB--verbose\fR
++Print verbose messages.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-editenv.1 b/util/grub-editenv.1
+new file mode 100644
+index 0000000..8dad33f
+--- /dev/null
++++ b/util/grub-editenv.1
+@@ -0,0 +1,46 @@
++.TH GRUB-EDITENV 1 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-editenv\fR \(em Manage the GRUB environment block.
++
++.SH SYNOPSIS
++\fBgrub-editenv\fR [-v | --verbose] [\fIFILE\fR]
++.RS 14
++<create | list | set \fINAME\fR=\fIVALUE\fR | unset \fINAME\fR>
++
++.SH DESCRIPTION
++\fBgrub-editenv\fR is a command line tool to manage GRUB's stored environment.
++
++.SH OPTIONS
++.TP
++\fB--verbose\fR
++Print verbose messages.
++
++.TP
++\fBFILE\fR
++.RS 7
++File name to use for grub environment. Default is /boot/grub/grubenv .
++.RE
++
++.SH COMMANDS
++.TP
++\fBcreate\fR
++.RS 7
++Create a blank environment block file.
++.RE
++
++.TP
++\fBlist\fR
++.RS 7
++List the current variables.
++.RE
++
++.TP
++\fBset\fR [\fINAME\fR=\fIVALUE\fR ...]
++Set variables.
++
++.TP
++\fBunset [\fINAME\fR ...]
++Delete variables.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-file.1 b/util/grub-file.1
+new file mode 100644
+index 0000000..b29cb32
+--- /dev/null
++++ b/util/grub-file.1
+@@ -0,0 +1,165 @@
++.TH GRUB-FILE 1 "Web Feb 26 2014"
++.SH NAME
++\fBgrub-file\fR \(em Check if FILE is of specified type.
++
++.SH SYNOPSIS
++\fBgrub-file\fR (--is-i386-xen-pae-domu | --is-x86_64-xen-domu |
++.RS 11
++--is-x86-xen-dom0 | --is-x86-multiboot |
++.RE
++.RS 11
++--is-x86-multiboot2 | --is-arm-linux | --is-arm64-linux |
++.RE
++.RS 11
++--is-ia64-linux | --is-mips-linux | --is-mipsel-linux |
++.RE
++.RS 11
++--is-sparc64-linux | --is-powerpc-linux | --is-x86-linux |
++.RE
++.RS 11
++--is-x86-linux32 | --is-x86-kfreebsd | --is-i386-kfreebsd |
++.RE
++.RS 11
++--is-x86_64-kfreebsd | --is-x86-knetbsd |
++.RE
++.RS 11
++--is-i386-knetbsd | --is-x86_64-knetbsd | --is-i386-efi |
++.RE
++.RS 11
++--is-x86_64-efi | --is-ia64-efi | --is-arm64-efi |
++.RE
++.RS 11
++--is-arm-efi | --is-hibernated-hiberfil | --is-x86_64-xnu |
++.RE
++.RS 11
++--is-i386-xnu | --is-xnu-hibr | --is-x86-bios-bootsector)
++.RE
++.RS 11
++\fIFILE\fR
++
++.SH DESCRIPTION
++\fBgrub-file\fR is used to check if \fIFILE\fR is of a specified type.
++
++.SH OPTIONS
++.TP
++--is-i386-xen-pae-domu
++Check if FILE can be booted as i386 PAE Xen unprivileged guest kernel
++
++.TP
++--is-x86_64-xen-domu
++Check if FILE can be booted as x86_64 Xen unprivileged guest kernel
++
++.TP
++--is-x86-xen-dom0
++Check if FILE can be used as Xen x86 privileged guest kernel
++
++.TP
++--is-x86-multiboot
++Check if FILE can be used as x86 multiboot kernel
++
++.TP
++--is-x86-multiboot2
++Check if FILE can be used as x86 multiboot2 kernel
++
++.TP
++--is-arm-linux
++Check if FILE is ARM Linux
++
++.TP
++--is-arm64-linux
++Check if FILE is ARM64 Linux
++
++.TP
++--is-ia64-linux
++Check if FILE is IA64 Linux
++
++.TP
++--is-mips-linux
++Check if FILE is MIPS Linux
++
++.TP
++--is-mipsel-linux
++Check if FILE is MIPSEL Linux
++
++.TP
++--is-sparc64-linux
++Check if FILE is SPARC64 Linux
++
++.TP
++--is-powerpc-linux
++Check if FILE is POWERPC Linux
++
++.TP
++--is-x86-linux
++Check if FILE is x86 Linux
++
++.TP
++--is-x86-linux32
++Check if FILE is x86 Linux supporting 32-bit protocol
++
++.TP
++--is-x86-kfreebsd
++Check if FILE is x86 kFreeBSD
++
++.TP
++--is-i386-kfreebsd
++Check if FILE is i386 kFreeBSD
++
++.TP
++--is-x86_64-kfreebsd
++Check if FILE is x86_64 kFreeBSD
++
++.TP
++--is-x86-knetbsd
++Check if FILE is x86 kNetBSD
++
++.TP
++--is-i386-knetbsd
++Check if FILE is i386 kNetBSD
++
++.TP
++--is-x86_64-knetbsd
++Check if FILE is x86_64 kNetBSD
++
++.TP
++--is-i386-efi
++Check if FILE is i386 EFI file
++
++.TP
++--is-x86_64-efi
++Check if FILE is x86_64 EFI file
++
++.TP
++--is-ia64-efi
++Check if FILE is IA64 EFI file
++
++.TP
++--is-arm64-efi
++Check if FILE is ARM64 EFI file
++
++.TP
++--is-arm-efi
++Check if FILE is ARM EFI file
++
++.TP
++--is-hibernated-hiberfil
++Check if FILE is hiberfil.sys in hibernated state
++
++.TP
++--is-x86_64-xnu
++Check if FILE is x86_64 XNU (Mac OS X kernel)
++
++.TP
++--is-i386-xnu
++Check if FILE is i386 XNU (Mac OS X kernel)
++
++.TP
++--is-xnu-hibr
++Check if FILE is XNU (Mac OS X kernel) hibernated image
++
++.TP
++--is-x86-bios-bootsector
++Check if FILE is BIOS bootsector
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-fstest.1 b/util/grub-fstest.1
+new file mode 100644
+index 0000000..792fa78
+--- /dev/null
++++ b/util/grub-fstest.1
+@@ -0,0 +1,99 @@
++.TH GRUB-FSTEST 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-fstest\fR — Debug tool for GRUB's filesystem driver.
++
++.SH SYNOPSIS
++\fBgrub-fstest\fR [-c | --diskcount=\fINUM\fR] [-C | --crypto]
++.RS 13
++[-d | --debug=\fISTRING\fR] [-K | --zfs-key=\fIFILE\fR|\fIprompt\fR]
++.RE
++.RS 13
++[-n | --length=\fINUM\fR] [-r | --root=\fIDEVICE_NAME\fR]
++.RE
++.RS 13
++[-s | --skip=\fINUM\fR] [-u | --uncompress] [-v | --verbose]
++.RE
++.RS 13
++\fIIMAGE_PATH\fR <blocklist \fIFILE\fR | cat \fIFILE\fR |
++.RE
++.RS 13
++cmp \fIFILE\fR \fILOCAL\fR | cp \fIFILE\fR \fILOCAL\fR | crc \fIFILE\fR |
++.RE
++.RS 13
++hex \fIFILE\fR | ls \fIPATH\fR | xnu_uuid \fIDEVICE\fR>
++
++.SH DESCRIPTION
++\fBgrub-fstest\fR is a tool for testing GRUB's filesystem drivers. You should not normally need to run this program.
++
++.SH OPTIONS
++.TP
++\fB--diskcount\fR=\fINUM\fR
++Specify the number of input files.
++
++.TP
++\fB--crypto\fR
++Mount cryptographic devices.
++
++.TP
++\fB--debug\fR=\fISTRING\fR
++Set debug environment variable.
++
++.TP
++\fB--zfs-key\fR=\fIFILE\fR|\fIprompt\fR
++Load ZFS cryptographic key.
++
++.TP
++\fB--length\fR=\fINUM\fR
++Handle NUM bytes in output file.
++
++.TP
++\fB--root\fR=\fIDEVICE_NAME\fR
++Set root device.
++
++.TP
++\fB--skip\fR=\fINUM\fR
++Skip NUM bytes from output file.
++
++.TP
++\fB--uncompress\fR
++Uncompress data.
++
++.TP
++\fB--verbose\fR
++Print verbose messages.
++
++.SH COMMANDS
++.TP
++\fBblocklist\fR \fIFILE\fR
++Display block list of \fIFILE\fR.
++
++.TP
++\fBcat\fR \fIFILE\fR
++Display \fIFILE\fR on standard output.
++
++.TP
++\fBcmp\fR \fIFILE\fR \fILOCAL\fR
++Compare \fIFILE\fR with local file \fILOCAL\fR.
++
++.TP
++\fBcp\fR \fIFILE\fR \fILOCAL\fR
++Copy \fIFILE\fR to local file \fILOCAL\fR.
++
++.TP
++\fBcrc\fR \fIFILE\fR
++Display the CRC-32 checksum of \fIFILE\fR.
++
++.TP
++\fBhex\fR \fIFILE\fR
++Display contents of \fIFILE\fR in hexidecimal.
++
++.TP
++\fBls\fR \fIPATH\fR
++List files at \fIPATH\fR.
++
++.TP
++\fBxnu_uuid\fR \fIDEVICE\fR
++Display the XNU UUID of \fIDEVICE\fR.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-glue-efi.1 b/util/grub-glue-efi.1
+new file mode 100644
+index 0000000..72bd555
+--- /dev/null
++++ b/util/grub-glue-efi.1
+@@ -0,0 +1,31 @@
++.TH GRUB-GLUE-EFI 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-glue-efi\fR \(em Create an Apple fat EFI binary.
++
++.SH SYNOPSIS
++\fBgrub-glue-efi\fR <-3 | --input32=\fIFILE\fR> <-6 | --input64=\fIFILE\fR>
++.RS 15
++<-o | --output=\fIFILE\fR> [-v | --verbose]
++
++.SH DESCRIPTION
++\fBgrub-glue-efi\fR creates an Apple fat EFI binary from two EFI binaries.
++
++.SH OPTIONS
++.TP
++\fB--input32\fR=\fIFILE\fR
++Read 32-bit binary from \fIFILE\fR.
++
++.TP
++\fB--input64\fR=\fIFILE\fR
++Read 64-bit binary from \fIFILE\fR.
++
++.TP
++\fB--output\fR=\fIFILE\fR
++Write resulting fat binary to \fIFILE\fR.
++
++.TP
++\fB--verbose\fR
++Print verbose messages.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-install.8 b/util/grub-install.8
+new file mode 100644
+index 0000000..76272a3
+--- /dev/null
++++ b/util/grub-install.8
+@@ -0,0 +1,129 @@
++.TH GRUB-INSTALL 1 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-install\fR \(em Install GRUB on a device.
++
++.SH SYNOPSIS
++\fBgrub-install\fR [--modules=\fIMODULES\fR] [--install-modules=\fIMODULES\fR]
++.RS 14
++[--themes=\fITHEMES\fR] [--fonts=\fIFONTS\fR] [--locales=\fILOCALES\fR]
++.RE
++.RS 14
++[--compress[=\fIno\fR,\fIxz\fR,\fIgz\fR,\fIlzo\fR]] [-d | --directory=\fIDIR\fR]
++.RE
++.RS 14
++[--grub-mkimage=\fIFILE\fR] [--boot-directory=\fIDIR\fR]
++.RE
++.RS 14
++[--target=\fITARGET\fR] [--grub-setup=\fIFILE\fR]
++.RE
++.RS 14
++[--grub-mkrelpath=\fIFILE\fR] [--grub-probe=\fIFILE\fR]
++.RE
++.RS 14
++[--allow-floppy] [--recheck] [--force] [--force-file-id]
++.RE
++.RS 14
++[--disk-module=\fIMODULE\fR] [--no-nvram] [--removable]
++.RE
++.RS 14
++[--bootloader-id=\fIID\fR] [--efi-directory=\fIDIR\fR] \fIINSTALL_DEVICE\fR
++
++.SH DESCRIPTION
++\fBgrub-install\fR installs GRUB onto a device. This includes copying GRUB images into the target directory (generally \fI/boot/grub\fR), and on some platforms may also include installing GRUB onto a boot sector.
++
++.SH OPTIONS
++.TP
++\fB--modules\fR=\fIMODULES\fR\!
++Pre-load modules specified by \fIMODULES\fR.
++
++.TP
++\fB--install-modules\fR=\fIMODULES\fR
++Install only \fIMODULES\fR and their dependencies. The default is to install all available modules.
++
++.TP
++\fB--themes\fR=\fITHEMES\fR
++Install \fITHEMES\fR. The default is to install the \fIstarfield\fR theme, if available.
++
++.TP
++\fB--fonts\fR=\fIFONTS\fR
++Install \fIFONTS\fR. The default is to install the \fIunicode\fR font.
++
++.TP
++\fB--locales\fR=\fILOCALES\fR
++Install only locales listed in \fILOCALES\fR. The default is to install all available locales.
++
++.TP
++\fB--compress\fR=\fIno\fR,\fIxz\fR,\fIgz\fR,\fIlzo\fR
++Compress GRUB files using the specified compression algorithm.
++
++.TP
++\fB--directory\fR=\fIDIR\fR
++Use images and modules in \fIDIR\fR.
++
++.TP
++\fB--grub-mkimage\fR=\fIFILE\fR
++Use \fIFILE\fR as \fBgrub-mkimage\fR. The default is \fI/usr/bin/grub-mkimage\fR.
++
++.TP
++\fB--boot-directory\fR=\fIDIR\fR
++Use \fIDIR\fR as the boot directory. The default is \fI/boot\fR. GRUB will put its files in a subdirectory of this directory named \fIgrub\fR.
++
++.TP
++\fB--target\fR=\fITARGET\fR
++Install GRUB for \fITARGET\fR platform. The default is the platform \fBgrub-install\fR is running on.
++
++.TP
++\fB--grub-setup\fR=\fIFILE\fR
++Use \fIFILE\fR as \fBgrub-setup\fR. The default is \fI/usr/bin/grub-setup\fR.
++
++.TP
++\fB--grub-mkrelpath\fR=\fIFILE\fR
++Use \fIFILE\fR as \fBgrub-mkrelpath\fR. The default is \fI/usr/bin/grub-mkrelpath\fR.
++
++.TP
++\fB--grub-probe\fR=\fIFILE\fR
++Use \fIFILE\fR as \fBgrub-probe\fR. The default is \fI/usr/bin/grub-mkrelpath\fR.
++
++.TP
++\fB--allow-floppy
++Make the device also bootable as a floppy. This option is the default for /dev/fdX devices. Some BIOSes will not boot images created with this option.
++
++.TP
++\fB--recheck
++Delete any existing device map and create a new one if necessary.
++
++.TP
++\fB--force
++Install even if problems are detected.
++
++.TP
++\fB--force-file-id
++Use identifier file even if UUID is available.
++
++.TP
++\fB--disk-module\fR=\fIMODULE\fR
++Use \fIMODULE\fR for disk access. This allows you to manually specify either \fIbiosdisk\fR or \fInative\fR disk access. This option is only available on the BIOS target platform.
++
++.TP
++\fB--no-nvram
++Do not update the \fIboot-device\fR NVRAM variable. This option is only available on IEEE1275 target platforms.
++
++.TP
++\fB--removable
++Treat the target device as if it is removeable. This option is only available on the EFI target platform.
++
++.TP
++\fB--bootloader-id\fR=\fIID\fR
++Use \fIID\fR as the bootloader ID. This opption is only available on the EFI target platform.
++
++.TP
++\fB--efi-directory\fR=\fIDIR\fR
++Use \fIDIR\fR as the EFI System Partition root. This opption is only available on the EFI ta
++rget platform.
++
++.TP
++\fIINSTALL_DEVICE\fR
++Install GRUB to the block device \fIINSTALL_DEVICE\fR.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-kbdcomp.1 b/util/grub-kbdcomp.1
+new file mode 100644
+index 0000000..0bb969a
+--- /dev/null
++++ b/util/grub-kbdcomp.1
+@@ -0,0 +1,19 @@
++.TH GRUB-KBDCOMP 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-kbdcomp\fR \(em Generate a GRUB keyboard layout file.
++
++.SH SYNOPSIS
++\fBgrub-kbdcomp\fR <-o | --output=\fIFILE\fR> \fICKBMAP_ARGUMENTS\fR
++
++.SH DESCRIPTION
++\fBgrub-kbdcomp\fR processes an X keyboard layout description in
++\fBkeymaps\fR(5) format into a format that can be used by GRUB's \fBkeymap\fR
++command.
++
++.SH OPTIONS
++.TP
++\fB--output\fR=\fIFILE\fR
++Write output to \fIFILE\fR.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-macbless.1 b/util/grub-macbless.1
+new file mode 100644
+index 0000000..41a9618
+--- /dev/null
++++ b/util/grub-macbless.1
+@@ -0,0 +1,22 @@
++.TH GRUB-MACBLESS 1 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-macbless\fR \(em Mac-style bless on HFS or HFS+
++
++.SH SYNOPSIS
++\fBgrub-macbless\fR [-v | --verbose] [-p | --ppc] \fIFILE\fR | [-x | --x86] \fIFILE\fR
++
++.SH OPTIONS
++.TP
++--x86
++Bless for x86 based Macs.
++
++.TP
++--ppc
++Bless for PPC based Macs.
++
++.TP
++--verbose
++Print verbose messages.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-menulst2cfg.1 b/util/grub-menulst2cfg.1
+new file mode 100644
+index 0000000..91e2ef8
+--- /dev/null
++++ b/util/grub-menulst2cfg.1
+@@ -0,0 +1,12 @@
++.TH GRUB-MENULST2CFG 1 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-menulst2cfg\fR \(em Convert a configuration file from GRUB 0.xx to GRUB 2.xx format.
++
++.SH SYNOPSIS
++\fBgrub-menulst2cfg\fR [\fIINFILE\fR [\fIOUTFILE\fR]]
++
++.SH DESCRIPTION
++\fBgrub-menulst2cfg\fR converts a configuration file from GRUB 0.xx to the current format.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8
+new file mode 100644
+index 0000000..a2d1f57
+--- /dev/null
++++ b/util/grub-mkconfig.8
+@@ -0,0 +1,17 @@
++.TH GRUB-MKCONFIG 1 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-mkconfig\fR \(em Generate a GRUB configuration file.
++
++.SH SYNOPSIS
++\fBgrub-mkconfig\fR [-o | --output=\fIFILE\fR]
++
++.SH DESCRIPTION
++\fBgrub-mkconfig\fR generates a configuration file for GRUB.
++
++.SH OPTIONS
++.TP
++\fB--output\fR=\fIFILE\fR
++Write generated output to \fIFILE\fR.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-mkfont.1 b/util/grub-mkfont.1
+new file mode 100644
+index 0000000..3494857
+--- /dev/null
++++ b/util/grub-mkfont.1
+@@ -0,0 +1,87 @@
++.TH GRUB-MKFONT 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-mkfont\fR \(em Convert common font file formats into the PF2 format.
++
++.SH SYNOPSIS
++\fBgrub-mkfont\fR [--ascii-bitmaps] [-a | --force-autohint]
++.RS 13
++[-b | --bold] [-c | --asce=\fINUM\fR] [-d | --desc=\fINUM\fR]
++.RE
++.RS 13
++[-i | --index=\fINUM\fR] [-n | --name=\fINAME\fR] [--no-bitmap]
++.RE
++.RS 13
++[--no-hinting] <-o | --output=\fIFILE\fR>
++.RE
++.RS 13
++[-r | --range=\fIFROM-TO\fR[\fI,FROM-TO\fR]] [-s | --size=\fISIZE\fR]
++.RE
++.RS 13
++[-v | --verbose] [--width-spec] \fIFONT_FILES\fR
++
++.SH DESCRIPTION
++\fBgrub-mkfont\fR converts font files from common formats into the PF2 format used by GRUB.
++
++.SH OPTIONS
++.TP
++--ascii-bitmaps
++Save only bitmaps for ASCII characters.
++
++.TP
++--force-autohint
++Force generation of automatic hinting.
++
++.TP
++--bold
++Convert font to bold.
++
++.TP
++--asce=\fINUM\fR
++Set font ascent to \fINUM\fR.
++
++.TP
++--desc=\fINUM\fR
++Set font descent to \fINUM\fR.
++
++.TP
++--index=\fINUM\fR
++Select face index \fINUM\fR.
++
++.TP
++--name=\fINAME\fR
++Set font family to \fINAME\fR.
++
++.TP
++--no-bitmap
++Ignore bitmap strikes when loading.
++
++.TP
++--no-hinting
++Disable hinting.
++
++.TP
++--output=\fIFILE\fR
++Save ouptut to \fIFILE\fR. This argument is required.
++
++.TP
++--range=\fIFROM-TO\fR\fI,FROM-TO\fR
++Set the font ranges to each pair of \fIFROM\fR,\fITO\fR.
++
++.TP
++--size=\fISIZE\fR
++Set font size to \fISIZE\fR.
++
++.TP
++--verbose
++Print verbose messages.
++
++.TP
++--width-spec
++Create a width summary file.
++
++.TP
++\fIFONT_FILES\fR
++The input files to be converted.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
+new file mode 100644
+index 0000000..4dea4f5
+--- /dev/null
++++ b/util/grub-mkimage.1
+@@ -0,0 +1,95 @@
++.TH GRUB-MKIMAGE 1 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-mkimage\fR \(em Make a bootable GRUB image.
++
++.SH SYNOPSIS
++\fBgrub-mkimage\fR [-c | --config=\fRFILE\fI] [-C | --compression=(\fIxz\fR,\fInone\fR,\fIauto\fR)]
++.RS 14
++[-d | --directory=\fRDIR\fR] [-k | --pubkey=\fIFILE\fR]
++.RE
++.RS 14
++[-m | --memdisk=\fIFILE\fR] [-n | --note] [-o | --output=\fIFILE\fR]
++.RE
++.RS 14
++[-O | --format=\fIFORMAT\fR] [-p | --prefix=\fIDIR\fR]
++.RE
++.RS 14
++[-v | --verbose] \fIMODULES\fR
++
++.SH DESCRIPTION
++\fBgrub-mkimage\fI builds a bootable image of GRUB.
++
++.SH OPTIONS
++.TP
++--config=\fIFILE\fR
++Embed \fIFILE\fR as the image's initial configuration file.
++
++.TP
++--compression=(\fIxz\fR,\fInone\fR,\fIauto\fR)
++Use one of \fIxz\fR, \fInone\fR, or \fIauto\fR as the compression method for the core image.
++
++.TP
++--directory=\fIDIR\fR
++Use images and modules from \fIDIR\fR. The default value is \fB/usr/lib/grub/<platform>\fR.
++
++.TP
++--pubkey=\fIFILE\fR
++Embed the public key \fIFILE\fR for signature checking.
++
++.TP
++--memdisk=\fIFILE\fR
++Embed the memdisk image \fIFILE\fR. If no \fB-p\fR option is also specified, this implies \fI-p (memdisk)/boot/grub\fR.
++
++.TP
++--note
++Add a CHRP \fINOTE\fR section. This option is only valid on IEEE1275 platforms.
++
++.TP
++--output=\fIFILE\fR
++Write the generated file to \fIFILE\fR. The default is to write to standard output.
++
++.TP
++--format=\fIFORMAT\fR
++Generate an image in the specified \fIFORMAT\fR. Valid values are:
++.RS
++.RS 4
++.P
++i386-coreboot,
++i386-multiboot,
++i386-pc,
++i386-pc-pxe,
++i386-efi,
++i386-ieee1275,
++i386-qemu,
++x86_64-efi,
++mipsel-yeeloong-flash,
++mipsel-fuloong2f-flash,
++mipself-loongson-elf,
++powerpc-ieee1275,
++sparc64-ieee1275-raw,
++sparc64-ieee1275-cdcore,
++sparc64-ieee1275-aout,
++ia64-efi,
++mips-arc,
++mipsel-arc,
++mipsel-qemu_mips-elf,
++mips-qemu_mips-flash,
++mipsel-qemu_mips-flash,
++mips-qemu_mips-elf
++.RE
++.RE
++
++.TP
++--prefix=\fIDIR\fR
++Set prefix directory. The default value is \fI/boot/grub\fR.
++
++.TP
++--verbose
++Print verbose messages.
++
++.TP
++\fIMODULES\fR
++Include \fIMODULES\fR.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-mklayout.1 b/util/grub-mklayout.1
+new file mode 100644
+index 0000000..d1bbc2e
+--- /dev/null
++++ b/util/grub-mklayout.1
+@@ -0,0 +1,27 @@
++.TH GRUB-MKLAYOUT 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-mklayout\fR \(em Generate a GRUB keyboard layout file.
++
++.SH SYNOPSIS
++\fBgrub-mklayout\fR [-i | --input=\fIFILE\fR] [-o | --output=\fIFILE\fR]
++.RS 15
++[-v | --verbose]
++
++.SH DESCRIPTION
++\fBgrub-mklayout\fR generates a GRUB keyboard layout description which corresponds with the Linux console layout description given as input.
++
++.SH OPTIONS
++.TP
++--input=\fIFILE\fR
++Use \fIFILE\fR as the input. The default value is the standard input device.
++
++.TP
++--output=\fIFILE\fR
++Use \fIFILE\fR as the output. The default value is the standard output device.
++
++.TP
++--verbose
++Print verbose messages.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-mknetdir.1 b/util/grub-mknetdir.1
+new file mode 100644
+index 0000000..69c2262
+--- /dev/null
++++ b/util/grub-mknetdir.1
+@@ -0,0 +1,12 @@
++.TH GRUB-MKNETDIR 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-mknetdir\fR \(em Prepare a GRUB netboot directory.
++
++.SH SYNOPSIS
++\fBgrub-mknetdir\fR
++
++.SH DESCRIPTION
++\fBgrub-mknetdir\fR prepares a directory for GRUB to be netbooted from.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-mkpasswd-pbkdf2.1 b/util/grub-mkpasswd-pbkdf2.1
+new file mode 100644
+index 0000000..73c437c
+--- /dev/null
++++ b/util/grub-mkpasswd-pbkdf2.1
+@@ -0,0 +1,27 @@
++.TH GRUB-MKPASSWD-PBKDF2 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-mkpasswd-pbkdf2\fR \(em Generate a PBKDF2 password hash.
++
++.SH SYNOPSIS
++\fBgrub-mkpasswd-pbkdf2\fR [-c | --iteration-count=\fINUM\fR] [-l | --buflen=\fINUM\fR]
++.RS 22
++[-s | --salt=\fINUM\fR]
++
++.SH DESCRIPTION
++\fBgrub-mkpasswd-pbkdf2\fR generates a PBKDF2 password string suitable for use in a GRUB configuration file.
++
++.SH OPTIONS
++.TP
++--iteration-count=\fINUM\fR
++Number of PBKDF2 iterations.
++
++.TP
++--buflen=\fINUM\fR
++Length of generated hash.
++
++.TP
++--salt=\fINUM\fR
++Length of salt to use.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-mkrelpath.1 b/util/grub-mkrelpath.1
+new file mode 100644
+index 0000000..85f1113
+--- /dev/null
++++ b/util/grub-mkrelpath.1
+@@ -0,0 +1,12 @@
++.TH GRUB-MKRELPATH 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-mkrelpath\fR \(em Generate a relative GRUB path given an OS path.
++
++.SH SYNOPSIS
++\fBgrub-mkrelpath\fR \fIFILE\fR
++
++.SH DESCRIPTION
++\fBgrub-mkrelpath\fR takes an OS filesystem path for \fIFILE\fR and returns a relative path suitable for use in a GRUB configuration file.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-mkrescue.1 b/util/grub-mkrescue.1
+new file mode 100644
+index 0000000..4ed9fc7
+--- /dev/null
++++ b/util/grub-mkrescue.1
+@@ -0,0 +1,123 @@
++.TH GRUB-MKRESCUE 3 "Wed Feb 26 2014"
++.SH NAME
++grub-mkrescue \(em Generate a GRUB rescue image using GNU Xorriso.
++
++.SH SYNOPSIS
++\fBgrub-mkrescue\fR [-o | --output=\fIFILE\fR] [--modules=\fIMODULES\fR]
++.RS 15
++[--install-modules=\fIMODULES\fR] [--themes=\fITHEMES\fR]
++.RE
++.RS 15
++[--fonts=\fIFONTS\fR] [--locales=\fILOCALES\fR]
++.RE
++.RS 15
++[--compress[=\fIno\fR,\fIxz\fR,\fIgz\fR,\fIlzo\fR]] [-d | --directory=\fIDIR\fR]
++.RE
++.RS 15
++[--grub-mkimage=\fIFILE\fR] [--rom-directory=\fIDIR\fR]
++.RE
++.RS 15
++[--xorriso=\fIFILE\fR] [--grub-glue-efi=\fIFILE\fR]
++.RE
++.RS 15
++[--grub-render-label=\fIFILE\fR] [--label-font=\fIFILE\fR]
++.RE
++.RS 15
++[--label-color=\fICOLOR\fR] [--label-bgcolor=\fIFILE\fR]
++.RE
++.RS 15
++[--product-name=\fISTRING\fR] [--product-version=\fISTRING\fR]
++.RE
++.RS 15
++[--sparc-boot] [--arcs-boot]
++
++.SH DESCRIPTION
++\fBgrub-mkrescue\fR can be used to generate a rescue image with the GRUB bootloader.
++
++.SH OPTIONS
++.TP
++\fB--output\fR=\fIFILE\fR
++Write the generated file to \fIFILE\fR. The default is to write to standard output.
++
++.TP
++\fB--modules\fR=\fIMODULES\fR
++Pre-load modules specified by \fIMODULES\fR.
++
++.TP
++\fB--install-modules\fR=\fIMODULES\fR
++Install only \fIMODULES\fR and their dependencies. The default is to install all available modules.
++
++.TP
++\fB--themes\fR=\fITHEMES\fR
++Install \fITHEMES\fR. The default is to install the \fIstarfield\fR theme, if available.
++
++.TP
++\fB--fonts\fR=\fIFONTS\fR
++Install \fIFONTS\fR. The default is to install the \fIunicode\fR font.
++
++.TP
++\fB--locales\fR=\fILOCALES\fR
++Install only locales listed in \fILOCALES\fR. The default is to install all available locales.
++
++.TP
++\fB--compress\fR[=\fIno\fR,\fIxz\fR,\fIgz\fR,\fIlzo\fR]
++Compress GRUB files using the specified compression algorithm.
++
++.TP
++\fB--directory\fR=\fIDIR\fR
++Use images and modules in \fIDIR\fR.
++
++.TP
++\fB--grub-mkimage\fR=\fIFILE\fR
++Use \fIFILE\fR as \fBgrub-mkimage\fR(1). The default is \fI/usr/bin/grub-mkimage\fR.
++
++.TP
++\fB--rom-directory\fR=\fIDIR\fR
++Save ROM images in \fIDIR\fR.
++
++.TP
++\fB--xorriso\fR=\fIFILE\fR
++Use \fIFILE\fR as \fBxorriso\fI.
++
++.TP
++\fB--grub-glue-efi\fR=\fIFILE\fR
++Use \fIFILE\fR as \fBgrub-glue-efi\fR(3).
++
++.TP
++\fB--grub-render-label\fR=\fIFILE\fR
++Use \fIFILE\fR as \fBgrub-render-label\fR(3).
++
++.TP
++\fB--label-font\fR=\fIFILE\fR
++Use \fIFILE\fR as the font file for generated labels.
++
++.TP
++\fB--label-color\fR=\fICOLOR\fR
++Use \fICOLOR\fI as the color for generated labels.
++
++.TP
++\fB--label-bgcolor\fR=\fICOLOR\fR
++Use \fICOLOR\fR as the background color for generated labels.
++
++.TP
++\fB--product-name\fR=\fISTRING\fR
++Use \fISTRING\fR as the product name in generated labels.
++
++.TP
++\fB--product-version\fR=\fISTRING\fR
++Use \fISTRING\fR as the product version in generated labels.
++
++.TP
++\fB--sparc-boot\fR
++Enable booting the SPARC platform. This disables HFS+, APM, ARCS, and "boot as disk image" on the \fIi386-pc\fR target platform.
++
++.TP
++\fB--arcs-boot\fR
++Enable ARCS booting. This is typically for big-endian MIPS machines, and disables HFS+, APM, sparc64, and "boot as disk image" on the \fIi386-pc\fR target platform.
++
++.TP
++\fB--\fR
++All options after a \fB--\fR will be passed directly to xorriso's command line when generating the image.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-mkstandalone.1 b/util/grub-mkstandalone.1
+new file mode 100644
+index 0000000..ba2d2bd
+--- /dev/null
++++ b/util/grub-mkstandalone.1
+@@ -0,0 +1,100 @@
++.TH GRUB-MKSTANDALONE 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-mkstandalone\fR \(em Generate a standalone image in the selected format.
++
++.SH SYNOPSIS
++\fBgrub-mkstandalone\fR [-o | --output=\fIFILE\fR] [-O | --format=\fIFORMAT\fR]
++.RS 19
++[-C | --compression=(\fIxz\fR|\fInone\fR|\fIauto\fR)]
++.RE
++.RS 19
++[--modules=\fIMODULES\fR] [--install-modules=\fIMODULES\fR]
++.RE
++.RS 19
++[--themes=\fITHEMES\fR] [--fonts=\fIFONTS\fR]
++.RE
++.RS 19
++[--locales=\fILOCALES\fR] [--compress[=\fIno\fR,\fIxz\fR,\fIgz\fR,\fIlzo\fR]]
++.RE
++.RS 19
++[-d | --directory=\fIDIR\fR] [--grub-mkimage=\fIFILE\fR]
++.RE
++.RS 19
++\fISOURCE...\fR
++
++.SH DESCRIPTION
++
++.SH OPTIONS
++.TP
++--output=\fIFILE\fR
++Write the generated file to \fIFILE\fR. The default is to write to standard output.
++
++.TP
++--format=\fIFORMAT\fR
++Generate an image in the specified \fIFORMAT\fR. Valid values are:
++.RS
++.RS 4
++.P
++i386-coreboot,
++i386-multiboot,
++i386-pc,
++i386-pc-pxe,
++i386-efi,
++i386-ieee1275,
++i386-qemu,
++x86_64-efi,
++mipsel-yeeloong-flash,
++mipsel-fuloong2f-flash,
++mipself-loongson-elf,
++powerpc-ieee1275,
++sparc64-ieee1275-raw,
++sparc64-ieee1275-cdcore,
++sparc64-ieee1275-aout,
++ia64-efi,
++mips-arc,
++mipsel-arc,
++mipsel-qemu_mips-elf,
++mips-qemu_mips-flash,
++mipsel-qemu_mips-flash,
++mips-qemu_mips-elf
++.RE
++.RE
++
++.TP
++--compression=(\fIxz\fR|\fInone\fR|\fIauto\fR)
++Use one of \fIxz\fR, \fInone\fR, or \fIauto\fR as the compression method for the core image.
++
++.TP
++--modules=\fIMODULES\fR
++Pre-load modules specified by \fIMODULES\fR.
++
++.TP
++--install-modules=\fIMODULES\fR
++Install only \fIMODULES\fR and their dependencies. The default is to install all available modules.
++
++.TP
++--themes=\fITHEMES\fR
++Install \fITHEMES\fR. The default is to install the \fIstarfield\fR theme, if available.
++
++.TP
++--fonts=\fIFONTS\fR
++Install \fIFONTS\fR. The default is to install the \fIunicode\fR font.
++
++.TP
++--locales=\fILOCALES\fR
++Install only locales listed in \fILOCALES\fR. The default is to install all available locales.
++
++.TP
++--compress[=\fIno\fR,\fIxz\fR,\fIgz\fR,\fIlzo\fR]
++Compress GRUB files using the specified compression algorithm.
++
++.TP
++--directory=\fIDIR\fR
++Use images and modules in \fIDIR\fR.
++
++.TP
++--grub-mkimage=\fIFILE\fR
++Use \fIFILE\fR as \fBgrub-mkimage\fR. The default is \fI/usr/bin/grub-mkimage\fR.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-ofpathname.8 b/util/grub-ofpathname.8
+new file mode 100644
+index 0000000..bf3743a
+--- /dev/null
++++ b/util/grub-ofpathname.8
+@@ -0,0 +1,12 @@
++.TH GRUB-OFPATHNAME 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-ofpathname\fR \(em Generate an IEEE-1275 device path for a specified device.
++
++.SH SYNOPSIS
++\fBgrub-ofpathname\fR \fIDEVICE\fR
++
++.SH DESCRIPTION
++\fBgrub-ofpathname\fR generates an IEEE-1275 device path for the specified \fIDEVICE\fR.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-probe.8 b/util/grub-probe.8
+new file mode 100644
+index 0000000..04e26c8
+--- /dev/null
++++ b/util/grub-probe.8
+@@ -0,0 +1,80 @@
++.TH GRUB-PROBE 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-probe\fR \(em Probe device information for a given path.
++
++.SH SYNOPSIS
++\fBgrub-probe\fR \[-d | --device] [-m | --device-map=\fIFILE\fR]
++.RS 12
++[-t | --target=(fs|fs_uuid|fs_label|drive|device|partmap|
++.RE
++.RS 28
++abstraction|cryptodisk_uuid|
++.RE
++.RS 28
++msdos_parttype)]
++.RE
++.RS 12
++[-v | --verbose] (PATH|DEVICE)
++
++.SH DESCRIPTION
++\fBgrub-probe\fR probes a path or device for filesystem and related information.
++
++.SH OPTIONS
++.TP
++--device
++Final option represents a \fIDEVICE\fR, rather than a filesystem \fIPATH\fR.
++.TP
++--device-map=\fIFILE\fR
++Use \fIFILE\fR as the device map. The default value is \fI/boot/grub/device.map\fR.
++
++.TP
++--target=(fs|fs_uuid|fs_label|drive|device|partmap|msdos_parttype)
++Select among various output definitions. The default is \fIfs\fR.
++.RS
++.TP
++\fIfs\fR
++filesystem module
++
++.TP
++\fIfs_uuid\fR
++filesystem UUID
++
++.TP
++\fIfs_label\fR
++filesystem label
++
++.TP
++\fIdrive\fR
++GRUB drive name
++
++.TP
++\fIdevice\fR
++System device
++
++.TP
++\fIpartmap\fR
++partition map module
++
++.TP
++\fIabstraction\fR
++abstraction module
++
++.TP
++\fIcryptodisk_uuid\fR
++cryptographic container
++
++.TP
++\fImsdos_partmap\fR
++MS-DOS partition map
++.RE
++
++.TP
++--verbose
++Print verbose output.
++
++.TP
++(\fIPATH\fR|\fIDEVICE\fR)
++If --device is passed, a block \fIDEVICE\fR. Otherwise, the \fIPATH\fR of a file on the filesystem.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-reboot.8 b/util/grub-reboot.8
+new file mode 100644
+index 0000000..faa5e4e
+--- /dev/null
++++ b/util/grub-reboot.8
+@@ -0,0 +1,21 @@
++.TH GRUB-REBOOT 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-reboot\fR \(em Set the default boot menu entry for the next boot only.
++
++.SH SYNOPSIS
++\fBgrub-reboot\fR [--boot-directory=\fIDIR\fR] \fIMENU_ENTRY\fR
++
++.SH DESCRIPTION
++\fBgrub-reboot\fR sets the default boot menu entry for the next boot, but not further boots after that. This command only works for GRUB configuration files created with \fIGRUB_DEFAULT=saved\fR in \fI/etc/default/grub\fR.
++
++.SH OPTIONS
++.TP
++--boot-directory=\fIDIR\fR
++Find GRUB images under \fIDIR/grub\fR. The default value is \fI/boot\fR, resulting in grub images being search for at \fI/boot/grub\fR.
++
++.TP
++\fIMENU_ENTRY\fR
++A number, a menu item title or a menu item identifier.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-render-label.1 b/util/grub-render-label.1
+new file mode 100644
+index 0000000..4d51c8a
+--- /dev/null
++++ b/util/grub-render-label.1
+@@ -0,0 +1,51 @@
++.TH GRUB-RENDER-LABEL 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-render-label\fR \(em Render an Apple disk label.
++
++.SH SYNOPSIS
++\fBgrub-render-label\fR [-b | --bgcolor=\fICOLOR\fR] [-c | --color=\fICOLOR\fR]
++.RS 19
++[-f | --font=\fIFILE\fR] [-i | --input=\fIFILE\fR]
++.RE
++.RS 19
++[-o | --output=\fIFILE\fR] [-t | --text=\fISTRING\fR]
++.RE
++.RS 19
++[-v | --verbose]
++
++.SH DESCRIPTION
++\fBgrub-render-label\fR renders an Apple disk label (.disk_label) file.
++
++
++.SH OPTIONS
++.TP
++\fB--color\fR=\fICOLOR\fR
++Use \fICOLOR\fI as the color for generated labels.
++
++.TP
++\fB--bgcolor\fR=\fICOLOR\fR
++Use \fICOLOR\fR as the background color for generated labels.
++
++.TP
++\fB--font\fR=\fIFILE\fR
++Use \fIFILE\fR as the font file for generated labels.
++
++.TP
++--input=\fIFILE\fR
++Read input text from \fIFILE\fR.
++
++.TP
++--output=\fIFILE\fR
++Render output to \fIFILE\fR.
++
++.TP
++--text=\fISTRING\fR
++Use \fISTRING\fR as input text.
++
++.TP
++--verbose
++Print verbose output.
++
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-script-check.1 b/util/grub-script-check.1
+new file mode 100644
+index 0000000..0f1f625
+--- /dev/null
++++ b/util/grub-script-check.1
+@@ -0,0 +1,21 @@
++.TH GRUB-SCRIPT-CHECK 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-script-check\fR \(em Check GRUB configuration file for syntax errors.
++
++.SH SYNOPSIS
++\fBgrub-script-check\fR [-v | --verbose] \fIPATH\fR
++
++.SH DESCRIPTION
++\fBgrub-script-check\fR verifies that a specified GRUB configuration file does not contain syntax errors.
++
++.SH OPTIONS
++.TP
++--verbose
++Print verbose output.
++
++.TP
++\fIPATH\fR
++Path of the file to use as input.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-set-default.8 b/util/grub-set-default.8
+new file mode 100644
+index 0000000..a96265a
+--- /dev/null
++++ b/util/grub-set-default.8
+@@ -0,0 +1,21 @@
++.TH GRUB-SET-DEFAULT 1 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-set-default\fR \(em Set the default boot menu entry for GRUB.
++
++.SH SYNOPSIS
++\fBgrub-set-default\fR [--boot-directory=\fIDIR\fR] \fIMENU_ENTRY\fR
++
++.SH DESCRIPTION
++\fBgrub-set-default\fR sets the default boot menu entry for all subsequent boots. This command only works for GRUB configuration files created with \fIGRUB_DEFAULT=saved\fR in \fI/etc/default/grub\fR.
++
++.SH OPTIONS
++.TP
++--boot-directory=\fIDIR\fR
++Find GRUB images under \fIDIR/grub\fR. The default value is \fI/boot\fR, resulting in grub images being search for at \fI/boot/grub\fR.
++
++.TP
++\fIMENU_ENTRY\fR
++A number, a menu item title or a menu item identifier.
++
++.SH SEE ALSO
++.BR "info grub"
+diff --git a/util/grub-sparc64-setup.8 b/util/grub-sparc64-setup.8
+new file mode 100644
+index 0000000..37ea2dd
+--- /dev/null
++++ b/util/grub-sparc64-setup.8
+@@ -0,0 +1,12 @@
++.TH GRUB-SPARC64-SETUP 3 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-sparc64-setup\fR \(em Set up a device to boot a sparc64 GRUB image.
++
++.SH SYNOPSIS
++\fBgrub-sparc64-setup\fR [OPTIONS].
++
++.SH DESCRIPTION
++You should not normally run this program directly. Use grub-install instead.
++
++.SH SEE ALSO
++.BR "info grub"
+--
+1.9.3
+
diff --git a/0131-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0131-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
new file mode 100644
index 0000000..6a5f0e1
--- /dev/null
+++ b/0131-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
@@ -0,0 +1,45 @@
+From d60083bf794914c4f26f561adcdd107abe80cd7e Mon Sep 17 00:00:00 2001
+From: Fedora Ninjas <grub2-owner at fedoraproject.org>
+Date: Wed, 19 Feb 2014 15:58:43 -0500
+Subject: [PATCH 131/140] use fw_path prefix when fallback searching for grub
+ config
+
+When PXE booting via UEFI firmware, grub was searching for grub.cfg
+in the fw_path directory where the grub application was found. If
+that didn't exist, a fallback search would look for config file names
+based on MAC and IP address. However, the search would look in the
+prefix directory which may not be the same fw_path. This patch
+changes that behavior to use the fw_path directory for the fallback
+search. Only if fw_path is NULL will the prefix directory be searched.
+
+Signed-off-by: Mark Salter <msalter at redhat.com>
+---
+ grub-core/normal/main.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index f66c03c..5e2ac15 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -343,7 +343,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+ char *config;
+ const char *prefix, *fw_path;
+
+- fw_path = grub_env_get ("fw_path");
++ prefix = fw_path = grub_env_get ("fw_path");
+ if (fw_path)
+ {
+ config = grub_xasprintf ("%s/grub.cfg", fw_path);
+@@ -366,7 +366,8 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+ }
+ }
+
+- prefix = grub_env_get ("prefix");
++ if (! prefix)
++ prefix = grub_env_get ("prefix");
+ if (prefix)
+ {
+ grub_size_t config_len;
+--
+1.9.3
+
diff --git a/0132-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0132-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
new file mode 100644
index 0000000..d9f58ad
--- /dev/null
+++ b/0132-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
@@ -0,0 +1,115 @@
+From 2927c4943326f09bd626744b8a46fc8ee16fea1c Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Thu, 6 Mar 2014 11:51:33 -0500
+Subject: [PATCH 132/140] Try mac/guid/etc before grub.cfg on tftp config
+ files.
+
+Signed-off-by: Peter Jones <pjones at redhat.com>
+---
+ grub-core/normal/main.c | 80 ++++++++++++++++++++++++++-----------------------
+ 1 file changed, 43 insertions(+), 37 deletions(-)
+
+diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
+index 5e2ac15..4190985 100644
+--- a/grub-core/normal/main.c
++++ b/grub-core/normal/main.c
+@@ -341,53 +341,59 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
+ /* Guess the config filename. It is necessary to make CONFIG static,
+ so that it won't get broken by longjmp. */
+ char *config;
+- const char *prefix, *fw_path;
+-
+- prefix = fw_path = grub_env_get ("fw_path");
+- if (fw_path)
+- {
+- config = grub_xasprintf ("%s/grub.cfg", fw_path);
+- if (config)
+- {
+- grub_file_t file;
+-
+- file = grub_file_open (config);
+- if (file)
+- {
+- grub_file_close (file);
+- grub_enter_normal_mode (config);
+- }
+- else
+- {
+- /* Ignore all errors. */
+- grub_errno = 0;
+- }
+- grub_free (config);
+- }
+- }
++ const char *prefix;
+
++ prefix = grub_env_get ("fw_path");
+ if (! prefix)
+ prefix = grub_env_get ("prefix");
++
+ if (prefix)
+- {
+- grub_size_t config_len;
+- config_len = grub_strlen (prefix) +
+- sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
+- config = grub_malloc (config_len);
++ {
++ if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
++ {
++ grub_size_t config_len;
++ config_len = grub_strlen (prefix) +
++ sizeof ("/grub.cfg-XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
++ config = grub_malloc (config_len);
++
++ if (! config)
++ goto quit;
+
+- if (! config)
+- goto quit;
++ grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
+
+- grub_snprintf (config, config_len, "%s/grub.cfg", prefix);
++ grub_net_search_configfile (config);
+
+- if (grub_strncmp (prefix + 1, "tftp", sizeof ("tftp") - 1) == 0)
+- grub_net_search_configfile (config);
++ grub_enter_normal_mode (config);
++ grub_free (config);
++ config = NULL;
++ }
+
+- grub_enter_normal_mode (config);
+- grub_free (config);
++ if (!config)
++ {
++ config = grub_xasprintf ("%s/grub.cfg", prefix);
++ if (config)
++ {
++ grub_file_t file;
++
++ file = grub_file_open (config);
++ if (file)
++ {
++ grub_file_close (file);
++ grub_enter_normal_mode (config);
++ }
++ else
++ {
++ /* Ignore all errors. */
++ grub_errno = 0;
++ }
++ grub_free (config);
++ }
++ }
+ }
+ else
+- grub_enter_normal_mode (0);
++ {
++ grub_enter_normal_mode (0);
++ }
+ }
+ else
+ grub_enter_normal_mode (argv[0]);
+--
+1.9.3
+
diff --git a/0133-trim-arp-packets-with-abnormal-size.patch b/0133-trim-arp-packets-with-abnormal-size.patch
new file mode 100644
index 0000000..884aa75
--- /dev/null
+++ b/0133-trim-arp-packets-with-abnormal-size.patch
@@ -0,0 +1,31 @@
+From cf2e819b7059f199075b099260983e8108eea74a Mon Sep 17 00:00:00 2001
+From: Paulo Flabiano Smorigo <pfsmorigo at br.ibm.com>
+Date: Wed, 5 Feb 2014 09:42:42 -0200
+Subject: [PATCH 133/140] trim arp packets with abnormal size
+
+GRUB uses arp request to create the arp response. If the incoming packet
+is foobared, GRUB needs to trim the arp response packet before sending it.
+---
+ grub-core/net/arp.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
+index d62d0cc..77581f4 100644
+--- a/grub-core/net/arp.c
++++ b/grub-core/net/arp.c
+@@ -162,6 +162,12 @@ grub_net_arp_receive (struct grub_net_buff *nb,
+ if (grub_net_addr_cmp (&inf->address, &target_addr) == 0
+ && grub_be_to_cpu16 (arp_header->op) == ARP_REQUEST)
+ {
++ if ((nb->tail - nb->data) > 50)
++ {
++ grub_dprintf ("net", "arp packet with abnormal size (%ld bytes).\n",
++ nb->tail - nb->data);
++ nb->tail = nb->data + 50;
++ }
+ grub_net_link_level_address_t target;
+ /* We've already checked that pln is either 4 or 16. */
+ char tmp[16];
+--
+1.9.3
+
diff --git a/0134-Fix-convert-function-to-support-NVMe-devices.patch b/0134-Fix-convert-function-to-support-NVMe-devices.patch
new file mode 100644
index 0000000..62617be
--- /dev/null
+++ b/0134-Fix-convert-function-to-support-NVMe-devices.patch
@@ -0,0 +1,59 @@
+From f451ce261bcdb24d3428daac54e32e06c698e2f7 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Tue, 18 Feb 2014 11:34:00 -0500
+Subject: [PATCH 134/140] Fix convert function to support NVMe devices
+
+This is adapted from the patch at
+https://bugzilla.redhat.com/show_bug.cgi?id=1019660 , which is against
+the now very old version of convert_system_partition_to_system_disk().
+
+As such, it certainly not the right thing for upstream, but should
+function for now.
+
+Resolves: rhbz#1019660
+
+Signed-off-by: Peter Jones <grub2-owner at fedoraproject.org>
+---
+ util/getroot.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/util/getroot.c b/util/getroot.c
+index 3958105..e700610 100644
+--- a/util/getroot.c
++++ b/util/getroot.c
+@@ -152,6 +152,7 @@ convert_system_partition_to_system_disk (const char *os_dev, int *is_part)
+ {
+ #if GRUB_UTIL_FD_STAT_IS_FUNCTIONAL
+ struct stat st;
++ char *path = xmalloc(PATH_MAX);
+
+ if (stat (os_dev, &st) < 0)
+ {
+@@ -164,6 +165,24 @@ convert_system_partition_to_system_disk (const char *os_dev, int *is_part)
+
+ *is_part = 0;
+
++ if (realpath(os_dev, path))
++ {
++ if ((strncmp ("/dev/nvme", path, 9) == 0))
++ {
++ char *p = path + 5;
++ p = strchr(p, 'p');
++ if (p)
++ {
++ *is_part = 1;
++ *p = '\0';
++ }
++ return path;
++ }
++ }
++
++ grub_free (path);
++ *is_part = 0;
++
+ if (grub_util_device_is_mapped_stat (&st))
+ return grub_util_devmapper_part_to_disk (&st, is_part, os_dev);
+
+--
+1.9.3
+
diff --git a/0135-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch b/0135-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
new file mode 100644
index 0000000..0e8e263
--- /dev/null
+++ b/0135-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
@@ -0,0 +1,37 @@
+From da07b568a45d2c87ab2f6e498f0e304c73c5d195 Mon Sep 17 00:00:00 2001
+From: Prarit Bhargava <prarit at redhat.com>
+Date: Wed, 12 Mar 2014 10:58:16 -0400
+Subject: [PATCH 135/140] Fix bad test on GRUB_DISABLE_SUBMENU.
+
+The file /etc/grub.d/10_linux does
+
+if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
+
+when it should do
+
+if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
+
+which results in submenus in /boot/grub2/grub.cfg when
+GRUB_DISABLE_SUBMENU="yes".
+
+Resolves: rhbz#1063414
+---
+ util/grub.d/10_linux.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 136abd7..3f799e9 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -255,7 +255,7 @@ while [ "x$list" != "x" ] ; do
+ linux_root_device_thisversion=${GRUB_DEVICE}
+ fi
+
+- if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
++ if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
+ linux_entry "${OS}" "${version}" simple \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
+
+--
+1.9.3
+
diff --git a/0136-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch b/0136-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
new file mode 100644
index 0000000..7406594
--- /dev/null
+++ b/0136-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
@@ -0,0 +1,29 @@
+From e7ba5525f976930b792c91132eb5ec96c5379797 Mon Sep 17 00:00:00 2001
+From: Fedora Ninjas <grub2-owner at fedoraproject.org>
+Date: Mon, 10 Feb 2014 16:13:10 -0500
+Subject: [PATCH 136/140] Switch to use APM Mustang device tree, for hardware
+ testing.
+
+Signed-off-by: David A. Marlin <d.marlin at redhat.com>
+---
+ util/grub.d/10_linux.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 3f799e9..2639511 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -228,8 +228,8 @@ while [ "x$list" != "x" ] ; do
+
+ fdt=
+ for i in "dtb-${version}" "dtb-${alt_version}"; do
+- if test -e "${dirname}/${i}/foundation-v8.dtb" ; then
+- fdt="${i}/foundation-v8.dtb"
++ if test -e "${dirname}/${i}/apm-mustang.dtb" ; then
++ fdt="${i}/apm-mustang.dtb"
+ break
+ fi
+ done
+--
+1.9.3
+
diff --git a/0137-Use-the-default-device-tree-from-the-grub-default-fi.patch b/0137-Use-the-default-device-tree-from-the-grub-default-fi.patch
new file mode 100644
index 0000000..3209616
--- /dev/null
+++ b/0137-Use-the-default-device-tree-from-the-grub-default-fi.patch
@@ -0,0 +1,46 @@
+From 5f1ee8ff7170321250874116eb80cbec83cc70ab Mon Sep 17 00:00:00 2001
+From: Fedora Ninjas <grub2-owner at fedoraproject.org>
+Date: Wed, 12 Feb 2014 14:54:04 -0500
+Subject: [PATCH 137/140] Use the default device tree from the grub default
+ file
+
+instead of hardcoding a value.
+
+Signed-off-by: David A. Marlin <dmarlin at redhat.com>
+---
+ util/grub-mkconfig.in | 3 ++-
+ util/grub.d/10_linux.in | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index b00f9e6..beb22de 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -224,7 +224,8 @@ export GRUB_DEFAULT \
+ GRUB_ENABLE_CRYPTODISK \
+ GRUB_BADRAM \
+ GRUB_OS_PROBER_SKIP_LIST \
+- GRUB_DISABLE_SUBMENU
++ GRUB_DISABLE_SUBMENU \
++ GRUB_DEFAULT_DTB
+
+ if test "x${grub_cfg}" != "x"; then
+ rm -f "${grub_cfg}.new"
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 2639511..6480cd6 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -228,8 +228,8 @@ while [ "x$list" != "x" ] ; do
+
+ fdt=
+ for i in "dtb-${version}" "dtb-${alt_version}"; do
+- if test -e "${dirname}/${i}/apm-mustang.dtb" ; then
+- fdt="${i}/apm-mustang.dtb"
++ if test -f "${dirname}/${i}/${GRUB_DEFAULT_DTB}" ; then
++ fdt="${i}/${GRUB_DEFAULT_DTB}"
+ break
+ fi
+ done
+--
+1.9.3
+
diff --git a/0138-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0138-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
new file mode 100644
index 0000000..6412f62
--- /dev/null
+++ b/0138-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
@@ -0,0 +1,46 @@
+From f4bbb76f70ceca4e089e926ee44d8d3fe919f040 Mon Sep 17 00:00:00 2001
+From: Fedora Ninjas <grub2-owner at fedoraproject.org>
+Date: Sat, 15 Feb 2014 15:10:22 -0500
+Subject: [PATCH 138/140] reopen SNP protocol for exclusive use by grub
+
+---
+ grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
+index 2b344d6..a6e4c79 100644
+--- a/grub-core/net/drivers/efi/efinet.c
++++ b/grub-core/net/drivers/efi/efinet.c
+@@ -223,6 +223,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+ {
+ struct grub_net_card *card;
+ grub_efi_device_path_t *dp;
++ grub_efi_simple_network_t *net;
+
+ dp = grub_efi_get_device_path (hnd);
+ if (! dp)
+@@ -250,6 +251,21 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+ &pxe_mode->dhcp_ack,
+ sizeof (pxe_mode->dhcp_ack),
+ 1, device, path);
++ net = grub_efi_open_protocol (card->efi_handle, &net_io_guid,
++ GRUB_EFI_OPEN_PROTOCOL_BY_EXCLUSIVE);
++ if (net) {
++ if (net->mode->state == GRUB_EFI_NETWORK_STOPPED
++ && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS)
++ continue;
++
++ if (net->mode->state == GRUB_EFI_NETWORK_STOPPED)
++ continue;
++
++ if (net->mode->state == GRUB_EFI_NETWORK_STARTED
++ && efi_call_3 (net->initialize, net, 0, 0) != GRUB_EFI_SUCCESS)
++ continue;
++ card->efi_net = net;
++ }
+ return;
+ }
+ }
+--
+1.9.3
+
diff --git a/0139-Reduce-timer-event-frequency-by-10.patch b/0139-Reduce-timer-event-frequency-by-10.patch
new file mode 100644
index 0000000..01403b1
--- /dev/null
+++ b/0139-Reduce-timer-event-frequency-by-10.patch
@@ -0,0 +1,40 @@
+From 3aed1012cb8f559a0241569d6ec6b1be23844b05 Mon Sep 17 00:00:00 2001
+From: Mark Salter <msalter at redhat.com>
+Date: Thu, 20 Feb 2014 12:54:52 -0500
+Subject: [PATCH 139/140] Reduce timer event frequency by 10
+
+Timer event to keep grub msec counter was running at 1000HZ. This was too
+fast for UEFI timer driver and resulted in a 10x slowdown in grub time
+versus wallclock. Reduce the timer event frequency and increase tick
+increment accordingly to keep better time.
+
+Signed-off-by: Mark Salter <msalter at redhat.com>
+---
+ grub-core/kern/arm/efi/init.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/kern/arm/efi/init.c b/grub-core/kern/arm/efi/init.c
+index a6ae034..0c17d83 100644
+--- a/grub-core/kern/arm/efi/init.c
++++ b/grub-core/kern/arm/efi/init.c
+@@ -38,7 +38,7 @@ static void
+ increment_timer (grub_efi_event_t event __attribute__ ((unused)),
+ void *context __attribute__ ((unused)))
+ {
+- tmr++;
++ tmr += 10;
+ }
+
+ void
+@@ -52,7 +52,7 @@ grub_machine_init (void)
+
+ efi_call_5 (b->create_event, GRUB_EFI_EVT_TIMER | GRUB_EFI_EVT_NOTIFY_SIGNAL,
+ GRUB_EFI_TPL_CALLBACK, increment_timer, NULL, &tmr_evt);
+- efi_call_3 (b->set_timer, tmr_evt, GRUB_EFI_TIMER_PERIODIC, 10000);
++ efi_call_3 (b->set_timer, tmr_evt, GRUB_EFI_TIMER_PERIODIC, 100000);
+
+ grub_install_get_time_ms (grub_efi_get_time_ms);
+ }
+--
+1.9.3
+
diff --git a/0140-always-return-error-to-UEFI.patch b/0140-always-return-error-to-UEFI.patch
new file mode 100644
index 0000000..b53f270
--- /dev/null
+++ b/0140-always-return-error-to-UEFI.patch
@@ -0,0 +1,25 @@
+From 36a34ede9dfa34840c59c7b331c1bc8d8ae7442e Mon Sep 17 00:00:00 2001
+From: Fedora Ninjas <grub2-owner at fedoraproject.org>
+Date: Wed, 26 Feb 2014 21:49:12 -0500
+Subject: [PATCH 140/140] always return error to UEFI
+
+---
+ grub-core/kern/efi/efi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
+index cd839cc..1a8dba5 100644
+--- a/grub-core/kern/efi/efi.c
++++ b/grub-core/kern/efi/efi.c
+@@ -158,7 +158,7 @@ grub_exit (void)
+ {
+ grub_efi_fini ();
+ efi_call_4 (grub_efi_system_table->boot_services->exit,
+- grub_efi_image_handle, GRUB_EFI_SUCCESS, 0, 0);
++ grub_efi_image_handle, GRUB_EFI_LOAD_ERROR, 0, 0);
+ for (;;) ;
+ }
+
+--
+1.9.3
+
diff --git a/grub2.spec b/grub2.spec
index c8f9173..f41cb5c 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -47,7 +47,7 @@
Name: grub2
Epoch: 1
Version: 2.02
-Release: 0.5%{?dist}
+Release: 0.6%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
@@ -186,6 +186,20 @@ Patch0123: 0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
Patch0124: 0124-Don-t-print-during-fdt-loading-method.patch
Patch0125: 0125-Honor-a-symlink-when-generating-configuration-by-gru.patch
Patch0126: 0126-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
+Patch0127: 0127-Don-t-require-a-password-to-boot-entries-generated-b.patch
+Patch0128: 0128-Don-t-emit-Booting-.-message.patch
+Patch0129: 0129-Make-CTRL-and-ALT-keys-work-as-expected-on-EFI-syste.patch
+Patch0130: 0130-May-as-well-try-it.patch
+Patch0131: 0131-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
+Patch0132: 0132-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
+Patch0133: 0133-trim-arp-packets-with-abnormal-size.patch
+Patch0134: 0134-Fix-convert-function-to-support-NVMe-devices.patch
+Patch0135: 0135-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
+Patch0136: 0136-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
+Patch0137: 0137-Use-the-default-device-tree-from-the-grub-default-fi.patch
+Patch0138: 0138-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+Patch0139: 0139-Reduce-timer-event-frequency-by-10.patch
+Patch0140: 0140-always-return-error-to-UEFI.patch
BuildRequires: flex bison binutils python
BuildRequires: ncurses-devel xz-devel bzip2-devel
@@ -614,6 +628,9 @@ fi
%{_datarootdir}/grub/themes/
%changelog
+* Wed Jul 02 2014 Peter Jones <pjones at redhat.com> - 2.02-0.6
+- Re-merge RHEL 7 changes and ARM works in progress.
+
* Mon Jun 30 2014 Peter Jones <pjones at redhat.com> - 2.02-0.5
- Avoid munging raw spaces when we're escaping command line arguments.
Resolves: rhbz#923374
More information about the scm-commits
mailing list