Switch to upstream man pages

Signed-off-by: Robbie Harwood <rharwood@redhat.com>
2022-03-31 21:21:43 +00:00 · 2022-03-31 21:21:43 +00:00 · bd73b85ea3
commit bd73b85ea3
parent d171a2a95c
219 changed files with 974 additions and 3234 deletions
--- a/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch
+++ b/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch
@ -10,7 +10,7 @@ This reverts commit 722737630889607c3b5761f1f5a48f1674cd2821.
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 5984e92d291..94622481284 100644
+index 5984e92d2..946224812 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
@@ -36,7 +36,7 @@ if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/n
--- a/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch
+++ b/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch
@ -10,7 +10,7 @@ This reverts commit 54e0a1bbf1e9106901a557195bb35e5e20fb3925.
 2 files changed, 5 insertions(+), 8 deletions(-)

 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index f8cbb8d7a2b..d3e879b8e5c 100644
+index f8cbb8d7a..d3e879b8e 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
@@ -140,9 +140,6 @@ GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2
@ -40,7 +40,7 @@ index f8cbb8d7a2b..d3e879b8e5c 100644
   GRUB_SAVEDEFAULT \
   GRUB_ENABLE_CRYPTODISK \
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 94622481284..80685b15f4d 100644
+index 946224812..80685b15f 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
@@ -26,8 +26,8 @@ export TEXTDOMAINDIR="@localedir@"
--- a/0003-Revert-templates-Disable-the-os-prober-by-default.patch
+++ b/0003-Revert-templates-Disable-the-os-prober-by-default.patch
@ -10,7 +10,7 @@ This reverts commit e346414725a70e5c74ee87ca14e580c66f517666.
 2 files changed, 9 insertions(+), 14 deletions(-)

 diff --git a/docs/grub.texi b/docs/grub.texi
-index f8b4b3b21a7..69f08d289f9 100644
+index f8b4b3b21..69f08d289 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
@@ -1519,13 +1519,10 @@ boot sequence.  If you have problems, set this option to @samp{text} and
@ -46,7 +46,7 @@ index f8b4b3b21a7..69f08d289f9 100644
 First create a separate GRUB partition, big enough to hold GRUB. Some of the
 following entries show how to load OS installer images from this same partition,
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 80685b15f4d..1b91c102f35 100644
+index 80685b15f..1b91c102f 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
@@ -26,8 +26,7 @@ export TEXTDOMAINDIR="@localedir@"
--- a/0004-Add-support-for-Linux-EFI-stub-loading.patch
+++ b/0004-Add-support-for-Linux-EFI-stub-loading.patch
@ -44,7 +44,7 @@ moves the check into grub_dl_load_file.
 create mode 100644 include/grub/efi/linux.h

 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 8022e1c0a79..45d3edaa4dc 100644
+index 8022e1c0a..45d3edaa4 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
@@ -1734,13 +1734,6 @@ module = {
@ -88,7 +88,7 @@ index 8022e1c0a79..45d3edaa4dc 100644
 
 module = {
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 48f8a79073d..b7149370950 100644
+index 48f8a7907..b71493709 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
@@ -38,6 +38,14 @@
@ -127,7 +127,7 @@ index 48f8a79073d..b7149370950 100644
 
   file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE);
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 8cff7be0289..35b8f670602 100644
+index 8cff7be02..35b8f6706 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
@@ -286,6 +286,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@ -166,7 +166,7 @@ index 8cff7be0289..35b8f670602 100644
 
 /* Search the mods section from the PE32/PE32+ image. This code uses
 diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 9838fb2f50d..f6aef0ef649 100644
+index 9838fb2f5..f6aef0ef6 100644
 --- a/grub-core/kern/efi/mm.c
 +++ b/grub-core/kern/efi/mm.c
@@ -113,6 +113,38 @@ grub_efi_drop_alloc (grub_efi_physical_address_t address,
@ -209,7 +209,7 @@ index 9838fb2f50d..f6aef0ef649 100644
 void *
 grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index ef3e9f9444c..a312c668685 100644
+index ef3e9f944..a312c6686 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
@@ -29,6 +29,7 @@
@ -390,7 +390,7 @@ index ef3e9f9444c..a312c668685 100644
   linux_args = grub_malloc (cmdline_size);
   if (!linux_args)
 diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
-index 22cc25eccd9..d9b7a9ba400 100644
+index 22cc25ecc..d9b7a9ba4 100644
 --- a/grub-core/loader/arm64/xen_boot.c
 +++ b/grub-core/loader/arm64/xen_boot.c
@@ -266,7 +266,6 @@ xen_boot (void)
@ -403,7 +403,7 @@ index 22cc25eccd9..d9b7a9ba400 100644
 
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
 new file mode 100644
-index 00000000000..c24202a5dd1
+index 000000000..c24202a5d
 --- /dev/null
 +++ b/grub-core/loader/efi/linux.c
@@ -0,0 +1,70 @@
@ -479,7 +479,7 @@ index 00000000000..c24202a5dd1
 +#pragma GCC diagnostic pop
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
 new file mode 100644
-index 00000000000..bb2616a8092
+index 000000000..bb2616a80
 --- /dev/null
 +++ b/grub-core/loader/i386/efi/linux.c
@@ -0,0 +1,335 @@
@ -819,7 +819,7 @@ index 00000000000..bb2616a8092
 +  grub_unregister_command (cmd_initrdefi);
 +}
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 2a299520160..8be4c3b3f48 100644
+index 2a2995201..8be4c3b3f 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
@@ -474,14 +474,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@ -853,7 +853,7 @@ index 2a299520160..8be4c3b3f48 100644
 +  grub_unregister_command (cmd_initrd16);
 }
 diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
-index bcd5a7eb186..b582f67f661 100644
+index bcd5a7eb1..b582f67f6 100644
 --- a/include/grub/arm/linux.h
 +++ b/include/grub/arm/linux.h
@@ -20,6 +20,7 @@
@ -883,7 +883,7 @@ index bcd5a7eb186..b582f67f661 100644
 
 #if defined GRUB_MACHINE_UBOOT
 diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
-index 7e22b4ab699..ea030312df3 100644
+index 7e22b4ab6..ea030312d 100644
 --- a/include/grub/arm64/linux.h
 +++ b/include/grub/arm64/linux.h
@@ -19,6 +19,7 @@
@ -913,7 +913,7 @@ index 7e22b4ab699..ea030312df3 100644
 
 #endif /* ! GRUB_ARM64_LINUX_HEADER */
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 83d958f9945..6295df85f3f 100644
+index 83d958f99..6295df85f 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
@@ -47,6 +47,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
@ -946,7 +946,7 @@ index 83d958f9945..6295df85f3f 100644
 grub_addr_t grub_efi_modules_addr (void);
 diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
 new file mode 100644
-index 00000000000..d9ede36773b
+index 000000000..d9ede3677
 --- /dev/null
 +++ b/include/grub/efi/linux.h
@@ -0,0 +1,31 @@
--- a/0005-Rework-linux-command.patch
+++ b/0005-Rework-linux-command.patch
@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett <mjg59@coreos.com>
 1 file changed, 23 insertions(+), 12 deletions(-)

 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 9f74a96b19a..dccf3bb3005 100644
+index 9f74a96b1..dccf3bb30 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
@@ -649,13 +649,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
--- a/0006-Rework-linux16-command.patch
+++ b/0006-Rework-linux16-command.patch
@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett <mjg59@coreos.com>
 1 file changed, 21 insertions(+), 12 deletions(-)

 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 8be4c3b3f48..4b1750e360e 100644
+index 8be4c3b3f..4b1750e36 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
@@ -124,13 +124,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
--- a/0007-Add-secureboot-support-on-efi-chainloader.patch
+++ b/0007-Add-secureboot-support-on-efi-chainloader.patch
@ -190,7 +190,7 @@ Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
 7 files changed, 844 insertions(+), 90 deletions(-)

 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 35b8f670602..4a2259aa1c7 100644
+index 35b8f6706..4a2259aa1 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
@@ -296,14 +296,20 @@ grub_efi_secure_boot (void)
@ -219,7 +219,7 @@ index 35b8f670602..4a2259aa1c7 100644
   if (*secure_boot && !*setup_mode)
     ret = 1;
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index a312c668685..04994d5c67d 100644
+index a312c6686..04994d5c6 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
@@ -284,6 +284,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@ -241,7 +241,7 @@ index a312c668685..04994d5c67d 100644
       grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
       goto fail;
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 2bd80f4db3d..e6a8d4ad0e9 100644
+index 2bd80f4db..e6a8d4ad0 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
@@ -32,6 +32,8 @@
@ -1184,7 +1184,7 @@ index 2bd80f4db3d..e6a8d4ad0e9 100644
 
   return grub_errno;
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index c24202a5dd1..c8ecce6dfd0 100644
+index c24202a5d..c8ecce6df 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
@@ -33,21 +33,34 @@ struct grub_efi_shim_lock
@ -1229,7 +1229,7 @@ index c24202a5dd1..c8ecce6dfd0 100644
 
 #pragma GCC diagnostic push
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index bb2616a8092..6b24cbb9483 100644
+index bb2616a80..6b24cbb94 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
@@ -117,6 +117,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@ -1297,7 +1297,7 @@ index bb2616a8092..6b24cbb9483 100644
     grub_file_close (file);
 
 diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
-index d9ede36773b..0033d9305a9 100644
+index d9ede3677..0033d9305 100644
 --- a/include/grub/efi/linux.h
 +++ b/include/grub/efi/linux.h
@@ -22,7 +22,7 @@
@ -1310,7 +1310,7 @@ index d9ede36773b..0033d9305a9 100644
 grub_err_t
 EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
 diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
-index 0ed8781f037..a43adf27464 100644
+index 0ed8781f0..a43adf274 100644
 --- a/include/grub/efi/pe32.h
 +++ b/include/grub/efi/pe32.h
@@ -223,7 +223,11 @@ struct grub_pe64_optional_header
--- a/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
+++ b/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
@ -32,7 +32,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 create mode 100644 include/grub/sparc64/linux.h

 diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
-index 584baec8f91..7b2999b14b5 100644
+index 584baec8f..7b2999b14 100644
 --- a/grub-core/commands/iorw.c
 +++ b/grub-core/commands/iorw.c
@@ -24,6 +24,7 @@
@ -64,7 +64,7 @@ index 584baec8f91..7b2999b14b5 100644
   grub_unregister_extcmd (cmd_read_word);
   grub_unregister_extcmd (cmd_read_dword);
 diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c
-index d401a6db0ef..39cf3a06dbd 100644
+index d401a6db0..39cf3a06d 100644
 --- a/grub-core/commands/memrw.c
 +++ b/grub-core/commands/memrw.c
@@ -23,6 +23,7 @@
@ -96,7 +96,7 @@ index d401a6db0ef..39cf3a06dbd 100644
   grub_unregister_extcmd (cmd_read_word);
   grub_unregister_extcmd (cmd_read_dword);
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index b7149370950..7afb9e6f724 100644
+index b71493709..7afb9e6f7 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
@@ -32,6 +32,7 @@
@ -117,7 +117,7 @@ index b7149370950..7afb9e6f724 100644
 #if 0
       /* This is an error, but grub2-mkconfig still generates a pile of
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 4a2259aa1c7..8cff7be0289 100644
+index 4a2259aa1..8cff7be02 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
@@ -286,40 +286,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@ -162,7 +162,7 @@ index 4a2259aa1c7..8cff7be0289 100644
 
 /* Search the mods section from the PE32/PE32+ image. This code uses
 diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
-index 74888c463ba..585f2b57385 100644
+index 74888c463..585f2b573 100644
 --- a/grub-core/loader/efi/appleloader.c
 +++ b/grub-core/loader/efi/appleloader.c
@@ -24,6 +24,7 @@
@ -193,7 +193,7 @@ index 74888c463ba..585f2b57385 100644
   grub_unregister_command (cmd);
 }
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index e6a8d4ad0e9..07c4937898d 100644
+index e6a8d4ad0..07c493789 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
@@ -34,6 +34,7 @@
@ -205,7 +205,7 @@ index e6a8d4ad0e9..07c4937898d 100644
 #include <grub/i18n.h>
 #include <grub/net.h>
 diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
-index 5f3290ce17b..54befc26626 100644
+index 5f3290ce1..54befc266 100644
 --- a/grub-core/loader/i386/bsd.c
 +++ b/grub-core/loader/i386/bsd.c
@@ -40,6 +40,7 @@
@ -237,7 +237,7 @@ index 5f3290ce17b..54befc26626 100644
   grub_unregister_extcmd (cmd_openbsd);
   grub_unregister_extcmd (cmd_netbsd);
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index dccf3bb3005..4aeb0e4b9a6 100644
+index dccf3bb30..4aeb0e4b9 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
@@ -37,6 +37,7 @@
@ -269,7 +269,7 @@ index dccf3bb3005..4aeb0e4b9a6 100644
   grub_unregister_command (cmd_initrd);
 }
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 4b1750e360e..e3fa1221e81 100644
+index 4b1750e36..e3fa1221e 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
@@ -36,6 +36,7 @@
@ -301,7 +301,7 @@ index 4b1750e360e..e3fa1221e81 100644
   grub_unregister_command (cmd_linux16);
   grub_unregister_command (cmd_initrd);
 diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index facb13f3d36..47e481f4576 100644
+index facb13f3d..47e481f45 100644
 --- a/grub-core/loader/multiboot.c
 +++ b/grub-core/loader/multiboot.c
@@ -50,6 +50,7 @@
@ -333,7 +333,7 @@ index facb13f3d36..47e481f4576 100644
   grub_unregister_command (cmd_module);
 }
 diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index 1c0cf6a430a..baa54e652ab 100644
+index 1c0cf6a43..baa54e652 100644
 --- a/grub-core/loader/xnu.c
 +++ b/grub-core/loader/xnu.c
@@ -35,6 +35,7 @@
@ -365,7 +365,7 @@ index 1c0cf6a430a..baa54e652ab 100644
   grub_unregister_command (cmd_resume);
 #endif
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 6295df85f3f..585fa6662b6 100644
+index 6295df85f..585fa6662 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
@@ -91,7 +91,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
@ -378,13 +378,13 @@ index 6295df85f3f..585fa6662b6 100644
 					     const grub_efi_device_path_t *dp2);
 diff --git a/include/grub/ia64/linux.h b/include/grub/ia64/linux.h
 new file mode 100644
-index 00000000000..e69de29bb2d
+index 000000000..e69de29bb
 diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h
 new file mode 100644
-index 00000000000..e69de29bb2d
+index 000000000..e69de29bb
 diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h
 new file mode 100644
-index 00000000000..e69de29bb2d
+index 000000000..e69de29bb
 diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h
 new file mode 100644
-index 00000000000..e69de29bb2d
+index 000000000..e69de29bb
--- a/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
+++ b/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 3 files changed, 89 insertions(+), 37 deletions(-)

 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index c8ecce6dfd0..0622dfa48d4 100644
+index c8ecce6df..0622dfa48 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
@@ -69,12 +69,17 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
@ -37,7 +37,7 @@ index c8ecce6dfd0..0622dfa48d4 100644
 
   return GRUB_ERR_BUG;
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 6b24cbb9483..3017d0f3e52 100644
+index 6b24cbb94..3017d0f3e 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
@@ -44,14 +44,10 @@ static char *linux_cmdline;
@ -245,7 +245,7 @@ index 6b24cbb9483..3017d0f3e52 100644
   if (kernel_mem && !loaded)
     grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
 diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
-index eddf9251d9a..25ef52c04eb 100644
+index eddf9251d..25ef52c04 100644
 --- a/include/grub/i386/linux.h
 +++ b/include/grub/i386/linux.h
@@ -138,7 +138,12 @@ struct linux_i386_kernel_header
--- a/0010-re-write-.gitignore.patch
+++ b/0010-re-write-.gitignore.patch
@ -20,7 +20,7 @@ Subject: [PATCH] re-write .gitignore
 create mode 100644 util/bash-completion.d/.gitignore

 diff --git a/.gitignore b/.gitignore
-index f6a1bd05175..594d0134d33 100644
+index f6a1bd051..594d0134d 100644
 --- a/.gitignore
 +++ b/.gitignore
@@ -275,3 +275,155 @@ widthspec.bin
@ -181,7 +181,7 @@ index f6a1bd05175..594d0134d33 100644
 +/widthspec.h
 diff --git a/docs/.gitignore b/docs/.gitignore
 new file mode 100644
-index 00000000000..e1d849ef95b
+index 000000000..e1d849ef9
 --- /dev/null
 +++ b/docs/.gitignore
@@ -0,0 +1,5 @@
@ -192,7 +192,7 @@ index 00000000000..e1d849ef95b
 +/version*.texi
 diff --git a/grub-core/.gitignore b/grub-core/.gitignore
 new file mode 100644
-index 00000000000..2acce281159
+index 000000000..2acce2811
 --- /dev/null
 +++ b/grub-core/.gitignore
@@ -0,0 +1,16 @@
@ -214,14 +214,14 @@ index 00000000000..2acce281159
 +/trigtables.c
 diff --git a/grub-core/lib/.gitignore b/grub-core/lib/.gitignore
 new file mode 100644
-index 00000000000..68154591404
+index 000000000..681545914
 --- /dev/null
 +++ b/grub-core/lib/.gitignore
@@ -0,0 +1 @@
 +/libgcrypt-grub/
 diff --git a/include/grub/gcrypt/.gitignore b/include/grub/gcrypt/.gitignore
 new file mode 100644
-index 00000000000..8fbf5646246
+index 000000000..8fbf56462
 --- /dev/null
 +++ b/include/grub/gcrypt/.gitignore
@@ -0,0 +1,2 @@
@ -229,7 +229,7 @@ index 00000000000..8fbf5646246
 +gcrypt.h
 diff --git a/po/.gitignore b/po/.gitignore
 new file mode 100644
-index 00000000000..f507e7741e3
+index 000000000..f507e7741
 --- /dev/null
 +++ b/po/.gitignore
@@ -0,0 +1,5 @@
@ -240,7 +240,7 @@ index 00000000000..f507e7741e3
 +/stamp-po
 diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore
 new file mode 100644
-index 00000000000..6813a527ad3
+index 000000000..6813a527a
 --- /dev/null
 +++ b/util/bash-completion.d/.gitignore
@@ -0,0 +1,2 @@
--- a/0011-IBM-client-architecture-CAS-reboot-support.patch
+++ b/0011-IBM-client-architecture-CAS-reboot-support.patch
@ -29,7 +29,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 4 files changed, 91 insertions(+)

 diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
-index 4d493ab7661..3a6689abb11 100644
+index 4d493ab76..3a6689abb 100644
 --- a/grub-core/kern/ieee1275/openfw.c
 +++ b/grub-core/kern/ieee1275/openfw.c
@@ -591,3 +591,66 @@ grub_ieee1275_get_boot_dev (void)
@ -100,7 +100,7 @@ index 4d493ab7661..3a6689abb11 100644
 +  return 0;
 +}
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index c4ebe9e22ad..70614de1565 100644
+index c4ebe9e22..70614de15 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
@@ -34,6 +34,9 @@
@ -137,7 +137,7 @@ index c4ebe9e22ad..70614de1565 100644
       grub_errno = GRUB_ERR_NONE;
     }
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index 25158407dd8..ad80399246a 100644
+index 25158407d..ad8039924 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
@@ -28,6 +28,9 @@
@ -162,7 +162,7 @@ index 25158407dd8..ad80399246a 100644
     {
       char *line;
 diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index 73e2f464475..0a599607f31 100644
+index 73e2f4644..0a599607f 100644
 --- a/include/grub/ieee1275/ieee1275.h
 +++ b/include/grub/ieee1275/ieee1275.h
@@ -254,6 +254,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali
--- a/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch
+++ b/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch
@ -17,7 +17,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
-index 85ecf06b4df..05c88dcf49e 100644
+index 85ecf06b4..05c88dcf4 100644
 --- a/grub-core/term/terminfo.c
 +++ b/grub-core/term/terminfo.c
@@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term,
--- a/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch
+++ b/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch
@ -15,7 +15,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 3 files changed, 12 insertions(+), 4 deletions(-)

 diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
-index 20cbbd761ec..04df9d2c667 100644
+index 20cbbd761..04df9d2c6 100644
 --- a/grub-core/kern/ieee1275/cmain.c
 +++ b/grub-core/kern/ieee1275/cmain.c
@@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
@ -31,7 +31,7 @@ index 20cbbd761ec..04df9d2c667 100644
   /* Old Macs have no key repeat, newer ones have fully working one.
      The ones inbetween when repeated key generates an escaoe sequence
 diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c
-index 17a3dbbb575..b8e4b3feb32 100644
+index 17a3dbbb5..b8e4b3feb 100644
 --- a/grub-core/video/ieee1275.c
 +++ b/grub-core/video/ieee1275.c
@@ -352,9 +352,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
@ -51,7 +51,7 @@ index 17a3dbbb575..b8e4b3feb32 100644
 
 GRUB_MOD_FINI(ieee1275_fb)
 diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index 0a599607f31..b5a1d49bbc3 100644
+index 0a599607f..b5a1d49bb 100644
 --- a/include/grub/ieee1275/ieee1275.h
 +++ b/include/grub/ieee1275/ieee1275.h
@@ -148,6 +148,8 @@ enum grub_ieee1275_flag
--- a/0014-Move-bash-completion-script-922997.patch
+++ b/0014-Move-bash-completion-script-922997.patch
@ -10,7 +10,7 @@ Apparently these go in a new place now.
 2 files changed, 11 insertions(+), 1 deletion(-)

 diff --git a/configure.ac b/configure.ac
-index 7517fc49d98..8331f95b645 100644
+index 7517fc49d..8331f95b6 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -314,6 +314,14 @@ AC_SUBST(grubdirname)
@ -39,7 +39,7 @@ index 7517fc49d98..8331f95b645 100644
 if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
   tmp_ac_tool_prefix="$ac_tool_prefix"
 diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am
-index 136287cf1bf..61108f05429 100644
+index 136287cf1..61108f054 100644
 --- a/util/bash-completion.d/Makefile.am
 +++ b/util/bash-completion.d/Makefile.am
@@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source)
--- a/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch
+++ b/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch
@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 58 insertions(+), 27 deletions(-)

 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 8397886fa05..d7a222e681b 100644
+index 8397886fa..d7a222e68 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
@@ -163,15 +163,40 @@ grub_menu_set_timeout (int timeout)
--- a/0016-Make-exit-take-a-return-code.patch
+++ b/0016-Make-exit-take-a-return-code.patch
@ -27,7 +27,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 14 files changed, 48 insertions(+), 21 deletions(-)

 diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
-index fa498931ed2..2bd3ac76f2d 100644
+index fa498931e..2bd3ac76f 100644
 --- a/grub-core/commands/minicmd.c
 +++ b/grub-core/commands/minicmd.c
@@ -182,12 +182,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
@ -60,7 +60,7 @@ index fa498931ed2..2bd3ac76f2d 100644
 }
 
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 8cff7be0289..05d8237a9b2 100644
+index 8cff7be02..05d8237a9 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
@@ -165,11 +165,16 @@ grub_reboot (void)
@ -83,7 +83,7 @@ index 8cff7be0289..05d8237a9b2 100644
 }
 
 diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
-index 425bb960347..55ea5a11ccd 100644
+index 425bb9603..55ea5a11c 100644
 --- a/grub-core/kern/emu/main.c
 +++ b/grub-core/kern/emu/main.c
@@ -67,7 +67,7 @@ grub_reboot (void)
@ -96,7 +96,7 @@ index 425bb960347..55ea5a11ccd 100644
   grub_reboot ();
 }
 diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index dfd8a8ec488..0ff13bcaf8c 100644
+index dfd8a8ec4..0ff13bcaf 100644
 --- a/grub-core/kern/emu/misc.c
 +++ b/grub-core/kern/emu/misc.c
@@ -151,9 +151,10 @@ xasprintf (const char *fmt, ...)
@ -113,7 +113,7 @@ index dfd8a8ec488..0ff13bcaf8c 100644
 #endif
 
 diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
-index 3314f027fec..36f9134b7b7 100644
+index 3314f027f..36f9134b7 100644
 --- a/grub-core/kern/i386/coreboot/init.c
 +++ b/grub-core/kern/i386/coreboot/init.c
@@ -41,7 +41,7 @@ extern grub_uint8_t _end[];
@ -126,7 +126,7 @@ index 3314f027fec..36f9134b7b7 100644
   /* We can't use grub_fatal() in this function.  This would create an infinite
      loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
 diff --git a/grub-core/kern/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c
-index 271b6fbfabd..9fafe98f015 100644
+index 271b6fbfa..9fafe98f0 100644
 --- a/grub-core/kern/i386/qemu/init.c
 +++ b/grub-core/kern/i386/qemu/init.c
@@ -42,7 +42,7 @@ extern grub_uint8_t _end[];
@ -139,7 +139,7 @@ index 271b6fbfabd..9fafe98f015 100644
   /* We can't use grub_fatal() in this function.  This would create an infinite
      loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index d483e35eed2..e71d1584164 100644
+index d483e35ee..e71d15841 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
@@ -71,7 +71,7 @@ grub_addr_t grub_ieee1275_original_stack;
@ -152,7 +152,7 @@ index d483e35eed2..e71d1584164 100644
   grub_ieee1275_exit ();
 }
 diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
-index 2ed3ff3191e..5c40c34078d 100644
+index 2ed3ff319..5c40c3407 100644
 --- a/grub-core/kern/mips/arc/init.c
 +++ b/grub-core/kern/mips/arc/init.c
@@ -276,7 +276,7 @@ grub_halt (void)
@ -165,7 +165,7 @@ index 2ed3ff3191e..5c40c34078d 100644
   GRUB_ARC_FIRMWARE_VECTOR->exit ();
 
 diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c
-index 7b96531b983..dff598ca7b0 100644
+index 7b96531b9..dff598ca7 100644
 --- a/grub-core/kern/mips/loongson/init.c
 +++ b/grub-core/kern/mips/loongson/init.c
@@ -304,7 +304,7 @@ grub_halt (void)
@ -178,7 +178,7 @@ index 7b96531b983..dff598ca7b0 100644
   grub_halt ();
 }
 diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c
-index be88b77d22d..8b6c55ffc01 100644
+index be88b77d2..8b6c55ffc 100644
 --- a/grub-core/kern/mips/qemu_mips/init.c
 +++ b/grub-core/kern/mips/qemu_mips/init.c
@@ -75,7 +75,7 @@ grub_machine_fini (int flags __attribute__ ((unused)))
@ -191,7 +191,7 @@ index be88b77d22d..8b6c55ffc01 100644
   grub_halt ();
 }
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 3af336ee227..63b586d09cb 100644
+index 3af336ee2..63b586d09 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
@@ -1209,9 +1209,18 @@ grub_abort (void)
@ -215,7 +215,7 @@ index 3af336ee227..63b586d09cb 100644
 grub_fatal (const char *fmt, ...)
 {
 diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
-index 3e338645c57..be2a5be1d07 100644
+index 3e338645c..be2a5be1d 100644
 --- a/grub-core/kern/uboot/init.c
 +++ b/grub-core/kern/uboot/init.c
@@ -39,9 +39,9 @@ extern grub_size_t grub_total_module_size;
@ -240,7 +240,7 @@ index 3e338645c57..be2a5be1d07 100644
   else if (ver > API_SIG_VERSION)
     {
 diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c
-index 782ca72952a..708b060f324 100644
+index 782ca7295..708b060f3 100644
 --- a/grub-core/kern/xen/init.c
 +++ b/grub-core/kern/xen/init.c
@@ -584,7 +584,7 @@ grub_machine_init (void)
@ -253,7 +253,7 @@ index 782ca72952a..708b060f324 100644
   struct sched_shutdown arg;
 
 diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 7d2b5519690..fd18e6320b8 100644
+index 7d2b55196..fd18e6320 100644
 --- a/include/grub/misc.h
 +++ b/include/grub/misc.h
@@ -353,7 +353,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,
--- a/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch
+++ b/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch
@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 2 files changed, 36 insertions(+), 1 deletion(-)

 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 45d3edaa4dc..c865a08b027 100644
+index 45d3edaa4..c865a08b0 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
@@ -207,6 +207,7 @@ kernel = {
@ -22,7 +22,7 @@ index 45d3edaa4dc..c865a08b027 100644
   i386_multiboot = kern/i386/pc/acpi.c;
   i386_coreboot = kern/acpi.c;
 diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
-index 7facacf09c7..6d39bd3ad29 100644
+index 7facacf09..6d39bd3ad 100644
 --- a/grub-core/kern/efi/init.c
 +++ b/grub-core/kern/efi/init.c
@@ -27,8 +27,11 @@
--- a/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch
+++ b/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch
@ -15,7 +15,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 create mode 100644 util/grub.d/20_ppc_terminfo.in

 diff --git a/Makefile.util.def b/Makefile.util.def
-index f8b356cc1fa..2c9b283a230 100644
+index f8b356cc1..2c9b283a2 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
@@ -508,6 +508,13 @@ script = {
@ -34,7 +34,7 @@ index f8b356cc1fa..2c9b283a230 100644
   common = util/grub.d/30_os-prober.in;
 diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in
 new file mode 100644
-index 00000000000..10d66586820
+index 000000000..10d665868
 --- /dev/null
 +++ b/util/grub.d/20_ppc_terminfo.in
@@ -0,0 +1,114 @@
--- a/0019-Add-fw_path-variable-revised.patch
+++ b/0019-Add-fw_path-variable-revised.patch
@ -17,7 +17,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 2 files changed, 30 insertions(+), 8 deletions(-)

 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 73967e2f5b0..d1de9fa6873 100644
+index 73967e2f5..d1de9fa68 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
@@ -128,16 +128,15 @@ grub_set_prefix_and_root (void)
@ -44,7 +44,7 @@ index 73967e2f5b0..d1de9fa6873 100644
     }
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 70614de1565..62571e6dfcc 100644
+index 70614de15..62571e6df 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
@@ -339,7 +339,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
--- a/0020-Pass-x-hex-hex-straight-through-unmolested.patch
+++ b/0020-Pass-x-hex-hex-straight-through-unmolested.patch
@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 3 files changed, 75 insertions(+), 9 deletions(-)

 diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
-index cc3290311f0..8f67a4be7f0 100644
+index cc3290311..8f67a4be7 100644
 --- a/grub-core/commands/wildcard.c
 +++ b/grub-core/commands/wildcard.c
@@ -488,6 +488,12 @@ check_file (const char *dir, const char *basename)
@ -47,7 +47,7 @@ index cc3290311f0..8f67a4be7f0 100644
 	  *optr++ = iptr[1];
 	  iptr += 2;
 diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index ed0b149dca5..8e2294d8ff6 100644
+index ed0b149dc..8e2294d8f 100644
 --- a/grub-core/lib/cmdline.c
 +++ b/grub-core/lib/cmdline.c
@@ -20,6 +20,12 @@
@ -97,7 +97,7 @@ index ed0b149dca5..8e2294d8ff6 100644
 
 	  *buf++ = *c;
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index ad80399246a..0c6dd9c5201 100644
+index ad8039924..0c6dd9c52 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
@@ -56,6 +56,12 @@ static struct grub_script_scope *scope = 0;
--- a/0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+++ b/0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
@ -28,7 +28,7 @@ Signed-off-by: Will Thompson <wjt@endlessm.com>
 create mode 100644 grub-core/commands/loadenv.h

 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index c865a08b027..c15e91943b9 100644
+index c865a08b0..c15e91943 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
@@ -814,6 +814,16 @@ module = {
@ -58,7 +58,7 @@ index c865a08b027..c15e91943b9 100644
 
 diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
 new file mode 100644
-index 00000000000..e907a6a5d28
+index 000000000..e907a6a5d
 --- /dev/null
 +++ b/grub-core/commands/blscfg.c
@@ -0,0 +1,1177 @@
@ -1240,7 +1240,7 @@ index 00000000000..e907a6a5d28
 +  grub_unregister_extcmd (oldcmd);
 +}
 diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
-index cc5971f4dbd..782761c31aa 100644
+index cc5971f4d..782761c31 100644
 --- a/grub-core/commands/legacycfg.c
 +++ b/grub-core/commands/legacycfg.c
@@ -143,7 +143,7 @@ legacy_file (const char *filename)
@ -1263,7 +1263,7 @@ index cc5971f4dbd..782761c31aa 100644
     }
 
 diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
-index 3fd664aac33..163b9a09042 100644
+index 3fd664aac..163b9a090 100644
 --- a/grub-core/commands/loadenv.c
 +++ b/grub-core/commands/loadenv.c
@@ -28,6 +28,8 @@
@ -1358,7 +1358,7 @@ index 3fd664aac33..163b9a09042 100644
 grub_cmd_load_env (grub_extcmd_context_t ctxt, int argc, char **args)
 {
 diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
-index 720e6d8ea3b..b194123eb67 100644
+index 720e6d8ea..b194123eb 100644
 --- a/grub-core/commands/menuentry.c
 +++ b/grub-core/commands/menuentry.c
@@ -78,7 +78,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
@ -1430,7 +1430,7 @@ index 720e6d8ea3b..b194123eb67 100644
   src[len - 1] = ch;
   args[argc - 1] = src;
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 62571e6dfcc..7ca2e5400b1 100644
+index 62571e6df..7ca2e5400 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
@@ -21,6 +21,7 @@
@ -1455,7 +1455,7 @@ index 62571e6dfcc..7ca2e5400b1 100644
       grub_free ((void *) entry->title);
 diff --git a/grub-core/commands/loadenv.h b/grub-core/commands/loadenv.h
 new file mode 100644
-index 00000000000..952f46121bd
+index 000000000..952f46121
 --- /dev/null
 +++ b/grub-core/commands/loadenv.h
@@ -0,0 +1,93 @@
@ -1553,7 +1553,7 @@ index 00000000000..952f46121bd
 +  return 0;
 +}
 diff --git a/include/grub/compiler.h b/include/grub/compiler.h
-index 8f3be3ae706..ebafec68957 100644
+index 8f3be3ae7..ebafec689 100644
 --- a/include/grub/compiler.h
 +++ b/include/grub/compiler.h
@@ -56,4 +56,6 @@
@ -1564,7 +1564,7 @@ index 8f3be3ae706..ebafec68957 100644
 +
 #endif /* ! GRUB_COMPILER_HEADER */
 diff --git a/include/grub/menu.h b/include/grub/menu.h
-index ee2b5e91045..0acdc2aa6bf 100644
+index ee2b5e910..0acdc2aa6 100644
 --- a/include/grub/menu.h
 +++ b/include/grub/menu.h
@@ -20,6 +20,16 @@
@ -1595,7 +1595,7 @@ index ee2b5e91045..0acdc2aa6bf 100644
 typedef struct grub_menu_entry *grub_menu_entry_t;
 
 diff --git a/include/grub/normal.h b/include/grub/normal.h
-index 218cbabccaf..8839ad85a19 100644
+index 218cbabcc..8839ad85a 100644
 --- a/include/grub/normal.h
 +++ b/include/grub/normal.h
@@ -145,7 +145,7 @@ grub_normal_add_menu_entry (int argc, const char **args, char **classes,
--- a/0022-Add-devicetree-loading.patch
+++ b/0022-Add-devicetree-loading.patch
@ -20,7 +20,7 @@ Signed-off-by: David A. Marlin <dmarlin@redhat.com>
 2 files changed, 17 insertions(+), 1 deletion(-)

 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index d3e879b8e5c..8ea2315ebc2 100644
+index d3e879b8e..8ea2315eb 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
@@ -248,7 +248,8 @@ export GRUB_DEFAULT \
@ -34,7 +34,7 @@ index d3e879b8e5c..8ea2315ebc2 100644
 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 e8b01c0d0c7..dc75a1c30bf 100644
+index e8b01c0d0..dc75a1c30 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
@@ -153,6 +153,13 @@ EOF
--- a/0023-Enable-pager-by-default.-985860.patch
+++ b/0023-Enable-pager-by-default.-985860.patch
@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 2 insertions(+)

 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 93a90233ead..858b526c925 100644
+index 93a90233e..858b526c9 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
@@ -43,6 +43,8 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_
--- a/0024-Don-t-say-GNU-Linux-in-generated-menus.patch
+++ b/0024-Don-t-say-GNU-Linux-in-generated-menus.patch
@ -9,7 +9,7 @@ Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
 2 files changed, 4 insertions(+), 4 deletions(-)

 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index dc75a1c30bf..4a499c53a61 100644
+index dc75a1c30..4a499c53a 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
@ -25,7 +25,7 @@ index dc75a1c30bf..4a499c53a61 100644
 fi
 
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index 3b1f4704921..ada20775a14 100644
+index 3b1f47049..ada20775a 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
--- a/0025-Add-.eh_frame-to-list-of-relocations-stripped.patch
+++ b/0025-Add-.eh_frame-to-list-of-relocations-stripped.patch
@ -8,7 +8,7 @@ Subject: [PATCH] Add .eh_frame to list of relocations stripped
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 2a1a886f6d5..191b1a70c6b 100644
+index 2a1a886f6..191b1a70c 100644
 --- a/conf/Makefile.common
 +++ b/conf/Makefile.common
@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
--- a/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch
+++ b/0026-Don-t-require-a-password-to-boot-entries-generated-b.patch
@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 4a499c53a61..cf8d1186981 100644
+index 4a499c53a..cf8d11869 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
@@ -26,7 +26,7 @@ datarootdir="@datarootdir@"
--- a/0027-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
+++ b/0027-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
--- a/0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
+++ b/0027-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
@ -17,7 +17,7 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
 1 file changed, 3 insertions(+), 2 deletions(-)

 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 7ca2e5400b1..02577502116 100644
+index 7ca2e5400..025775021 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
@@ -347,7 +347,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
--- a/0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
+++ b/0028-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 51 insertions(+), 46 deletions(-)

 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 02577502116..880d0ebd454 100644
+index 025775021..880d0ebd4 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
@@ -345,61 +345,66 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
--- a/0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
+++ b/0029-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index cf8d1186981..5f6d3c8d52d 100644
+index cf8d11869..5f6d3c8d5 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
@@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@"
--- a/0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
+++ b/0030-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 8 insertions(+)

 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 301d1ac229a..0f6505bf3b6 100644
+index 301d1ac22..0f6505bf3 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
@@ -253,6 +253,14 @@ version_test_gt ()
--- a/0031-Try-prefix-if-fw_path-doesn-t-work.patch
+++ b/0031-Try-prefix-if-fw_path-doesn-t-work.patch
@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 3 files changed, 82 insertions(+), 82 deletions(-)

 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index e71d1584164..0cd2a627231 100644
+index e71d15841..0cd2a6272 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
@@ -127,23 +127,25 @@ grub_machine_get_bootlocation (char **device, char **path)
@ -56,7 +56,7 @@ index e71d1584164..0cd2a627231 100644
 }
 
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 4d3eb5c1a52..0ef148f4adc 100644
+index 4d3eb5c1a..0ef148f4a 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
@@ -1869,7 +1869,7 @@ grub_net_search_config_file (char *config)
@ -69,7 +69,7 @@ index 4d3eb5c1a52..0ef148f4adc 100644
 
 static struct grub_preboot *fini_hnd;
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 880d0ebd454..d5df4f815b0 100644
+index 880d0ebd4..d5df4f815 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
@@ -335,81 +335,79 @@ grub_enter_normal_mode (const char *config)
--- a/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch
+++ b/0032-Use-rpm-s-sort-for-grub2-mkconfig.patch
@ -16,20 +16,20 @@ Signed-off-by: Thierry Vignaud <thierry.vignaud@gmail.com>
 Signed-off-by: Tim Landscheidt <tim@tim-landscheidt.de>
 [javierm: don't check for rpmvercmp in librpm]
 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
-[rharwood: commit message]
+[rharwood: commit message, migrate to h2m]
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- configure.ac              |  37 ++++++
- Makefile.util.def         |  17 +++
- util/grub-rpm-sort.c      | 281 ++++++++++++++++++++++++++++++++++++++++++++++
- util/grub-mkconfig_lib.in |  11 +-
- util/grub-rpm-sort.8      |  12 ++
- 5 files changed, 357 insertions(+), 1 deletion(-)
+ configure.ac               |  36 ++++++
+ Makefile.util.def          |  17 +++
+ util/grub-rpm-sort.c       | 281 +++++++++++++++++++++++++++++++++++++++++++++
+ docs/man/grub-rpm-sort.h2m |   2 +
+ util/grub-mkconfig_lib.in  |  11 +-
+ 5 files changed, 346 insertions(+), 1 deletion(-)
 create mode 100644 util/grub-rpm-sort.c
- create mode 100644 util/grub-rpm-sort.8
+ create mode 100644 docs/man/grub-rpm-sort.h2m

 diff --git a/configure.ac b/configure.ac
-index bec8535af70..643a13f9147 100644
+index 8331f95b6..87c8f1739 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
@ -40,15 +40,7 @@ index bec8535af70..643a13f9147 100644
 grub_TRANSFORM([grub-script-check])
 grub_TRANSFORM([grub-set-default])
 grub_TRANSFORM([grub-sparc64-setup])
-@@ -95,6 +96,7 @@ grub_TRANSFORM([grub-mkrescue.1])
- grub_TRANSFORM([grub-mkstandalone.3])
- grub_TRANSFORM([grub-ofpathname.3])
- grub_TRANSFORM([grub-probe.3])
-+grub_TRANSFORM([grub-rpm-sort.8])
- grub_TRANSFORM([grub-reboot.3])
- grub_TRANSFORM([grub-render-label.3])
- grub_TRANSFORM([grub-script-check.3])
-@@ -1860,6 +1862,35 @@ fi
+@@ -1837,6 +1838,35 @@ fi
 
 AC_SUBST([LIBDEVMAPPER])
 
@ -84,7 +76,7 @@ index bec8535af70..643a13f9147 100644
 LIBGEOM=
 if test x$host_kernel = xkfreebsd; then
   AC_CHECK_LIB([geom], [geom_gettree], [],
-@@ -2047,6 +2078,7 @@ AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes])
+@@ -2024,6 +2054,7 @@ AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes])
 AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes])
 AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
 AM_CONDITIONAL([COND_GRUB_MOUNT], [test x$enable_grub_mount = xyes])
@ -92,7 +84,7 @@ index bec8535af70..643a13f9147 100644
 AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
 if test x$FONT_SOURCE != x ; then
    HAVE_FONT_SOURCE=1
-@@ -2168,6 +2200,11 @@ echo grub-mount: Yes
+@@ -2145,6 +2176,11 @@ echo grub-mount: Yes
 else
 echo grub-mount: No "($grub_mount_excuse)"
 fi
@ -105,7 +97,7 @@ index bec8535af70..643a13f9147 100644
 echo starfield theme: Yes
 echo With DejaVuSans font from $DJVU_FONT_SOURCE
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 2c9b283a230..bc10cc79722 100644
+index 2c9b283a2..bc10cc797 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
@@ -703,6 +703,23 @@ program = {
@ -134,7 +126,7 @@ index 2c9b283a230..bc10cc79722 100644
   common = util/grub-mkconfig.in;
 diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
 new file mode 100644
-index 00000000000..f33bd1ed568
+index 000000000..f33bd1ed5
 --- /dev/null
 +++ b/util/grub-rpm-sort.c
@@ -0,0 +1,281 @@
@ -419,8 +411,16 @@ index 00000000000..f33bd1ed568
 +
 +  return 0;
 +}
+diff --git a/docs/man/grub-rpm-sort.h2m b/docs/man/grub-rpm-sort.h2m
+new file mode 100644
+index 000000000..fe711ae10
+--- /dev/null
+++ b/docs/man/grub-rpm-sort.h2m
+@@ -0,0 +1,2 @@
+[NAME]
+grub-rpm-sort \- sort input according to RPM version compare
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 0f6505bf3b6..42c2ea9ba50 100644
+index 0f6505bf3..42c2ea9ba 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
@@ -33,6 +33,9 @@ fi
@ -455,21 +455,3 @@ index 0f6505bf3b6..42c2ea9ba50 100644
     return 0
   else
     return 1
-diff --git a/util/grub-rpm-sort.8 b/util/grub-rpm-sort.8
-new file mode 100644
-index 00000000000..8ce21488448
--- /dev/null
-+++ b/util/grub-rpm-sort.8
-@@ -0,0 +1,12 @@
-+.TH GRUB-RPM-SORT 8 "Wed Feb 26 2014"
-+.SH NAME
-+\fBgrub-rpm-sort\fR \(em Sort input according to RPM version compare.
-+
-+.SH SYNOPSIS
-+\fBgrub-rpm-sort\fR [OPTIONS].
-+
-+.SH DESCRIPTION
-+You should not normally run this program directly.  Use grub-mkconfig instead.
-+
-+.SH SEE ALSO
-+.BR "info grub"
--- a/0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+++ b/0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 27 insertions(+), 7 deletions(-)

 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 5f6d3c8d52d..786dbabb4a8 100644
+index 5f6d3c8d5..786dbabb4 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
@@ -78,6 +78,32 @@ case x"$GRUB_FS" in
--- a/0034-Add-friendly-grub2-password-config-tool-985962.patch
+++ b/0034-Add-friendly-grub2-password-config-tool-985962.patch
@ -13,21 +13,23 @@ Signed-off-by: Robert Marshall <rmarshall@redhat.com>
 [pjones: fix the efidir in grub-setpassword and rename tool]
 Signed-off-by: Peter Jones <pjones@redhat.com>
 [luto: fix grub-setpassword -o's output path]
-Andy Lutomirski <luto@kernel.org>
+Signed-off-by: Andy Lutomirski <luto@kernel.org>
+[rharwood: migrate man page to h2m]
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- configure.ac              |   1 +
- Makefile.util.def         |  13 +++++
- util/grub-mkconfig.in     |   2 +
- util/grub-set-password.8  |  28 ++++++++++
- util/grub-set-password.in | 128 ++++++++++++++++++++++++++++++++++++++++++++++
- util/grub.d/01_users.in   |  11 ++++
- 6 files changed, 183 insertions(+)
- create mode 100644 util/grub-set-password.8
+ configure.ac                   |   1 +
+ Makefile.util.def              |  13 +++++
+ docs/man/grub-set-password.h2m |   2 +
+ util/grub-mkconfig.in          |   2 +
+ util/grub-set-password.in      | 128 +++++++++++++++++++++++++++++++++++++++++
+ util/grub.d/01_users.in        |  11 ++++
+ 6 files changed, 157 insertions(+)
+ create mode 100644 docs/man/grub-set-password.h2m
 create mode 100644 util/grub-set-password.in
 create mode 100644 util/grub.d/01_users.in

 diff --git a/configure.ac b/configure.ac
-index 643a13f9147..25e1abb59b9 100644
+index 87c8f1739..916bede6b 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
@ -39,7 +41,7 @@ index 643a13f9147..25e1abb59b9 100644
 grub_TRANSFORM([grub-script-check])
 grub_TRANSFORM([grub-set-default])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index bc10cc79722..8ca4c14f0b9 100644
+index bc10cc797..8ca4c14f0 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
@@ -452,6 +452,12 @@ script = {
@ -69,8 +71,16 @@ index bc10cc79722..8ca4c14f0b9 100644
 script = {
   name = grub-mkconfig_lib;
   common = util/grub-mkconfig_lib.in;
+diff --git a/docs/man/grub-set-password.h2m b/docs/man/grub-set-password.h2m
+new file mode 100644
+index 000000000..10ee82f4d
+--- /dev/null
+++ b/docs/man/grub-set-password.h2m
+@@ -0,0 +1,2 @@
+[NAME]
+grub-set-password \- generate the user.cfg file containing the hashed grub bootloader password
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 8ea2315ebc2..ba14cf6261c 100644
+index 8ea2315eb..ba14cf626 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
@@ -276,6 +276,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
@ -82,43 +92,9 @@ index 8ea2315ebc2..ba14cf6261c 100644
     *)
       if grub_file_is_not_garbage "$i" && test -x "$i" ; then
         echo
-diff --git a/util/grub-set-password.8 b/util/grub-set-password.8
-new file mode 100644
-index 00000000000..9646546e43d
--- /dev/null
-+++ b/util/grub-set-password.8
-@@ -0,0 +1,28 @@
-+.TH GRUB-SET-PASSWORD 3 "Thu Jun 25 2015"
-+.SH NAME
-+\fBgrub-set-password\fR \(em Generate the user.cfg file containing the hashed grub bootloader password.
-+
-+.SH SYNOPSIS
-+\fBgrub-set-password\fR [OPTION]
-+
-+.SH DESCRIPTION
-+\fBgrub-set-password\fR outputs the user.cfg file which contains the hashed GRUB bootloader password. This utility only supports configurations where there is a single root user.
-+
-+The file has the format:
-+GRUB2_PASSWORD=<\fIhashed password\fR>.
-+
-+.SH OPTIONS
-+.TP
-+-h, --help
-+Display program usage and exit.
-+.TP
-+-v, --version
-+Display the current version.
-+.TP
-+-o, --output=<\fIDIRECTORY\fR>
-+Choose the file path to which user.cfg will be written.
-+
-+.SH SEE ALSO
-+.BR "info grub"
-+
-+.BR "info grub2-mkpasswd-pbkdf2"
 diff --git a/util/grub-set-password.in b/util/grub-set-password.in
 new file mode 100644
-index 00000000000..5ebf50576d6
+index 000000000..5ebf50576
 --- /dev/null
 +++ b/util/grub-set-password.in
@@ -0,0 +1,128 @@
@ -252,7 +228,7 @@ index 00000000000..5ebf50576d6
 +fi
 diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in
 new file mode 100644
-index 00000000000..db2f44bfb78
+index 000000000..db2f44bfb
 --- /dev/null
 +++ b/util/grub.d/01_users.in
@@ -0,0 +1,11 @@
--- a/0035-tcp-add-window-scaling-support.patch
+++ b/0035-tcp-add-window-scaling-support.patch
@ -17,7 +17,7 @@ Signed-off-by: Josef Bacik <jbacik@fb.com>
 1 file changed, 29 insertions(+), 13 deletions(-)

 diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c
-index e8ad34b84d4..7d4b822626d 100644
+index e8ad34b84..7d4b82262 100644
 --- a/grub-core/net/tcp.c
 +++ b/grub-core/net/tcp.c
@@ -106,6 +106,18 @@ struct tcphdr
--- a/0036-efinet-and-bootp-add-support-for-dhcpv6.patch
+++ b/0036-efinet-and-bootp-add-support-for-dhcpv6.patch
@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 6 files changed, 477 insertions(+), 14 deletions(-)

 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 6fb5627025d..e28fb6a09f9 100644
+index 6fb562702..e28fb6a09 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
@@ -902,6 +902,179 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
@ -198,7 +198,7 @@ index 6fb5627025d..e28fb6a09f9 100644
 grub_bootp_init (void)
 {
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952ba9..173fb63153c 100644
+index 5388f952b..173fb6315 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
@@ -18,11 +18,14 @@
@ -307,7 +307,7 @@ index 5388f952ba9..173fb63153c 100644
   }
 }
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 0ef148f4adc..22f2689aaeb 100644
+index 0ef148f4a..22f2689aa 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
@@ -960,6 +960,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
@ -390,7 +390,7 @@ index 0ef148f4adc..22f2689aaeb 100644
 grub_err_t
 grub_net_add_ipv4_local (struct grub_net_network_level_interface *inter,
 diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 7f44b30f521..4ab2f5c7357 100644
+index 7f44b30f5..4ab2f5c73 100644
 --- a/grub-core/net/tftp.c
 +++ b/grub-core/net/tftp.c
@@ -358,18 +358,22 @@ tftp_open (struct grub_file *file, const char *filename)
@ -417,7 +417,7 @@ index 7f44b30f521..4ab2f5c7357 100644
       return grub_errno;
     }
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index f1a52210c0c..117469450d3 100644
+index f1a52210c..117469450 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
@@ -592,10 +592,16 @@ typedef void *grub_efi_handle_t;
@ -572,7 +572,7 @@ index f1a52210c0c..117469450d3 100644
 
 typedef struct grub_efi_pxe
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 7ae4b6bd805..8a05ec4fe7a 100644
+index 7ae4b6bd8..8a05ec4fe 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
@@ -447,6 +447,51 @@ struct grub_net_bootp_packet
--- a/0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
+++ b/0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
@ -10,20 +10,21 @@ variables are then used by 10_linux to choose whether or not to create
 debug stanzas.

 Resolves: rhbz#1226325
+[rharwood: migrate man page to h2m]
 ---
- configure.ac                                   |  2 +
+ configure.ac                                   |  1 +
 Makefile.util.def                              |  7 ++
+ docs/man/grub-get-kernel-settings.h2m          |  2 +
 util/bash-completion.d/grub-completion.bash.in | 22 +++++++
- util/grub-get-kernel-settings.3                | 20 ++++++
 util/grub-get-kernel-settings.in               | 88 ++++++++++++++++++++++++++
 util/grub-mkconfig.in                          |  3 +
 util/grub.d/10_linux.in                        | 23 +++++--
- 7 files changed, 160 insertions(+), 5 deletions(-)
- create mode 100644 util/grub-get-kernel-settings.3
+ 7 files changed, 141 insertions(+), 5 deletions(-)
+ create mode 100644 docs/man/grub-get-kernel-settings.h2m
 create mode 100644 util/grub-get-kernel-settings.in

 diff --git a/configure.ac b/configure.ac
-index 25e1abb59b9..58e57a745fa 100644
+index 916bede6b..4f1676967 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -65,6 +65,7 @@ grub_TRANSFORM([grub-install])
@ -34,16 +35,8 @@ index 25e1abb59b9..58e57a745fa 100644
 grub_TRANSFORM([grub-glue-efi])
 grub_TRANSFORM([grub-mklayout])
 grub_TRANSFORM([grub-mkpasswd-pbkdf2])
-@@ -82,6 +83,7 @@ grub_TRANSFORM([grub-file])
- grub_TRANSFORM([grub-bios-setup.3])
- grub_TRANSFORM([grub-editenv.1])
- grub_TRANSFORM([grub-fstest.3])
-+grub_TRANSFORM([grub-get-kernel-settings.3])
- grub_TRANSFORM([grub-glue-efi.3])
- grub_TRANSFORM([grub-install.1])
- grub_TRANSFORM([grub-kbdcomp.3])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 8ca4c14f0b9..43a1c7453b1 100644
+index 8ca4c14f0..43a1c7453 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
@@ -733,6 +733,13 @@ script = {
@ -60,8 +53,16 @@ index 8ca4c14f0b9..43a1c7453b1 100644
 script = {
   name = grub-set-default;
   common = util/grub-set-default.in;
+diff --git a/docs/man/grub-get-kernel-settings.h2m b/docs/man/grub-get-kernel-settings.h2m
+new file mode 100644
+index 000000000..b8051f01f
+--- /dev/null
+++ b/docs/man/grub-get-kernel-settings.h2m
+@@ -0,0 +1,2 @@
+[NAME]
+grub-get-kernel-settings \- Evaluate the system's kernel installation settings for use while making a grub configuration file
 diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
-index 44bf135b9f8..5c4acd496d4 100644
+index 44bf135b9..5c4acd496 100644
 --- a/util/bash-completion.d/grub-completion.bash.in
 +++ b/util/bash-completion.d/grub-completion.bash.in
@@ -264,6 +264,28 @@ have ${__grub_sparc64_setup_program} && \
@ -93,35 +94,9 @@ index 44bf135b9f8..5c4acd496d4 100644
 #
 # grub-install
 #
-diff --git a/util/grub-get-kernel-settings.3 b/util/grub-get-kernel-settings.3
-new file mode 100644
-index 00000000000..ba33330e28d
--- /dev/null
-+++ b/util/grub-get-kernel-settings.3
-@@ -0,0 +1,20 @@
-+.TH GRUB-GET-KERNEL-SETTINGS 3 "Thu Jun 25 2015"
-+.SH NAME
-+\fBgrub-get-kernel-settings\fR \(em Evaluate the system's kernel installation settings for use while making a grub configuration file.
-+
-+.SH SYNOPSIS
-+\fBgrub-get-kernel-settings\fR [OPTION]
-+
-+.SH DESCRIPTION
-+\fBgrub-get-kernel-settings\fR reads the kernel installation settings on the host system, and emits a set of grub settings suitable for use when creating a grub configuration file.
-+
-+.SH OPTIONS
-+.TP
-+-h, --help
-+Display program usage and exit.
-+.TP
-+-v, --version
-+Display the current version.
-+
-+.SH SEE ALSO
-+.BR "info grub"
 diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in
 new file mode 100644
-index 00000000000..7e87dfccc0e
+index 000000000..7e87dfccc
 --- /dev/null
 +++ b/util/grub-get-kernel-settings.in
@@ -0,0 +1,88 @@
@ -214,7 +189,7 @@ index 00000000000..7e87dfccc0e
 +    echo export GRUB_UPDATE_DEFAULT_KERNEL
 +fi
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index ba14cf6261c..005f093809b 100644
+index ba14cf626..005f09380 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
@@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@"
@ -235,7 +210,7 @@ index ba14cf6261c..005f093809b 100644
   if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then
     GRUB_DISABLE_LINUX_UUID="true"
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 786dbabb4a8..292e333324b 100644
+index 786dbabb4..292e33332 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
@@ -111,7 +111,8 @@ linux_entry ()
--- a/0038-bz1374141-fix-incorrect-mask-for-ppc64.patch
+++ b/0038-bz1374141-fix-incorrect-mask-for-ppc64.patch
@ -33,7 +33,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 1 file changed, 1 insertion(+), 2 deletions(-)

 diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
-index ac4e62a95c9..3860b6f78d8 100644
+index ac4e62a95..3860b6f78 100644
 --- a/grub-core/net/drivers/ieee1275/ofnet.c
 +++ b/grub-core/net/drivers/ieee1275/ofnet.c
@@ -220,8 +220,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
--- a/0039-Make-grub_fatal-also-backtrace.patch
+++ b/0039-Make-grub_fatal-also-backtrace.patch
@ -13,7 +13,7 @@ Subject: [PATCH] Make grub_fatal() also backtrace.
 create mode 100644 grub-core/lib/arm64/backtrace.c

 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index c15e91943b9..058c88ac3af 100644
+index c15e91943..058c88ac3 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
@@ -188,6 +188,9 @@ kernel = {
@ -27,7 +27,7 @@ index c15e91943b9..058c88ac3af 100644
   i386_xen = kern/i386/dl.c;
   i386_xen_pvh = kern/i386/dl.c;
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 63b586d09cb..a3e215155bd 100644
+index 63b586d09..a3e215155 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
@@ -24,6 +24,7 @@
@ -55,7 +55,7 @@ index 63b586d09cb..a3e215155bd 100644
 #endif
 diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c
 new file mode 100644
-index 00000000000..1079b5380e1
+index 000000000..1079b5380
 --- /dev/null
 +++ b/grub-core/lib/arm64/backtrace.c
@@ -0,0 +1,62 @@
@ -122,7 +122,7 @@ index 00000000000..1079b5380e1
 +}
 +
 diff --git a/grub-core/lib/backtrace.c b/grub-core/lib/backtrace.c
-index 825a8800e25..c0ad6ab8be1 100644
+index 825a8800e..c0ad6ab8b 100644
 --- a/grub-core/lib/backtrace.c
 +++ b/grub-core/lib/backtrace.c
@@ -29,6 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
@ -142,7 +142,7 @@ index 825a8800e25..c0ad6ab8be1 100644
 }
 
 diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c
-index c3e03c7275c..c67273db3ae 100644
+index c3e03c727..c67273db3 100644
 --- a/grub-core/lib/i386/backtrace.c
 +++ b/grub-core/lib/i386/backtrace.c
@@ -15,11 +15,23 @@
--- a/0040-Make-our-info-pages-say-grub2-where-appropriate.patch
+++ b/0040-Make-our-info-pages-say-grub2-where-appropriate.patch
@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 2 files changed, 171 insertions(+), 154 deletions(-)

 diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
-index 6c629a23e2d..19f708ee662 100644
+index 6c629a23e..19f708ee6 100644
 --- a/docs/grub-dev.texi
 +++ b/docs/grub-dev.texi
@@ -1,7 +1,7 @@
@ -35,7 +35,7 @@ index 6c629a23e2d..19f708ee662 100644
 
 @setchapternewpage odd
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 69f08d289f9..0615d0ed97e 100644
+index 69f08d289..0615d0ed9 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
@@ -1,7 +1,7 @@
--- a/0041-Fix-up-some-man-pages-rpmdiff-noticed.patch
+++ b/0041-Fix-up-some-man-pages-rpmdiff-noticed.patch
@ -1,150 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 23 Sep 2014 09:58:49 -0400
-Subject: [PATCH] Fix up some man pages rpmdiff noticed.
-
---
- configure.ac             |  2 ++
- util/grub-macbless.8     | 26 +++++++++++++++++++
- util/grub-mkimage.1      |  2 +-
- util/grub-syslinux2cfg.1 | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 94 insertions(+), 1 deletion(-)
- create mode 100644 util/grub-macbless.8
- create mode 100644 util/grub-syslinux2cfg.1
-
-diff --git a/configure.ac b/configure.ac
-index 58e57a745fa..a0030632220 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -87,6 +87,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
- grub_TRANSFORM([grub-glue-efi.3])
- grub_TRANSFORM([grub-install.1])
- grub_TRANSFORM([grub-kbdcomp.3])
-+grub_TRANSFORM([grub-macbless.8])
- grub_TRANSFORM([grub-menulst2cfg.1])
- grub_TRANSFORM([grub-mkconfig.1])
- grub_TRANSFORM([grub-mkfont.3])
-@@ -105,6 +106,7 @@ grub_TRANSFORM([grub-render-label.3])
- grub_TRANSFORM([grub-script-check.3])
- grub_TRANSFORM([grub-set-default.1])
- grub_TRANSFORM([grub-sparc64-setup.3])
-+grub_TRANSFORM([grub-syslinux2cfg.1])
- 
- # Optimization flag.  Allow user to override.
- if test "x$TARGET_CFLAGS" = x; then
-diff --git a/util/grub-macbless.8 b/util/grub-macbless.8
-new file mode 100644
-index 00000000000..ae842f3a606
--- /dev/null
-+++ b/util/grub-macbless.8
-@@ -0,0 +1,26 @@
-+.TH GRUB-MACBLESS 1 "Wed Feb 26 2014"
-+.SH NAME
-+\fBgrub-macbless\fR \(em Mac-style bless utility for HFS or HFS+
-+
-+.SH SYNOPSIS
-+\fBgrub-macbless\fR [-p | --ppc] [-v | --verbose] [-x | --x86] \fIFILE\fR
-+
-+.SH DESCRIPTION
-+\fBgrub-mkimage\fR blesses a file on an HFS or HFS+ file system, so that it
-+can be used to boot a Mac.
-+
-+.SH OPTIONS
-+.TP
-+--ppc
-+Bless the file for use on PPC-based Macs.
-+
-+.TP
-+--verbose
-+Print verbose messages.
-+
-+.TP
-+--x86
-+Bless the file for use on x86-based Macs.
-+
-+.SH SEE ALSO
-+.BR "info grub"
-diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
-index 4dea4f54597..0eaaafe505b 100644
--- a/util/grub-mkimage.1
-+++ b/util/grub-mkimage.1
-@@ -17,7 +17,7 @@
- [-v | --verbose] \fIMODULES\fR
- 
- .SH DESCRIPTION
-\fBgrub-mkimage\fI builds a bootable image of GRUB.
-+\fBgrub-mkimage\fR builds a bootable image of GRUB.
- 
- .SH OPTIONS
- .TP
-diff --git a/util/grub-syslinux2cfg.1 b/util/grub-syslinux2cfg.1
-new file mode 100644
-index 00000000000..85309482718
--- /dev/null
-+++ b/util/grub-syslinux2cfg.1
-@@ -0,0 +1,65 @@
-+.TH GRUB-SYSLINUX2CFG 1 "Wed Feb 26 2014"
-+.SH NAME
-+\fBgrub-syslinux2cfg\fR \(em Transform a syslinux config file into a GRUB config.
-+
-+.SH SYNOPSIS
-+\fBgrub-syslinux2cfg\fR [-c | --cwd=\fRDIR\fI] [-r | --root=\fIDIR\fR] [-v | --verbose]
-+.RE
-+.RS 25
-+[-t | --target-root=\fIDIR\fR] [-T | --target-cwd=\fIDIR\fR]
-+.RE
-+.RS 25
-+[-o | --output=\fIFILE\fR] [[-i | --isolinux] |
-+.RE
-+.RS 46
-+ [-s | --syslinux] |
-+.RE
-+.RS 46
-+ [-p | --pxelinux]] \fIFILE\fR
-+
-+.SH DESCRIPTION
-+\fBgrub-syslinux2cfg\fR builds a GRUB configuration file out of an existing
-+syslinux configuration file.
-+
-+.SH OPTIONS
-+.TP
-+--cwd=\fIDIR\fR
-+Set \fIDIR\fR as syslinux's working directory.  The default is to use the
-+parent directory of the input file.
-+
-+.TP
-+--root=\fIDIR\fR
-+Set \fIDIR\fR as the root directory of the syslinux disk.  The default value
-+is "/".
-+
-+.TP
-+--verbose
-+Print verbose messages.
-+
-+.TP
-+--target-root=\fIDIR\fR
-+Root directory as it will be seen at runtime.  The default value is "/".
-+
-+.TP
-+--target-cwd=\fIDIR\fR
-+Working directory of syslinux as it will be seen at runtime.  The default
-+value is the parent directory of the input file.
-+
-+.TP
-+--output=\fIFILE\fR
-+Write the new config file to \fIFILE\fR.  The default value is standard output.
-+
-+.TP
-+--isolinux
-+Assume that the input file is an isolinux configuration file.
-+
-+.TP
-+--pxelinux
-+Assume that the input file is a pxelinux configuration file.
-+
-+.TP
-+--syslinux
-+Assume that the input file is a syslinux configuration file.
-+
-+.SH SEE ALSO
-+.BR "info grub"
--- a/0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch
+++ b/0041-macos-just-build-chainloader-entries-don-t-try-any-x.patch
@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 18 insertions(+), 60 deletions(-)

 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 1b91c102f35..4b27bd20153 100644
+index 1b91c102f..4b27bd201 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
@@ -42,68 +42,25 @@ if [ -z "${OSPROBED}" ] ; then
--- a/0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
+++ b/0042-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
@ -24,7 +24,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
 2 files changed, 533 insertions(+), 20 deletions(-)

 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 63203034dfc..f1fff7385b5 100644
+index 63203034d..f1fff7385 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
@@ -38,6 +38,9 @@
@ -690,7 +690,7 @@ index 63203034dfc..f1fff7385b5 100644
 +
 +// vim: si et sw=2:
 diff --git a/include/grub/btrfs.h b/include/grub/btrfs.h
-index 9d93fb6c182..234ad976771 100644
+index 9d93fb6c1..234ad9767 100644
 --- a/include/grub/btrfs.h
 +++ b/include/grub/btrfs.h
@@ -29,6 +29,7 @@ enum
--- a/0043-export-btrfs_subvol-and-btrfs_subvolid.patch
+++ b/0043-export-btrfs_subvol-and-btrfs_subvolid.patch
@ -12,7 +12,7 @@ Signed-off-by: Michael Chang <mchang@suse.com>
 1 file changed, 2 insertions(+)

 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index f1fff7385b5..ad1b56b716d 100644
+index f1fff7385..ad1b56b71 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
@@ -2714,6 +2714,8 @@ GRUB_MOD_INIT (btrfs)
--- a/0044-grub2-btrfs-03-follow_default.patch
+++ b/0044-grub2-btrfs-03-follow_default.patch
@ -10,7 +10,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 1 file changed, 76 insertions(+), 31 deletions(-)

 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index ad1b56b716d..113c1f746c9 100644
+index ad1b56b71..113c1f746 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
@@ -1256,6 +1256,7 @@ grub_btrfs_mount (grub_device_t dev)
--- a/0045-grub2-btrfs-04-grub2-install.patch
+++ b/0045-grub2-btrfs-04-grub2-install.patch
@ -15,7 +15,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 6 files changed, 54 insertions(+), 2 deletions(-)

 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 001b818fe58..caf9b1ccd3f 100644
+index 001b818fe..caf9b1ccd 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
@@ -376,6 +376,7 @@ get_btrfs_fs_prefix (const char *mount_path)
@ -40,7 +40,7 @@ index 001b818fe58..caf9b1ccd3f 100644
       else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0)
 	{
 diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
-index 7d6325138ce..46a881530c0 100644
+index 7d6325138..46a881530 100644
 --- a/grub-core/osdep/unix/config.c
 +++ b/grub-core/osdep/unix/config.c
@@ -82,6 +82,19 @@ grub_util_load_config (struct grub_util_config *cfg)
@ -75,7 +75,7 @@ index 7d6325138ce..46a881530c0 100644
   argv[2] = script;
   argv[3] = '\0';
 diff --git a/util/config.c b/util/config.c
-index ebcdd8f5e22..f044a880a76 100644
+index ebcdd8f5e..f044a880a 100644
 --- a/util/config.c
 +++ b/util/config.c
@@ -42,6 +42,16 @@ grub_util_parse_config (FILE *f, struct grub_util_config *cfg, int simple)
@ -96,7 +96,7 @@ index ebcdd8f5e22..f044a880a76 100644
 			sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0)
 	{
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 0fbe7f78c6d..0f66f36d23a 100644
+index 0fbe7f78c..0f66f36d2 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
@@ -827,6 +827,8 @@ fill_core_services (const char *core_services)
@ -136,7 +136,7 @@ index 0fbe7f78c6d..0f66f36d23a 100644
   char *install_drive = NULL;
 
 diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
-index 47a241a391b..5db7a9a7d97 100644
+index 47a241a39..5db7a9a7d 100644
 --- a/util/grub-mkrelpath.c
 +++ b/util/grub-mkrelpath.c
@@ -40,9 +40,12 @@ struct arguments
@ -163,7 +163,7 @@ index 47a241a391b..5db7a9a7d97 100644
       if (state->arg_num == 0)
 	arguments->pathname = xstrdup (arg);
 diff --git a/include/grub/emu/config.h b/include/grub/emu/config.h
-index 875d5896ce1..c9a7e5f4ade 100644
+index 875d5896c..c9a7e5f4a 100644
 --- a/include/grub/emu/config.h
 +++ b/include/grub/emu/config.h
@@ -37,6 +37,7 @@ struct grub_util_config
--- a/0046-grub2-btrfs-05-grub2-mkconfig.patch
+++ b/0046-grub2-btrfs-05-grub2-mkconfig.patch
@ -13,7 +13,7 @@ Signed-off-by: Michael Chang <mchang@suse.com>
 5 files changed, 38 insertions(+), 2 deletions(-)

 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 005f093809b..535c0f02499 100644
+index 005f09380..535c0f024 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
@@ -252,7 +252,8 @@ export GRUB_DEFAULT \
@ -27,7 +27,7 @@ index 005f093809b..535c0f02499 100644
 if test "x${grub_cfg}" != "x"; then
   rm -f "${grub_cfg}.new"
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 42c2ea9ba50..fafeac95061 100644
+index 42c2ea9ba..fafeac950 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
@@ -52,7 +52,11 @@ grub_warn ()
@ -43,7 +43,7 @@ index 42c2ea9ba50..fafeac95061 100644
 
 is_path_readable_by_grub ()
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 858b526c925..de727e6ee6b 100644
+index 858b526c9..de727e6ee 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
@@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@"
@ -90,7 +90,7 @@ index 858b526c925..de727e6ee6b 100644
 +EOF
 +fi
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 292e333324b..7bb3a211a7c 100644
+index 292e33332..7bb3a211a 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
@@ -66,10 +66,14 @@ fi
@ -109,7 +109,7 @@ index 292e333324b..7bb3a211a7c 100644
     xzfs)
 	rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index ada20775a14..e9e73b815fb 100644
+index ada20775a..e9e73b815 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
@@ -73,10 +73,14 @@ fi
--- a/0047-grub2-btrfs-06-subvol-mount.patch
+++ b/0047-grub2-btrfs-06-subvol-mount.patch
@ -13,7 +13,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 4 files changed, 392 insertions(+), 5 deletions(-)

 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 113c1f746c9..d323746ecfa 100644
+index 113c1f746..d323746ec 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
@@ -41,6 +41,7 @@
@ -279,7 +279,7 @@ index 113c1f746c9..d323746ecfa 100644
 					 grub_cmd_btrfs_list_subvols, 0,
 					 "[-p|-n] [-o var] DEVICE",
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index caf9b1ccd3f..28790307e00 100644
+index caf9b1ccd..28790307e 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
@@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key
@ -462,7 +462,7 @@ index caf9b1ccd3f..28790307e00 100644
 grub_make_system_path_relative_to_its_root_os (const char *path)
 {
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 0f66f36d23a..84ed6e88ecb 100644
+index 0f66f36d2..84ed6e88e 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
@@ -1569,6 +1569,55 @@ main (int argc, char *argv[])
@ -522,7 +522,7 @@ index 0f66f36d23a..84ed6e88ecb 100644
   const char *core_name = NULL;
 
 diff --git a/include/grub/emu/getroot.h b/include/grub/emu/getroot.h
-index 73fa2d34abb..9c642ae3fe3 100644
+index 73fa2d34a..9c642ae3f 100644
 --- a/include/grub/emu/getroot.h
 +++ b/include/grub/emu/getroot.h
@@ -53,6 +53,11 @@ char **
--- a/0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
+++ b/0048-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
@ -10,7 +10,7 @@ Ref: bsc#953538
 1 file changed, 31 insertions(+), 1 deletion(-)

 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index d323746ecfa..673ded03522 100644
+index d323746ec..673ded035 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
@@ -1260,11 +1260,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
--- a/0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
+++ b/0049-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
@ -10,7 +10,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 1 file changed, 238 insertions(+)

 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 673ded03522..2b21cbaa67e 100644
+index 673ded035..2b21cbaa6 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
@@ -2887,6 +2887,238 @@ out:
--- a/0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
+++ b/0050-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 32 insertions(+), 4 deletions(-)

 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 585fa6662b6..03f9a9d0118 100644
+index 585fa6662..03f9a9d01 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
@@ -24,6 +24,10 @@
--- a/0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch
+++ b/0051-Use-grub_efi_.-memory-helpers-where-reasonable.patch
@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 9 insertions(+), 15 deletions(-)

 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 07c4937898d..89ac84cc663 100644
+index 07c493789..89ac84cc6 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
@@ -65,7 +65,7 @@ grub_chainloader_unload (void)
--- a/0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
+++ b/0052-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 2 files changed, 11 insertions(+), 1 deletion(-)

 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 89ac84cc663..ac8dfd40c61 100644
+index 89ac84cc6..ac8dfd40c 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
@@ -810,7 +810,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
@ -26,7 +26,7 @@ index 89ac84cc663..ac8dfd40c61 100644
   efi_status = grub_efi_free_pool (buffer);
 
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 117469450d3..99628801478 100644
+index 117469450..996288014 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
@@ -546,7 +546,16 @@ typedef grub_uint64_t grub_efi_uint64_t;
--- a/0053-don-t-use-int-for-efi-status.patch
+++ b/0053-don-t-use-int-for-efi-status.patch
@ -8,7 +8,7 @@ Subject: [PATCH] don't use int for efi status
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 05d8237a9b2..ae9885edb84 100644
+index 05d8237a9..ae9885edb 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
@@ -167,7 +167,7 @@ grub_reboot (void)
--- a/0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
+++ b/0054-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
@ -8,7 +8,7 @@ Subject: [PATCH] make GRUB_MOD_INIT() declare its function prototypes.
 1 file changed, 2 insertions(+)

 diff --git a/include/grub/dl.h b/include/grub/dl.h
-index b3753c9ca26..91933b85f2c 100644
+index b3753c9ca..91933b85f 100644
 --- a/include/grub/dl.h
 +++ b/include/grub/dl.h
@@ -54,6 +54,7 @@ grub_mod_fini (void)
--- a/0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
+++ b/0055-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
@ -16,7 +16,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 1 insertion(+), 11 deletions(-)

 diff --git a/util/grub-install.c b/util/grub-install.c
-index 84ed6e88ecb..a2bec7446cb 100644
+index 84ed6e88e..a2bec7446 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
@@ -1190,18 +1190,8 @@ main (int argc, char *argv[])
--- a/0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
+++ b/0056-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 5 insertions(+)

 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index e9e73b815fb..c23b064be6c 100644
+index e9e73b815..c23b064be 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
@@ -153,6 +153,7 @@ linux_entry_xsm ()
--- a/0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
+++ b/0057-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
@ -63,7 +63,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 89 insertions(+), 20 deletions(-)

 diff --git a/grub-core/kern/i386/tsc_pmtimer.c b/grub-core/kern/i386/tsc_pmtimer.c
-index c9c36169978..ca15c3aacd7 100644
+index c9c361699..ca15c3aac 100644
 --- a/grub-core/kern/i386/tsc_pmtimer.c
 +++ b/grub-core/kern/i386/tsc_pmtimer.c
@@ -28,40 +28,101 @@
--- a/0058-align-struct-efi_variable-better.patch
+++ b/0058-align-struct-efi_variable-better.patch
@ -9,7 +9,7 @@ Subject: [PATCH] align struct efi_variable better...
 2 files changed, 2 insertions(+), 1 deletion(-)

 diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h
-index 36d2dedf47e..9d93ba88bac 100644
+index 36d2dedf4..9d93ba88b 100644
 --- a/include/grub/efiemu/runtime.h
 +++ b/include/grub/efiemu/runtime.h
@@ -33,5 +33,5 @@ struct efi_variable
@ -20,7 +20,7 @@ index 36d2dedf47e..9d93ba88bac 100644
 +} GRUB_PACKED GRUB_ALIGNED(8);
 #endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */
 diff --git a/include/grub/types.h b/include/grub/types.h
-index 0a3ff159136..ba446d99040 100644
+index 0a3ff1591..ba446d990 100644
 --- a/include/grub/types.h
 +++ b/include/grub/types.h
@@ -29,6 +29,7 @@
--- a/0059-Add-BLS-support-to-grub-mkconfig.patch
+++ b/0059-Add-BLS-support-to-grub-mkconfig.patch
@ -24,31 +24,16 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
 [iwienand@redhat.com: skip machine ID check when updating entries]
 Signed-off-by: Ian Wienand <iwienand@redhat.com>
-[rharwood: commit message composits]
+[rharwood: commit message composits, drop man pages]
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- util/grub-mkconfig.8      |   4 +
 util/grub-mkconfig.in     |   9 +-
 util/grub-mkconfig_lib.in |  22 ++++-
 util/grub.d/10_linux.in   | 218 +++++++++++++++++++++++++++++++++++++++++++++-
- 4 files changed, 247 insertions(+), 6 deletions(-)
+ 3 files changed, 243 insertions(+), 6 deletions(-)

-diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8
-index a2d1f577b9b..434fa4deda4 100644
--- a/util/grub-mkconfig.8
-+++ b/util/grub-mkconfig.8
-@@ -13,5 +13,9 @@
- \fB--output\fR=\fIFILE\fR
- Write generated output to \fIFILE\fR.
- 
-+.TP
-+\fB--no-grubenv-update\fR
-+Do not update variables in the grubenv file.
-+
- .SH SEE ALSO
- .BR "info grub"
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 535c0f02499..f55339a3f64 100644
+index 535c0f024..f55339a3f 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
@@ -50,6 +50,8 @@ grub_get_kernel_settings="${sbindir}/@grub_get_kernel_settings@"
@ -89,7 +74,7 @@ index 535c0f02499..f55339a3f64 100644
 if test "x${grub_cfg}" != "x"; then
   rm -f "${grub_cfg}.new"
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index fafeac95061..d8bb4069360 100644
+index fafeac950..d8bb40693 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
@@ -30,6 +30,9 @@ fi
@ -146,7 +131,7 @@ index fafeac95061..d8bb4069360 100644
   fi
   IFS="$old_ifs"
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 7bb3a211a7c..9fcd77cacc3 100644
+index 7bb3a211a..9fcd77cac 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
@@ -82,6 +82,218 @@ case x"$GRUB_FS" in
--- a/0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
+++ b/0060-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
@ -12,7 +12,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index a3e215155bd..c60601b699d 100644
+index a3e215155..c60601b69 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
@@ -1201,7 +1201,7 @@ static void __attribute__ ((noreturn))
--- a/0061-Add-linux-and-initrd-commands-for-grub-emu.patch
+++ b/0061-Add-linux-and-initrd-commands-for-grub-emu.patch
@ -21,7 +21,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 create mode 100644 grub-core/loader/emu/linux.c

 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 058c88ac3af..5354f9613d3 100644
+index 058c88ac3..5354f9613 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
@@ -1826,7 +1826,6 @@ module = {
@ -33,7 +33,7 @@ index 058c88ac3af..5354f9613d3 100644
   efi = loader/efi/linux.c;
 };
 diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
-index 55ea5a11ccd..846fe9715ec 100644
+index 55ea5a11c..846fe9715 100644
 --- a/grub-core/kern/emu/main.c
 +++ b/grub-core/kern/emu/main.c
@@ -107,6 +107,7 @@ static struct argp_option options[] = {
@ -55,7 +55,7 @@ index 55ea5a11ccd..846fe9715ec 100644
     case ARGP_KEY_ARG:
       {
 diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index 0ff13bcaf8c..eeea092752d 100644
+index 0ff13bcaf..eeea09275 100644
 --- a/grub-core/kern/emu/misc.c
 +++ b/grub-core/kern/emu/misc.c
@@ -39,6 +39,7 @@
@ -103,7 +103,7 @@ index 0ff13bcaf8c..eeea092752d 100644
 +}
 diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c
 new file mode 100644
-index 00000000000..fda9e00d24c
+index 000000000..fda9e00d2
 --- /dev/null
 +++ b/grub-core/loader/emu/linux.c
@@ -0,0 +1,172 @@
@ -280,7 +280,7 @@ index 00000000000..fda9e00d24c
 +  grub_unregister_command (cmd_initrd);
 +}
 diff --git a/include/grub/emu/exec.h b/include/grub/emu/exec.h
-index d1073ef86af..1b61b4a2e5d 100644
+index d1073ef86..1b61b4a2e 100644
 --- a/include/grub/emu/exec.h
 +++ b/include/grub/emu/exec.h
@@ -23,6 +23,8 @@
@ -302,7 +302,7 @@ index d1073ef86af..1b61b4a2e5d 100644
 grub_util_exec_redirect (const char *const *argv, const char *stdin_file,
 			 const char *stdout_file);
 diff --git a/include/grub/emu/hostfile.h b/include/grub/emu/hostfile.h
-index cfb1e2b5661..a61568e36e9 100644
+index cfb1e2b56..a61568e36 100644
 --- a/include/grub/emu/hostfile.h
 +++ b/include/grub/emu/hostfile.h
@@ -22,6 +22,7 @@
@ -323,7 +323,7 @@ index cfb1e2b5661..a61568e36e9 100644
 char *
 grub_util_path_concat (size_t n, ...);
 diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
-index ff9c48a6490..01056954b96 100644
+index ff9c48a64..01056954b 100644
 --- a/include/grub/emu/misc.h
 +++ b/include/grub/emu/misc.h
@@ -57,6 +57,9 @@ void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format (
@ -337,7 +337,7 @@ index ff9c48a6490..01056954b96 100644
 
 #ifdef HAVE_DEVICE_MAPPER
 diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index ee88e44e97a..80e7a83edf9 100644
+index ee88e44e9..80e7a83ed 100644
 --- a/grub-core/Makefile.am
 +++ b/grub-core/Makefile.am
@@ -307,6 +307,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/net.h
--- a/0062-Add-grub2-switch-to-blscfg.patch
+++ b/0062-Add-grub2-switch-to-blscfg.patch
@ -7,20 +7,20 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
 [jhlavac: Use ${etcdefaultgrub} instead of /etc/default/grub]
 Signed-off-by: Jan Hlavac <jhlavac@redhat.com>
-[rharwood: skip on ostree installations]
+[rharwood: skip on ostree installations, migrate man to h2m]
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- Makefile.util.def             |   7 +
- util/grub-set-password.in     |   2 +-
- util/grub-switch-to-blscfg.8  |  33 +++++
- util/grub-switch-to-blscfg.in | 317 ++++++++++++++++++++++++++++++++++++++++++
- util/grub.d/10_linux.in       |   2 +-
- 5 files changed, 359 insertions(+), 2 deletions(-)
- create mode 100644 util/grub-switch-to-blscfg.8
+ Makefile.util.def                  |   7 +
+ docs/man/grub-switch-to-blscfg.h2m |   2 +
+ util/grub-set-password.in          |   2 +-
+ util/grub-switch-to-blscfg.in      | 317 +++++++++++++++++++++++++++++++++++++
+ util/grub.d/10_linux.in            |   2 +-
+ 5 files changed, 328 insertions(+), 2 deletions(-)
+ create mode 100644 docs/man/grub-switch-to-blscfg.h2m
 create mode 100644 util/grub-switch-to-blscfg.in

 diff --git a/Makefile.util.def b/Makefile.util.def
-index 43a1c7453b1..a90879fa9ba 100644
+index 43a1c7453..a90879fa9 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
@@ -1365,6 +1365,13 @@ program = {
@ -37,8 +37,16 @@ index 43a1c7453b1..a90879fa9ba 100644
 program = {
   name = grub-glue-efi;
   mansection = 1;
+diff --git a/docs/man/grub-switch-to-blscfg.h2m b/docs/man/grub-switch-to-blscfg.h2m
+new file mode 100644
+index 000000000..fa341426a
+--- /dev/null
+++ b/docs/man/grub-switch-to-blscfg.h2m
+@@ -0,0 +1,2 @@
+[NAME]
+grub-switch-to-blscfg \- switch to using BLS config files
 diff --git a/util/grub-set-password.in b/util/grub-set-password.in
-index 5ebf50576d6..c0b5ebbfdc5 100644
+index 5ebf50576..c0b5ebbfd 100644
 --- a/util/grub-set-password.in
 +++ b/util/grub-set-password.in
@@ -1,6 +1,6 @@
@ -49,48 +57,9 @@ index 5ebf50576d6..c0b5ebbfdc5 100644
 if [ -d /sys/firmware/efi/efivars/ ]; then
     grubdir=`echo "/@bootdirname@/efi/EFI/${EFIDIR}/" | sed 's,//*,/,g'`
 else
-diff --git a/util/grub-switch-to-blscfg.8 b/util/grub-switch-to-blscfg.8
-new file mode 100644
-index 00000000000..9a886282976
--- /dev/null
-+++ b/util/grub-switch-to-blscfg.8
-@@ -0,0 +1,33 @@
-+.TH GRUB-SWITCH-TO-BLSCFG 1 "Wed Feb 26 2014"
-+.SH NAME
-+\fBgrub-switch-to-blscfg\fR \(em Switch to using BLS config files.
-+
-+.SH SYNOPSIS
-+\fBgrub-switch-to-blscfg\fR [--grub-directory=\fIDIR\fR] [--config-file=\fIFILE\fR] [--grub-defaults=\fIFILE\fR]
-+
-+.SH DESCRIPTION
-+\fBgrub-switch-to-blscfg\fR reconfigures grub-mkconfig to use BLS-style config files, and then regenerates the GRUB configuration.
-+
-+.SH OPTIONS
-+.TP
-+--grub-directory=\fIDIR\fR
-+Search for grub.cfg under \fIDIR\fR.  The default value is \fI/boot/efi/EFI/\fBVENDOR\fR on UEFI machines and \fI/boot/grub2\fR elsewhere.
-+
-+.TP
-+--config-file=\fIFILE\fR
-+The grub config file to use.  The default value is \fI/etc/grub2-efi.cfg\fR on UEFI machines and \fI/etc/grub2.cfg\fR elsewhere.  Symbolic links will be followed.
-+
-+.TP
-+--grub-defaults=\fIFILE\fR
-+The defaults file for grub-mkconfig.  The default value is \fI/etc/default/grub\fR.
-+
-+.TP
-+--bls-directory=\fIDIR\fR
-+Create BootLoaderSpec fragments in \fIDIR\fR.  The default value is \fI/boot/loader/entries\fR.
-+
-+.TP
-+--backup-suffix=\fSUFFIX\fR
-+The suffix to use for saved backup files.  The default value is \fI.bak\fR.
-+
-+.SH SEE ALSO
-+.BR "info grub"
 diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
 new file mode 100644
-index 00000000000..a851424beb2
+index 000000000..a851424be
 --- /dev/null
 +++ b/util/grub-switch-to-blscfg.in
@@ -0,0 +1,317 @@
@ -412,7 +381,7 @@ index 00000000000..a851424beb2
 +# Bye.
 +exit 0
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 9fcd77cacc3..81f35a2f3f0 100644
+index 9fcd77cac..70d56518b 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
@@ -138,7 +138,7 @@ blsdir="/boot/loader/entries"
--- a/0063-make-better-backtraces.patch
+++ b/0063-make-better-backtraces.patch
@ -38,7 +38,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 delete mode 100644 grub-core/lib/i386/backtrace.c

 diff --git a/Makefile.util.def b/Makefile.util.def
-index a90879fa9ba..48512bc6311 100644
+index a90879fa9..48512bc63 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
@@ -51,6 +51,12 @@ library = {
@ -55,7 +55,7 @@ index a90879fa9ba..48512bc6311 100644
 
 library = {
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 5354f9613d3..4b7c45a7b06 100644
+index 5354f9613..4b7c45a7b 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
@@ -142,6 +142,12 @@ kernel = {
@ -103,7 +103,7 @@ diff --git a/grub-core/lib/backtrace.c b/grub-core/commands/backtrace.c
 similarity index 98%
 rename from grub-core/lib/backtrace.c
 rename to grub-core/commands/backtrace.c
-index c0ad6ab8be1..8b5ec3913b5 100644
+index c0ad6ab8b..8b5ec3913 100644
 --- a/grub-core/lib/backtrace.c
 +++ b/grub-core/commands/backtrace.c
@@ -54,7 +54,7 @@ grub_cmd_backtrace (grub_command_t cmd __attribute__ ((unused)),
@ -116,7 +116,7 @@ index c0ad6ab8be1..8b5ec3913b5 100644
 }
 
 diff --git a/grub-core/gdb/cstub.c b/grub-core/gdb/cstub.c
-index b64acd70fee..99281472d36 100644
+index b64acd70f..99281472d 100644
 --- a/grub-core/gdb/cstub.c
 +++ b/grub-core/gdb/cstub.c
@@ -215,7 +215,6 @@ grub_gdb_trap (int trap_no)
@ -129,7 +129,7 @@ index b64acd70fee..99281472d36 100644
 
 diff --git a/grub-core/kern/arm64/backtrace.c b/grub-core/kern/arm64/backtrace.c
 new file mode 100644
-index 00000000000..019c6fdfef2
+index 000000000..019c6fdfe
 --- /dev/null
 +++ b/grub-core/kern/arm64/backtrace.c
@@ -0,0 +1,94 @@
@ -229,7 +229,7 @@ index 00000000000..019c6fdfef2
 +}
 diff --git a/grub-core/kern/backtrace.c b/grub-core/kern/backtrace.c
 new file mode 100644
-index 00000000000..4a82e865cc6
+index 000000000..4a82e865c
 --- /dev/null
 +++ b/grub-core/kern/backtrace.c
@@ -0,0 +1,97 @@
@ -331,7 +331,7 @@ index 00000000000..4a82e865cc6
 +    grub_backtrace (skip + 1);
 +}
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 7afb9e6f724..88d2077709e 100644
+index 7afb9e6f7..88d207770 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
@@ -124,6 +124,50 @@ grub_dl_resolve_symbol (const char *name)
@ -395,7 +395,7 @@ index 7afb9e6f724..88d2077709e 100644
        i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
 diff --git a/grub-core/kern/i386/backtrace.c b/grub-core/kern/i386/backtrace.c
 new file mode 100644
-index 00000000000..2413f9a57db
+index 000000000..2413f9a57
 --- /dev/null
 +++ b/grub-core/kern/i386/backtrace.c
@@ -0,0 +1,125 @@
@ -525,7 +525,7 @@ index 00000000000..2413f9a57db
 +#endif
 +}
 diff --git a/grub-core/kern/i386/pc/init.c b/grub-core/kern/i386/pc/init.c
-index 27bc68b8a53..b51d0abfa6e 100644
+index 27bc68b8a..b51d0abfa 100644
 --- a/grub-core/kern/i386/pc/init.c
 +++ b/grub-core/kern/i386/pc/init.c
@@ -153,7 +153,7 @@ compact_mem_regions (void)
@ -547,7 +547,7 @@ index 27bc68b8a53..b51d0abfa6e 100644
   /* Initialize the console as early as possible.  */
   grub_console_init ();
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index 0cd2a627231..937c1bc44cb 100644
+index 0cd2a6272..937c1bc44 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
@@ -63,7 +63,6 @@
@ -559,7 +559,7 @@ index 0cd2a627231..937c1bc44cb 100644
 
 #ifdef __sparc__
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index c60601b699d..a432a6be54a 100644
+index c60601b69..a432a6be5 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
@@ -1197,15 +1197,15 @@ grub_printf_fmt_check (const char *fmt, const char *fmt_expected)
@ -593,7 +593,7 @@ index c60601b699d..a432a6be54a 100644
   grub_vprintf (_(fmt), ap);
   va_end (ap);
 diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
-index c070afc621f..d8c8377578b 100644
+index c070afc62..d8c837757 100644
 --- a/grub-core/kern/mm.c
 +++ b/grub-core/kern/mm.c
@@ -97,13 +97,13 @@ get_header_from_pointer (void *ptr, grub_mm_header_t *p, grub_mm_region_t *r)
@ -615,7 +615,7 @@ index c070afc621f..d8c8377578b 100644
 
 diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c
 deleted file mode 100644
-index 1079b5380e1..00000000000
+index 1079b5380..000000000
 --- a/grub-core/lib/arm64/backtrace.c
 +++ /dev/null
@@ -1,62 +0,0 @@
@ -683,7 +683,7 @@ index 1079b5380e1..00000000000
 -
 diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c
 deleted file mode 100644
-index c67273db3ae..00000000000
+index c67273db3..000000000
 --- a/grub-core/lib/i386/backtrace.c
 +++ /dev/null
@@ -1,78 +0,0 @@
@ -766,7 +766,7 @@ index c67273db3ae..00000000000
 -}
 -
 diff --git a/include/grub/backtrace.h b/include/grub/backtrace.h
-index 395519762f0..275cf85e2d3 100644
+index 395519762..275cf85e2 100644
 --- a/include/grub/backtrace.h
 +++ b/include/grub/backtrace.h
@@ -19,8 +19,14 @@
@ -787,7 +787,7 @@ index 395519762f0..275cf85e2d3 100644
 
 #endif
 diff --git a/include/grub/dl.h b/include/grub/dl.h
-index 91933b85f2c..2f76e6b0437 100644
+index 91933b85f..2f76e6b04 100644
 --- a/include/grub/dl.h
 +++ b/include/grub/dl.h
@@ -259,6 +259,8 @@ grub_dl_is_persistent (grub_dl_t mod)
@ -800,7 +800,7 @@ index 91933b85f2c..2f76e6b0437 100644
 				    int isfunc, grub_dl_t mod);
 
 diff --git a/include/grub/kernel.h b/include/grub/kernel.h
-index abbca5ea335..300a9766cda 100644
+index abbca5ea3..300a9766c 100644
 --- a/include/grub/kernel.h
 +++ b/include/grub/kernel.h
@@ -111,6 +111,9 @@ grub_addr_t grub_modules_get_end (void);
@ -814,7 +814,7 @@ index abbca5ea335..300a9766cda 100644
 void grub_main (void) __attribute__ ((noreturn));
 
 diff --git a/grub-core/kern/arm/efi/startup.S b/grub-core/kern/arm/efi/startup.S
-index 9f8265315a9..f3bc41f9d0f 100644
+index 9f8265315..f3bc41f9d 100644
 --- a/grub-core/kern/arm/efi/startup.S
 +++ b/grub-core/kern/arm/efi/startup.S
@@ -23,6 +23,8 @@
@ -827,7 +827,7 @@ index 9f8265315a9..f3bc41f9d0f 100644
 	/*
 	 *  EFI_SYSTEM_TABLE and EFI_HANDLE are passed in r1/r0.
 diff --git a/grub-core/kern/arm/startup.S b/grub-core/kern/arm/startup.S
-index 3946fe8e183..5679a1d00ad 100644
+index 3946fe8e1..5679a1d00 100644
 --- a/grub-core/kern/arm/startup.S
 +++ b/grub-core/kern/arm/startup.S
@@ -48,6 +48,8 @@
@ -840,7 +840,7 @@ index 3946fe8e183..5679a1d00ad 100644
 	b	codestart
 	
 diff --git a/grub-core/kern/arm64/efi/startup.S b/grub-core/kern/arm64/efi/startup.S
-index 666a7ee3c92..41676bdb2b8 100644
+index 666a7ee3c..41676bdb2 100644
 --- a/grub-core/kern/arm64/efi/startup.S
 +++ b/grub-core/kern/arm64/efi/startup.S
@@ -19,7 +19,9 @@
@ -854,7 +854,7 @@ index 666a7ee3c92..41676bdb2b8 100644
 	/*
 	 *  EFI_SYSTEM_TABLE and EFI_HANDLE are passed in x1/x0.
 diff --git a/grub-core/kern/i386/qemu/startup.S b/grub-core/kern/i386/qemu/startup.S
-index 0d89858d9b3..939f182fc74 100644
+index 0d89858d9..939f182fc 100644
 --- a/grub-core/kern/i386/qemu/startup.S
 +++ b/grub-core/kern/i386/qemu/startup.S
@@ -24,7 +24,8 @@
@ -868,7 +868,7 @@ index 0d89858d9b3..939f182fc74 100644
 	jmp	codestart
 
 diff --git a/grub-core/kern/ia64/efi/startup.S b/grub-core/kern/ia64/efi/startup.S
-index d75c6d7cc74..8f2a593e529 100644
+index d75c6d7cc..8f2a593e5 100644
 --- a/grub-core/kern/ia64/efi/startup.S
 +++ b/grub-core/kern/ia64/efi/startup.S
@@ -24,8 +24,9 @@
@ -883,7 +883,7 @@ index d75c6d7cc74..8f2a593e529 100644
 	alloc loc0=ar.pfs,2,4,0,0
 	mov loc1=rp
 diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S
-index 03b916f0534..701bf63abcf 100644
+index 03b916f05..701bf63ab 100644
 --- a/grub-core/kern/sparc64/ieee1275/crt0.S
 +++ b/grub-core/kern/sparc64/ieee1275/crt0.S
@@ -22,7 +22,8 @@
@ -897,7 +897,7 @@ index 03b916f0534..701bf63abcf 100644
 	ba	codestart
 	 mov  %o4, %o0
 diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index 80e7a83edf9..f512573c0da 100644
+index 80e7a83ed..f512573c0 100644
 --- a/grub-core/Makefile.am
 +++ b/grub-core/Makefile.am
@@ -66,6 +66,7 @@ CLEANFILES += grub_script.yy.c grub_script.yy.h
--- a/0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
+++ b/0064-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
@ -8,7 +8,7 @@ Subject: [PATCH] normal: don't draw our startup message if debug is set
 1 file changed, 3 insertions(+)

 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index d5df4f815b0..1970e4816a8 100644
+index d5df4f815..1970e4816 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
@@ -430,6 +430,9 @@ grub_normal_reader_init (int nested)
--- a/0065-Work-around-some-minor-include-path-weirdnesses.patch
+++ b/0065-Work-around-some-minor-include-path-weirdnesses.patch
@ -17,7 +17,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>

 diff --git a/include/grub/arm/efi/console.h b/include/grub/arm/efi/console.h
 new file mode 100644
-index 00000000000..1592f6f76b5
+index 000000000..1592f6f76
 --- /dev/null
 +++ b/include/grub/arm/efi/console.h
@@ -0,0 +1,24 @@
@ -47,7 +47,7 @@ index 00000000000..1592f6f76b5
 +#endif /* ! GRUB_ARM_EFI_CONSOLE_H */
 diff --git a/include/grub/arm64/efi/console.h b/include/grub/arm64/efi/console.h
 new file mode 100644
-index 00000000000..95689339384
+index 000000000..956893393
 --- /dev/null
 +++ b/include/grub/arm64/efi/console.h
@@ -0,0 +1,24 @@
@ -77,7 +77,7 @@ index 00000000000..95689339384
 +#endif /* ! GRUB_ARM64_EFI_CONSOLE_H */
 diff --git a/include/grub/i386/efi/console.h b/include/grub/i386/efi/console.h
 new file mode 100644
-index 00000000000..9231375cb07
+index 000000000..9231375cb
 --- /dev/null
 +++ b/include/grub/i386/efi/console.h
@@ -0,0 +1,24 @@
@ -107,7 +107,7 @@ index 00000000000..9231375cb07
 +#endif /* ! GRUB_I386_EFI_CONSOLE_H */
 diff --git a/include/grub/x86_64/efi/console.h b/include/grub/x86_64/efi/console.h
 new file mode 100644
-index 00000000000..dba9d8678d0
+index 000000000..dba9d8678
 --- /dev/null
 +++ b/include/grub/x86_64/efi/console.h
@@ -0,0 +1,24 @@
--- a/0066-Make-it-possible-to-enabled-build-id-sha1.patch
+++ b/0066-Make-it-possible-to-enabled-build-id-sha1.patch
@ -10,10 +10,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 2 files changed, 27 insertions(+)

 diff --git a/configure.ac b/configure.ac
-index a0030632220..b50fb2e9897 100644
+index 4f1676967..b809c0078 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1470,7 +1470,15 @@ grub_PROG_TARGET_CC
+@@ -1443,7 +1443,15 @@ grub_PROG_TARGET_CC
 if test "x$TARGET_APPLE_LINKER" != x1 ; then
 grub_PROG_OBJCOPY_ABSOLUTE
 fi
@ -30,7 +30,7 @@ index a0030632220..b50fb2e9897 100644
   if test "$platform" != emu && test "x$TARGET_APPLE_LINKER" != x1 ; then
     if test ! -z "$TARGET_IMG_LDSCRIPT"; then
 diff --git a/acinclude.m4 b/acinclude.m4
-index 6e14bb553c6..21238fcfd03 100644
+index 6e14bb553..21238fcfd 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
@@ -136,6 +136,25 @@ if test "x$grub_cv_prog_ld_build_id_none" = xyes; then
--- a/0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
+++ b/0067-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 2 files changed, 20 insertions(+)

 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index a432a6be54a..9a2fae6398e 100644
+index a432a6be5..9a2fae639 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
@@ -191,6 +191,24 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
@ -42,7 +42,7 @@ index a432a6be54a..9a2fae6398e 100644
 
 int
 diff --git a/include/grub/misc.h b/include/grub/misc.h
-index fd18e6320b8..3adc4036e3b 100644
+index fd18e6320..3adc4036e 100644
 --- a/include/grub/misc.h
 +++ b/include/grub/misc.h
@@ -345,6 +345,8 @@ void EXPORT_FUNC(grub_real_dprintf) (const char *file,
--- a/0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
+++ b/0068-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 4 files changed, 78 insertions(+), 4 deletions(-)

 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 88d2077709e..9557254035e 100644
+index 88d207770..955725403 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
@@ -501,6 +501,23 @@ grub_dl_find_section (Elf_Ehdr *e, const char *name)
@ -95,7 +95,7 @@ index 88d2077709e..9557254035e 100644
     {
       grub_dl_unload (mod);
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index ae9885edb84..d6a2fb57789 100644
+index ae9885edb..d6a2fb577 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
@@ -296,7 +296,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@ -117,7 +117,7 @@ index ae9885edb84..d6a2fb57789 100644
     }
 
 diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
-index 6d39bd3ad29..2d12e6188fd 100644
+index 6d39bd3ad..2d12e6188 100644
 --- a/grub-core/kern/efi/init.c
 +++ b/grub-core/kern/efi/init.c
@@ -115,10 +115,33 @@ grub_efi_env_init (void)
@ -164,7 +164,7 @@ index 6d39bd3ad29..2d12e6188fd 100644
 }
 
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 03f9a9d0118..2e0691454b1 100644
+index 03f9a9d01..2e0691454 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
@@ -138,7 +138,7 @@ grub_err_t grub_arch_efi_linux_check_image(struct linux_arch_kernel_header *lh);
--- a/0069-Fixup-for-newer-compiler.patch
+++ b/0069-Fixup-for-newer-compiler.patch
@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 10 May 2018 13:40:19 -0400
+Subject: [PATCH] Fixup for newer compiler
+
+---
+ grub-core/fs/btrfs.c         | 2 +-
+ include/grub/gpt_partition.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
+index 2b21cbaa6..4cc86e9b7 100644
+--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
+@@ -218,7 +218,7 @@ struct grub_btrfs_inode
+   grub_uint64_t size;
+   grub_uint8_t dummy2[0x70];
+   struct grub_btrfs_time mtime;
+-} GRUB_PACKED;
+} GRUB_PACKED  __attribute__ ((aligned(8)));
+ 
+ struct grub_btrfs_extent_data
+ {
+diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
+index 7a93f4329..8212697bf 100644
+--- a/include/grub/gpt_partition.h
+++ b/include/grub/gpt_partition.h
+@@ -76,7 +76,7 @@ struct grub_gpt_partentry
+   grub_uint64_t end;
+   grub_uint64_t attrib;
+   char name[72];
+-} GRUB_PACKED;
+} GRUB_PACKED  __attribute__ ((aligned(8)));
+ 
+ grub_err_t
+ grub_gpt_partition_map_iterate (grub_disk_t disk,
--- a/0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
+++ b/0070-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
@ -26,7 +26,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
 1 file changed, 2 insertions(+)

 diff --git a/include/grub/kernel.h b/include/grub/kernel.h
-index 300a9766cda..55849777eaa 100644
+index 300a9766c..55849777e 100644
 --- a/include/grub/kernel.h
 +++ b/include/grub/kernel.h
@@ -111,8 +111,10 @@ grub_addr_t grub_modules_get_end (void);
--- a/0071-Fixup-for-newer-compiler.patch
+++ b/0071-Fixup-for-newer-compiler.patch
@ -4,33 +4,19 @@ Date: Thu, 10 May 2018 13:40:19 -0400
 Subject: [PATCH] Fixup for newer compiler

 ---
- grub-core/fs/btrfs.c         | 2 +-
- include/grub/gpt_partition.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ conf/Makefile.common | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 2b21cbaa67e..4cc86e9b79e 100644
--- a/grub-core/fs/btrfs.c
-+++ b/grub-core/fs/btrfs.c
-@@ -218,7 +218,7 @@ struct grub_btrfs_inode
-   grub_uint64_t size;
-   grub_uint8_t dummy2[0x70];
-   struct grub_btrfs_time mtime;
-} GRUB_PACKED;
-+} GRUB_PACKED  __attribute__ ((aligned(8)));
+diff --git a/conf/Makefile.common b/conf/Makefile.common
+index 191b1a70c..5f0ef9698 100644
+--- a/conf/Makefile.common
+++ b/conf/Makefile.common
+@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
+ LDFLAGS_KERNEL = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC)
+ CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
+ CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+-STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx
+STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx -R .note.gnu.property -R .gnu.build.attributes
 
- struct grub_btrfs_extent_data
- {
-diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
-index 7a93f43291c..8212697bf6b 100644
--- a/include/grub/gpt_partition.h
-+++ b/include/grub/gpt_partition.h
-@@ -76,7 +76,7 @@ struct grub_gpt_partentry
-   grub_uint64_t end;
-   grub_uint64_t attrib;
-   char name[72];
-} GRUB_PACKED;
-+} GRUB_PACKED  __attribute__ ((aligned(8)));
- 
- grub_err_t
- grub_gpt_partition_map_iterate (grub_disk_t disk,
+ CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding
+ LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
--- a/0072-Add-support-for-non-Ethernet-network-cards.patch
+++ b/0072-Add-support-for-non-Ethernet-network-cards.patch
@ -38,7 +38,7 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
 12 files changed, 219 insertions(+), 152 deletions(-)

 diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
-index 54306e3b16d..67b409a8acc 100644
+index 54306e3b1..67b409a8a 100644
 --- a/grub-core/net/arp.c
 +++ b/grub-core/net/arp.c
@@ -31,22 +31,12 @@ enum
@ -271,7 +271,7 @@ index 54306e3b16d..67b409a8acc 100644
 	/* Change operation to REPLY and send packet */
 	send_ethernet_packet (inf, &nb_reply, target, GRUB_NET_ETHERTYPE_ARP);
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index e28fb6a09f9..08b6b2b5d6c 100644
+index e28fb6a09..08b6b2b5d 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
@@ -233,7 +233,6 @@ grub_net_configure_by_dhcp_ack (const char *name,
@ -318,7 +318,7 @@ index e28fb6a09f9..08b6b2b5d6c 100644
   grub_netbuff_push (nb, sizeof (*udph));
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 173fb63153c..a673bea807a 100644
+index 173fb6315..a673bea80 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
@@ -279,6 +279,9 @@ grub_efinet_findcards (void)
@ -346,7 +346,7 @@ index 173fb63153c..a673bea807a 100644
       card->efi_handle = *handle;
 
 diff --git a/grub-core/net/drivers/emu/emunet.c b/grub-core/net/drivers/emu/emunet.c
-index b194920861f..5b6c5e16a6d 100644
+index b19492086..5b6c5e16a 100644
 --- a/grub-core/net/drivers/emu/emunet.c
 +++ b/grub-core/net/drivers/emu/emunet.c
@@ -46,6 +46,7 @@ static struct grub_net_card emucard =
@ -358,7 +358,7 @@ index b194920861f..5b6c5e16a6d 100644
 		       },
     .flags = 0
 diff --git a/grub-core/net/drivers/i386/pc/pxe.c b/grub-core/net/drivers/i386/pc/pxe.c
-index 3f4152d036c..9f8fb4b6d2b 100644
+index 3f4152d03..9f8fb4b6d 100644
 --- a/grub-core/net/drivers/i386/pc/pxe.c
 +++ b/grub-core/net/drivers/i386/pc/pxe.c
@@ -386,20 +386,21 @@ GRUB_MOD_INIT(pxe)
@ -390,7 +390,7 @@ index 3f4152d036c..9f8fb4b6d2b 100644
 
   grub_pxe_card.default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
 diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
-index 3860b6f78d8..bcb3f9ea02d 100644
+index 3860b6f78..bcb3f9ea0 100644
 --- a/grub-core/net/drivers/ieee1275/ofnet.c
 +++ b/grub-core/net/drivers/ieee1275/ofnet.c
@@ -160,6 +160,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
@ -410,7 +410,7 @@ index 3860b6f78d8..bcb3f9ea02d 100644
 
   card->txbufsize = ALIGN_UP (card->mtu, 64) + 256;
 diff --git a/grub-core/net/drivers/uboot/ubootnet.c b/grub-core/net/drivers/uboot/ubootnet.c
-index 056052e40d5..22ebcbf211e 100644
+index 056052e40..22ebcbf21 100644
 --- a/grub-core/net/drivers/uboot/ubootnet.c
 +++ b/grub-core/net/drivers/uboot/ubootnet.c
@@ -131,6 +131,7 @@ GRUB_MOD_INIT (ubootnet)
@ -422,7 +422,7 @@ index 056052e40d5..22ebcbf211e 100644
       card->txbufsize = ALIGN_UP (card->mtu, 64) + 256;
       card->txbuf = grub_zalloc (card->txbufsize);
 diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c
-index 4d7ceed6f93..9aae83a5eb4 100644
+index 4d7ceed6f..9aae83a5e 100644
 --- a/grub-core/net/ethernet.c
 +++ b/grub-core/net/ethernet.c
@@ -29,13 +29,6 @@
@ -572,7 +572,7 @@ index 4d7ceed6f93..9aae83a5eb4 100644
     {
       /* ARP packet. */
 diff --git a/grub-core/net/icmp6.c b/grub-core/net/icmp6.c
-index 2cbd95dce25..56a3ec5c8e8 100644
+index 2cbd95dce..56a3ec5c8 100644
 --- a/grub-core/net/icmp6.c
 +++ b/grub-core/net/icmp6.c
@@ -231,8 +231,9 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
@ -612,7 +612,7 @@ index 2cbd95dce25..56a3ec5c8e8 100644
 	      }
 	    if (ohdr->type == OPTION_PREFIX && ohdr->len == 4)
 diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
-index ea5edf8f1f6..a5896f6dc26 100644
+index ea5edf8f1..a5896f6dc 100644
 --- a/grub-core/net/ip.c
 +++ b/grub-core/net/ip.c
@@ -276,8 +276,8 @@ handle_dgram (struct grub_net_buff *nb,
@ -627,7 +627,7 @@ index ea5edf8f1f6..a5896f6dc26 100644
 	      grub_net_process_dhcp (nb, inf);
 	      grub_netbuff_free (nb);
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 22f2689aaeb..a46f82362ed 100644
+index 22f2689aa..a46f82362 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
@@ -133,8 +133,9 @@ grub_net_link_layer_resolve (struct grub_net_network_level_interface *inf,
@ -713,7 +713,7 @@ index 22f2689aaeb..a46f82362ed 100644
 
 int
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 8a05ec4fe7a..af0404db7e3 100644
+index 8a05ec4fe..af0404db7 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
@@ -29,7 +29,8 @@
--- a/0073-Fixup-for-newer-compiler.patch
+++ b/0073-Fixup-for-newer-compiler.patch
@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 10 May 2018 13:40:19 -0400
-Subject: [PATCH] Fixup for newer compiler
-
---
- conf/Makefile.common | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 191b1a70c6b..5f0ef969857 100644
--- a/conf/Makefile.common
-+++ b/conf/Makefile.common
-@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
- LDFLAGS_KERNEL = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC)
- CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
- CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
-STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx
-+STRIPFLAGS_KERNEL = -R .eh_frame -R .rel.dyn -R .reginfo -R .note -R .comment -R .drectve -R .note.gnu.gold-version -R .MIPS.abiflags -R .ARM.exidx -R .note.gnu.property -R .gnu.build.attributes
- 
- CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding
- LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d
--- a/0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
+++ b/0073-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
@ -18,7 +18,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 4 files changed, 109 insertions(+), 12 deletions(-)

 diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index b616cf40b1e..12a2632ea55 100644
+index b616cf40b..12a2632ea 100644
 --- a/grub-core/net/http.c
 +++ b/grub-core/net/http.c
@@ -289,7 +289,9 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)),
@ -87,7 +87,7 @@ index b616cf40b1e..12a2632ea55 100644
 				  file);
   if (!data->sock)
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index a46f82362ed..0ce5e675ed7 100644
+index a46f82362..0ce5e675e 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
@@ -444,6 +444,13 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
@ -225,7 +225,7 @@ index a46f82362ed..0ce5e675ed7 100644
 }
 
 diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 4ab2f5c7357..d54b13f09ff 100644
+index 4ab2f5c73..d54b13f09 100644
 --- a/grub-core/net/tftp.c
 +++ b/grub-core/net/tftp.c
@@ -295,6 +295,7 @@ tftp_open (struct grub_file *file, const char *filename)
@ -257,7 +257,7 @@ index 4ab2f5c7357..d54b13f09ff 100644
   if (!data->sock)
     {
 diff --git a/include/grub/net.h b/include/grub/net.h
-index af0404db7e3..d55d505a03a 100644
+index af0404db7..d55d505a0 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
@@ -273,6 +273,7 @@ typedef struct grub_net
--- a/0074-bootp-New-net_bootp6-command.patch
+++ b/0074-bootp-New-net_bootp6-command.patch
@ -19,7 +19,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 5 files changed, 1002 insertions(+), 209 deletions(-)

 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 08b6b2b5d6c..fe93b80f1cf 100644
+index 08b6b2b5d..fe93b80f1 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
@@ -24,6 +24,98 @@
@ -1136,7 +1136,7 @@ index 08b6b2b5d6c..fe93b80f1cf 100644
   grub_unregister_command (cmd_bootp);
   grub_unregister_command (cmd_dhcp);
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index a673bea807a..8e25680db0c 100644
+index a673bea80..8e25680db 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
@@ -393,9 +393,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
@ -1174,7 +1174,7 @@ index a673bea807a..8e25680db0c 100644
       }
     else
 diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
-index a5896f6dc26..ce6bdc75c6d 100644
+index a5896f6dc..ce6bdc75c 100644
 --- a/grub-core/net/ip.c
 +++ b/grub-core/net/ip.c
@@ -239,6 +239,45 @@ handle_dgram (struct grub_net_buff *nb,
@ -1224,7 +1224,7 @@ index a5896f6dc26..ce6bdc75c6d 100644
       {
 	const struct grub_net_bootp_packet *bootp;
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 99628801478..7614b58dca8 100644
+index 996288014..7614b58dc 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
@@ -1532,7 +1532,7 @@ typedef struct grub_efi_pxe_ip_filter
@ -1237,7 +1237,7 @@ index 99628801478..7614b58dca8 100644
 } grub_efi_pxe_ip_filter_t;
 
 diff --git a/include/grub/net.h b/include/grub/net.h
-index d55d505a03a..543251f7273 100644
+index d55d505a0..543251f72 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
@@ -451,50 +451,65 @@ struct grub_net_bootp_packet
--- a/0075-efinet-UEFI-IPv6-PXE-support.patch
+++ b/0075-efinet-UEFI-IPv6-PXE-support.patch
@ -15,7 +15,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
 2 files changed, 46 insertions(+), 27 deletions(-)

 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 8e25680db0c..014e5bf9802 100644
+index 8e25680db..014e5bf98 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
@@ -409,6 +409,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
@ -28,7 +28,7 @@ index 8e25680db0c..014e5bf9802 100644
     else
       {
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 7614b58dca8..91ab528e4d0 100644
+index 7614b58dc..91ab528e4 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
@@ -1524,31 +1524,6 @@ typedef union
--- a/0076-grub.texi-Add-net_bootp6-doument.patch
+++ b/0076-grub.texi-Add-net_bootp6-doument.patch
@ -12,7 +12,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
 1 file changed, 17 insertions(+)

 diff --git a/docs/grub.texi b/docs/grub.texi
-index 0615d0ed97e..04ed6ac1f07 100644
+index 0615d0ed9..04ed6ac1f 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
@@ -5487,6 +5487,7 @@ This command is only available on AArch64 systems.
--- a/0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
+++ b/0077-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
@ -22,7 +22,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
 2 files changed, 56 insertions(+)

 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index fe93b80f1cf..8fb8918ae7e 100644
+index fe93b80f1..8fb8918ae 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
@@ -20,6 +20,7 @@
@ -95,7 +95,7 @@ index fe93b80f1cf..8fb8918ae7e 100644
   if (opt && opt_len)
     grub_env_set_net_property (name, "extensionspath", (const char *) opt, opt_len);
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 543251f7273..42af7de250a 100644
+index 543251f72..42af7de25 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
@@ -531,6 +531,7 @@ enum
--- a/0078-efinet-Setting-network-from-UEFI-device-path.patch
+++ b/0078-efinet-Setting-network-from-UEFI-device-path.patch
@ -32,7 +32,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
 2 files changed, 280 insertions(+), 15 deletions(-)

 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 014e5bf9802..8171ecaa5e4 100644
+index 014e5bf98..8171ecaa5 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
@@ -26,6 +26,7 @@
@ -375,7 +375,7 @@ index 014e5bf9802..8171ecaa5e4 100644
   }
 }
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 91ab528e4d0..4a51667adb1 100644
+index 91ab528e4..4a51667ad 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
@@ -864,6 +864,8 @@ struct grub_efi_ipv4_device_path
--- a/0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch
+++ b/0079-efinet-Setting-DNS-server-from-UEFI-protocol.patch
@ -33,7 +33,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
 2 files changed, 238 insertions(+)

 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 8171ecaa5e4..715a6168d77 100644
+index 8171ecaa5..715a6168d 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
@@ -33,6 +33,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
@ -242,7 +242,7 @@ index 8171ecaa5e4..715a6168d77 100644
     }
 
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 4a51667adb1..0b490195ad9 100644
+index 4a51667ad..0b490195a 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
@@ -352,6 +352,15 @@
--- a/0080-Support-UEFI-networking-protocols.patch
+++ b/0080-Support-UEFI-networking-protocols.patch
@ -57,7 +57,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 create mode 100644 include/grub/net/efi.h

 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 4b7c45a7b06..c40170f2dd2 100644
+index 4b7c45a7b..c40170f2d 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
@@ -2299,6 +2299,12 @@ module = {
@ -87,7 +87,7 @@ index 4b7c45a7b06..c40170f2dd2 100644
 
 module = {
 diff --git a/grub-core/io/bufio.c b/grub-core/io/bufio.c
-index a458c3aca78..1637731535e 100644
+index a458c3aca..163773153 100644
 --- a/grub-core/io/bufio.c
 +++ b/grub-core/io/bufio.c
@@ -139,7 +139,7 @@ grub_bufio_read (grub_file_t file, char *buf, grub_size_t len)
@ -100,7 +100,7 @@ index a458c3aca78..1637731535e 100644
   if (file->offset + res < next_buf)
     {
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index d6a2fb57789..2a446f5031b 100644
+index d6a2fb577..2a446f503 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
@@ -755,7 +755,7 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp)
@ -231,7 +231,7 @@ index d6a2fb57789..2a446f5031b 100644
 	      grub_printf ("/UnknownMessaging(%x)", (unsigned) subtype);
 	      break;
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 715a6168d77..e11d759f19a 100644
+index 715a6168d..e11d759f1 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
@@ -27,6 +27,7 @@
@ -304,7 +304,7 @@ index 715a6168d77..e11d759f19a 100644
 
 diff --git a/grub-core/net/efi/dhcp.c b/grub-core/net/efi/dhcp.c
 new file mode 100644
-index 00000000000..dbef63d8c08
+index 000000000..dbef63d8c
 --- /dev/null
 +++ b/grub-core/net/efi/dhcp.c
@@ -0,0 +1,397 @@
@ -707,7 +707,7 @@ index 00000000000..dbef63d8c08
 +grub_command_func_t grub_efi_net_bootp6 = grub_cmd_efi_bootp6;
 diff --git a/grub-core/net/efi/efi_netfs.c b/grub-core/net/efi/efi_netfs.c
 new file mode 100644
-index 00000000000..ef371d885ea
+index 000000000..ef371d885
 --- /dev/null
 +++ b/grub-core/net/efi/efi_netfs.c
@@ -0,0 +1,57 @@
@ -770,7 +770,7 @@ index 00000000000..ef371d885ea
 +}
 diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
 new file mode 100644
-index 00000000000..3f61fd2fa5b
+index 000000000..3f61fd2fa
 --- /dev/null
 +++ b/grub-core/net/efi/http.c
@@ -0,0 +1,419 @@
@ -1195,7 +1195,7 @@ index 00000000000..3f61fd2fa5b
 +  };
 diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c
 new file mode 100644
-index 00000000000..b711a5d9457
+index 000000000..b711a5d94
 --- /dev/null
 +++ b/grub-core/net/efi/ip4_config.c
@@ -0,0 +1,398 @@
@ -1599,7 +1599,7 @@ index 00000000000..b711a5d9457
 +  };
 diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c
 new file mode 100644
-index 00000000000..017c4d05bc7
+index 000000000..017c4d05b
 --- /dev/null
 +++ b/grub-core/net/efi/ip6_config.c
@@ -0,0 +1,422 @@
@ -2027,7 +2027,7 @@ index 00000000000..017c4d05bc7
 +  };
 diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
 new file mode 100644
-index 00000000000..86bce6535d3
+index 000000000..86bce6535
 --- /dev/null
 +++ b/grub-core/net/efi/net.c
@@ -0,0 +1,1428 @@
@ -3461,7 +3461,7 @@ index 00000000000..86bce6535d3
 +}
 diff --git a/grub-core/net/efi/pxe.c b/grub-core/net/efi/pxe.c
 new file mode 100644
-index 00000000000..531949cba5c
+index 000000000..531949cba
 --- /dev/null
 +++ b/grub-core/net/efi/pxe.c
@@ -0,0 +1,424 @@
@ -3890,7 +3890,7 @@ index 00000000000..531949cba5c
 +  };
 +
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 0ce5e675ed7..55aed92722c 100644
+index 0ce5e675e..55aed9272 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
@@ -32,6 +32,9 @@
@ -4000,7 +4000,7 @@ index 0ce5e675ed7..55aed92722c 100644
 +#endif
 }
 diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c
-index a2461cda1c4..77958dd9dd5 100644
+index a2461cda1..77958dd9d 100644
 --- a/util/grub-mknetdir.c
 +++ b/util/grub-mknetdir.c
@@ -32,13 +32,15 @@
@ -4082,7 +4082,7 @@ index a2461cda1c4..77958dd9dd5 100644
   if (!grub_install_source_directory)
     {
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 0b490195ad9..f431f49973e 100644
+index 0b490195a..f431f4997 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
@@ -622,6 +622,23 @@ typedef union
@ -4333,7 +4333,7 @@ index 0b490195ad9..f431f49973e 100644
   || defined(__riscv)
 diff --git a/include/grub/efi/dhcp.h b/include/grub/efi/dhcp.h
 new file mode 100644
-index 00000000000..fdb88eb810e
+index 000000000..fdb88eb81
 --- /dev/null
 +++ b/include/grub/efi/dhcp.h
@@ -0,0 +1,343 @@
@ -4682,7 +4682,7 @@ index 00000000000..fdb88eb810e
 +#endif /* ! GRUB_EFI_DHCP_HEADER */
 diff --git a/include/grub/efi/http.h b/include/grub/efi/http.h
 new file mode 100644
-index 00000000000..c5e9a89f505
+index 000000000..c5e9a89f5
 --- /dev/null
 +++ b/include/grub/efi/http.h
@@ -0,0 +1,215 @@
@ -4903,7 +4903,7 @@ index 00000000000..c5e9a89f505
 +#endif /* !GRUB_EFI_HTTP_HEADER */
 diff --git a/include/grub/net/efi.h b/include/grub/net/efi.h
 new file mode 100644
-index 00000000000..de90d223e8e
+index 000000000..de90d223e
 --- /dev/null
 +++ b/include/grub/net/efi.h
@@ -0,0 +1,144 @@
--- a/0081-AUDIT-0-http-boot-tracker-bug.patch
+++ b/0081-AUDIT-0-http-boot-tracker-bug.patch
@ -22,7 +22,7 @@ Signed-off-by: Michael Chang <mchang@suse.com>
 2 files changed, 7 insertions(+), 2 deletions(-)

 diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
-index 86bce6535d3..4bb308026ce 100644
+index 86bce6535..4bb308026 100644
 --- a/grub-core/net/efi/net.c
 +++ b/grub-core/net/efi/net.c
@@ -645,8 +645,10 @@ grub_efihttp_chunk_read (grub_file_t file, char *buf,
@ -38,7 +38,7 @@ index 86bce6535d3..4bb308026ce 100644
       if (buf)
 	{
 diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index 12a2632ea55..b52b558d631 100644
+index 12a2632ea..b52b558d6 100644
 --- a/grub-core/net/http.c
 +++ b/grub-core/net/http.c
@@ -31,7 +31,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
--- a/0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch
+++ b/0082-grub-editenv-Add-incr-command-to-increment-integer-v.patch
@ -17,7 +17,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
 1 file changed, 50 insertions(+)

 diff --git a/util/grub-editenv.c b/util/grub-editenv.c
-index db6f187cc63..948eec8a114 100644
+index db6f187cc..948eec8a1 100644
 --- a/util/grub-editenv.c
 +++ b/util/grub-editenv.c
@@ -53,6 +53,9 @@ static struct argp_option options[] = {
--- a/0083-Add-auto-hide-menu-support.patch
+++ b/0083-Add-auto-hide-menu-support.patch
@ -35,12 +35,6 @@ fastboot           If set to "1" and the conditions for auto-hiding the menu
 https://git.launchpad.net/~ubuntu-core-dev/grub/+git/ubuntu/tree/debian/patches/quick_boot.patch

 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
-Changes in v2:
-Drop shutdown_success tests, there is no meaningful way for systemd to set
- this flag (by the time it knows all filesystems are unmounted or read-only
-Drop fwsetup_once support, systemd already supports booting directly into
- the fwsetup by doing "systemctl reboot --firmware"
 ---
 Makefile.util.def                |  6 +++++
 util/grub.d/01_menu_auto_hide.in | 48 ++++++++++++++++++++++++++++++++++++++++
@ -49,7 +43,7 @@ Changes in v2:
 create mode 100644 util/grub.d/01_menu_auto_hide.in

 diff --git a/Makefile.util.def b/Makefile.util.def
-index 48512bc6311..314e6f2acf8 100644
+index 48512bc63..314e6f2ac 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
@@ -458,6 +458,12 @@ script = {
@ -67,7 +61,7 @@ index 48512bc6311..314e6f2acf8 100644
   common = util/grub.d/01_users.in;
 diff --git a/util/grub.d/01_menu_auto_hide.in b/util/grub.d/01_menu_auto_hide.in
 new file mode 100644
-index 00000000000..ad175870a54
+index 000000000..ad175870a
 --- /dev/null
 +++ b/util/grub.d/01_menu_auto_hide.in
@@ -0,0 +1,48 @@
@ -120,7 +114,7 @@ index 00000000000..ad175870a54
 +fi
 +EOF
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 4b27bd20153..3c9431cfcfb 100644
+index 4b27bd201..3c9431cfc 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
@@ -42,6 +42,7 @@ if [ -z "${OSPROBED}" ] ; then
--- a/0084-Add-grub-set-bootflag-utility.patch
+++ b/0084-Add-grub-set-bootflag-utility.patch
@ -33,22 +33,23 @@ and a symlink to grub-boot-success.timer should be added to
 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
 [makhomed: grub-boot-success.timer: Only run if not in a container]
 Signed-off-by: Gena Makhomed <makhomed@gmail.com>
+[rharwood: migrate to h2m]
 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
 Makefile.util.def              |   7 ++
- util/grub-set-bootflag.c       | 160 +++++++++++++++++++++++++++++++++++++++++
+ util/grub-set-bootflag.c       | 172 +++++++++++++++++++++++++++++++++++++++++
 conf/Makefile.extra-dist       |   3 +
 docs/grub-boot-success.service |   6 ++
 docs/grub-boot-success.timer   |   7 ++
- util/grub-set-bootflag.1       |  20 ++++++
- 6 files changed, 203 insertions(+)
+ docs/man/grub-set-bootflag.h2m |   2 +
+ 6 files changed, 197 insertions(+)
 create mode 100644 util/grub-set-bootflag.c
 create mode 100644 docs/grub-boot-success.service
 create mode 100644 docs/grub-boot-success.timer
- create mode 100644 util/grub-set-bootflag.1
+ create mode 100644 docs/man/grub-set-bootflag.h2m

 diff --git a/Makefile.util.def b/Makefile.util.def
-index 314e6f2acf8..0b85a7fce4a 100644
+index 314e6f2ac..0b85a7fce 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
@@ -1446,3 +1446,10 @@ program = {
@ -64,10 +65,10 @@ index 314e6f2acf8..0b85a7fce4a 100644
 +};
 diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c
 new file mode 100644
-index 00000000000..bb198f02351
+index 000000000..d506f7e75
 --- /dev/null
 +++ b/util/grub-set-bootflag.c
-@@ -0,0 +1,160 @@
+@@ -0,0 +1,172 @@
 +/* grub-set-bootflag.c - tool to set boot-flags in the grubenv. */
 +/*
 + *  GRUB  --  GRand Unified Bootloader
@ -101,6 +102,8 @@ index 00000000000..bb198f02351
 +#include <string.h>
 +#include <unistd.h>
 +
+#include "progname.h"
+
 +#define GRUBENV "/" GRUB_BOOT_DIR_NAME "/" GRUB_DIR_NAME "/" GRUB_ENVBLK_DEFCFG
 +#define GRUBENV_SIZE 1024
 +
@ -110,13 +113,13 @@ index 00000000000..bb198f02351
 +  NULL
 +};
 +
-+static void usage(void)
+static void usage(FILE *out)
 +{
 +  int i;
 +
-+  fprintf (stderr, "Usage: 'grub-set-bootflag <bootflag>', where <bootflag> is one of:\n");
+  fprintf (out, "Usage: 'grub-set-bootflag <bootflag>', where <bootflag> is one of:\n");
 +  for (i = 0; bootflags[i]; i++)
-+    fprintf (stderr, "  %s\n", bootflags[i]);
+    fprintf (out, "  %s\n", bootflags[i]);
 +}
 +
 +int main(int argc, char *argv[])
@ -129,9 +132,19 @@ index 00000000000..bb198f02351
 +
 +  if (argc != 2)
 +    {
-+      usage();
+      usage (stderr);
 +      return 1;
 +    }
+  else if (!strcmp (argv[1], "--help"))
+    {
+      usage (stdout);
+      return 0;
+    }
+  else if (!strcmp (argv[1], "--version"))
+    {
+      printf ("grub-set-bootflag (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
+      return 0;
+    }
 +
 +  for (i = 0; bootflags[i]; i++)
 +    if (!strcmp (argv[1], bootflags[i]))
@ -139,7 +152,7 @@ index 00000000000..bb198f02351
 +  if (!bootflags[i])
 +    {
 +      fprintf (stderr, "Invalid bootflag: '%s'\n", argv[1]);
-+      usage();
+      usage (stderr);
 +      return 1;
 +    }
 +
@ -229,10 +242,10 @@ index 00000000000..bb198f02351
 +  return 0;
 +}
 diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index b909f2c073a..ea58362b555 100644
+index 8f1485d52..ad235de7f 100644
 --- a/conf/Makefile.extra-dist
 +++ b/conf/Makefile.extra-dist
-@@ -14,6 +14,9 @@ EXTRA_DIST += util/import_unicode.py
+@@ -15,6 +15,9 @@ EXTRA_DIST += docs/man
 EXTRA_DIST += docs/autoiso.cfg
 EXTRA_DIST += docs/grub.cfg
 EXTRA_DIST += docs/osdetect.cfg
@ -244,7 +257,7 @@ index b909f2c073a..ea58362b555 100644
 
 diff --git a/docs/grub-boot-success.service b/docs/grub-boot-success.service
 new file mode 100644
-index 00000000000..80e79584c91
+index 000000000..80e79584c
 --- /dev/null
 +++ b/docs/grub-boot-success.service
@@ -0,0 +1,6 @@
@ -256,7 +269,7 @@ index 00000000000..80e79584c91
 +ExecStart=/usr/sbin/grub2-set-bootflag boot_success
 diff --git a/docs/grub-boot-success.timer b/docs/grub-boot-success.timer
 new file mode 100644
-index 00000000000..406f1720056
+index 000000000..406f17200
 --- /dev/null
 +++ b/docs/grub-boot-success.timer
@@ -0,0 +1,7 @@
@ -267,29 +280,11 @@ index 00000000000..406f1720056
 +
 +[Timer]
 +OnActiveSec=2min
-diff --git a/util/grub-set-bootflag.1 b/util/grub-set-bootflag.1
+diff --git a/docs/man/grub-set-bootflag.h2m b/docs/man/grub-set-bootflag.h2m
 new file mode 100644
-index 00000000000..57801da22a0
+index 000000000..94ec0b92e
 --- /dev/null
-+++ b/util/grub-set-bootflag.1
-@@ -0,0 +1,20 @@
-+.TH GRUB-SET-BOOTFLAG 1 "Tue Jun 12 2018"
-+.SH NAME
-+\fBgrub-set-bootflag\fR \(em Set a bootflag in the GRUB environment block.
-+
-+.SH SYNOPSIS
-+\fBgrub-set-bootflag\fR <\fIBOOTFLAG\fR>
-+
-+.SH DESCRIPTION
-+\fBgrub-set-bootflag\fR is a command line to set bootflags in GRUB's
-+stored environment.
-+
-+.SH COMMANDS
-+.TP
-+\fBBOOTFLAG\fR
-+.RS 7
-+Bootflag to set, one of \fIboot_success\fR or \fIshow_menu_once\fR.
-+.RE
-+
-+.SH SEE ALSO
-+.BR "info grub"
+++ b/docs/man/grub-set-bootflag.h2m
+@@ -0,0 +1,2 @@
+[NAME]
+grub-set-bootflag \- set a bootflag in the GRUB environment block
--- a/0085-docs-Add-grub-boot-indeterminate.service-example.patch
+++ b/0085-docs-Add-grub-boot-indeterminate.service-example.patch
@ -16,7 +16,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>

 diff --git a/docs/grub-boot-indeterminate.service b/docs/grub-boot-indeterminate.service
 new file mode 100644
-index 00000000000..6c8dcb186b6
+index 000000000..6c8dcb186
 --- /dev/null
 +++ b/docs/grub-boot-indeterminate.service
@@ -0,0 +1,11 @@
--- a/0086-gentpl-add-disable-support.patch
+++ b/0086-gentpl-add-disable-support.patch
@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 13 insertions(+), 1 deletion(-)

 diff --git a/gentpl.py b/gentpl.py
-index 2cba0bbbd6f..628e8bec1d7 100644
+index c86550d4f..f3c5f84f8 100644
 --- a/gentpl.py
 +++ b/gentpl.py
@@ -592,11 +592,21 @@ def platform_conditional(platform, closure):
--- a/0087-gentpl-add-pc-firmware-type.patch
+++ b/0087-gentpl-add-pc-firmware-type.patch
@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 1 insertion(+)

 diff --git a/gentpl.py b/gentpl.py
-index 628e8bec1d7..34a4eba2b42 100644
+index f3c5f84f8..f09b33686 100644
 --- a/gentpl.py
 +++ b/gentpl.py
@@ -51,6 +51,7 @@ GROUPS["riscv32"]  = [ "riscv32_efi" ]
--- a/0088-efinet-also-use-the-firmware-acceleration-for-http.patch
+++ b/0088-efinet-also-use-the-firmware-acceleration-for-http.patch
@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
-index 4bb308026ce..6603cd83edc 100644
+index 4bb308026..6603cd83e 100644
 --- a/grub-core/net/efi/net.c
 +++ b/grub-core/net/efi/net.c
@@ -1324,7 +1324,9 @@ grub_efi_net_boot_from_https (void)
--- a/0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
+++ b/0089-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 19 insertions(+)

 diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index 3f61fd2fa5b..243acbaa35b 100644
+index 3f61fd2fa..243acbaa3 100644
 --- a/grub-core/net/efi/http.c
 +++ b/grub-core/net/efi/http.c
@@ -4,6 +4,7 @@
--- a/0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
+++ b/0090-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
@ -17,10 +17,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 3 files changed, 64 insertions(+), 16 deletions(-)

 diff --git a/configure.ac b/configure.ac
-index b50fb2e9897..b27573b3de5 100644
+index b809c0078..b1ca89479 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -877,11 +877,23 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
+@@ -850,11 +850,23 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
   TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow"
 fi
 
@ -45,7 +45,7 @@ index b50fb2e9897..b27573b3de5 100644
   AC_CACHE_CHECK([for options to get soft-float], grub_cv_target_cc_soft_float, [
     grub_cv_target_cc_soft_float=no
     if test "x$target_cpu" = xarm64; then
-@@ -2011,6 +2023,41 @@ HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
+@@ -1984,6 +1996,41 @@ HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
 TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_srcdir)/include"
 TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_builddir)/include"
 
@ -88,7 +88,7 @@ index b50fb2e9897..b27573b3de5 100644
 GRUB_PLATFORM="${platform}"
 
 diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 5f0ef969857..2ff9b39357c 100644
+index 5f0ef9698..2ff9b3935 100644
 --- a/conf/Makefile.common
 +++ b/conf/Makefile.common
@@ -40,24 +40,25 @@ CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
@ -129,7 +129,7 @@ index 5f0ef969857..2ff9b39357c 100644
 # Other variables
 
 diff --git a/gentpl.py b/gentpl.py
-index 34a4eba2b42..59f62ef9522 100644
+index f09b33686..0e62e1466 100644
 --- a/gentpl.py
 +++ b/gentpl.py
@@ -697,10 +697,10 @@ def module(defn, platform):
--- a/0091-module-verifier-make-it-possible-to-run-checkers-on-.patch
+++ b/0091-module-verifier-make-it-possible-to-run-checkers-on-.patch
@ -22,7 +22,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 3 files changed, 13 insertions(+)

 diff --git a/util/grub-module-verifier32.c b/util/grub-module-verifier32.c
-index 257229f8f08..ba7d41aafea 100644
+index 257229f8f..ba7d41aaf 100644
 --- a/util/grub-module-verifier32.c
 +++ b/util/grub-module-verifier32.c
@@ -1,2 +1,4 @@
@ -31,7 +31,7 @@ index 257229f8f08..ba7d41aafea 100644
 #include "grub-module-verifierXX.c"
 +#endif
 diff --git a/util/grub-module-verifier64.c b/util/grub-module-verifier64.c
-index 4db6b4bedd1..fc23ef800b3 100644
+index 4db6b4bed..fc23ef800 100644
 --- a/util/grub-module-verifier64.c
 +++ b/util/grub-module-verifier64.c
@@ -1,2 +1,4 @@
@ -40,7 +40,7 @@ index 4db6b4bedd1..fc23ef800b3 100644
 #include "grub-module-verifierXX.c"
 +#endif
 diff --git a/util/grub-module-verifierXX.c b/util/grub-module-verifierXX.c
-index ceb24309aec..a98e2f9b1ac 100644
+index ceb24309a..a98e2f9b1 100644
 --- a/util/grub-module-verifierXX.c
 +++ b/util/grub-module-verifierXX.c
@@ -1,3 +1,12 @@
--- a/0092-Rework-how-the-fdt-command-builds.patch
+++ b/0092-Rework-how-the-fdt-command-builds.patch
@ -25,7 +25,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 5 files changed, 11 insertions(+), 5 deletions(-)

 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index c40170f2dd2..84a3d89de9a 100644
+index c40170f2d..84a3d89de 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
@@ -177,7 +177,6 @@ kernel = {
@ -62,7 +62,7 @@ index c40170f2dd2..84a3d89de9a 100644
 };
 
 diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c
-index 0d371c5633e..37e04bd69e7 100644
+index 0d371c563..37e04bd69 100644
 --- a/grub-core/lib/fdt.c
 +++ b/grub-core/lib/fdt.c
@@ -21,8 +21,6 @@
@ -75,7 +75,7 @@ index 0d371c5633e..37e04bd69e7 100644
 
 #define FDT_BEGIN_NODE	0x00000001
 diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
-index c86f283d756..c572415d38a 100644
+index c86f283d7..c572415d3 100644
 --- a/grub-core/loader/efi/fdt.c
 +++ b/grub-core/loader/efi/fdt.c
@@ -27,6 +27,8 @@
@ -88,7 +88,7 @@ index c86f283d756..c572415d38a 100644
 static void *fdt;
 
 diff --git a/include/grub/fdt.h b/include/grub/fdt.h
-index e609c7e4111..3514aa4a5b6 100644
+index e609c7e41..3514aa4a5 100644
 --- a/include/grub/fdt.h
 +++ b/include/grub/fdt.h
@@ -19,6 +19,9 @@
@ -110,7 +110,7 @@ index e609c7e4111..3514aa4a5b6 100644
 +
 #endif	/* ! GRUB_FDT_HEADER */
 diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index f512573c0da..dd49939aaa9 100644
+index f512573c0..dd49939aa 100644
 --- a/grub-core/Makefile.am
 +++ b/grub-core/Makefile.am
@@ -76,6 +76,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h
--- a/0093-Disable-non-wordsize-allocations-on-arm.patch
+++ b/0093-Disable-non-wordsize-allocations-on-arm.patch
@ -9,10 +9,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 20 insertions(+)

 diff --git a/configure.ac b/configure.ac
-index b27573b3de5..bb4e05ceef3 100644
+index b1ca89479..f42be6533 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1288,6 +1288,26 @@ if test "x$target_cpu" = xarm; then
+@@ -1261,6 +1261,26 @@ if test "x$target_cpu" = xarm; then
     done
   ])
 
--- a/0094-Prepend-prefix-when-HTTP-path-is-relative.patch
+++ b/0094-Prepend-prefix-when-HTTP-path-is-relative.patch
@ -16,7 +16,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 2 files changed, 71 insertions(+), 21 deletions(-)

 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index d1de9fa6873..1c540fc8c26 100644
+index d1de9fa68..1c540fc8c 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
@@ -131,11 +131,19 @@ grub_set_prefix_and_root (void)
@ -41,7 +41,7 @@ index d1de9fa6873..1c540fc8c26 100644
 	}
     }
 diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index 243acbaa35b..de351b2cd03 100644
+index 243acbaa3..de351b2cd 100644
 --- a/grub-core/net/efi/http.c
 +++ b/grub-core/net/efi/http.c
@@ -9,10 +9,52 @@
--- a/0095-Make-grub_error-more-verbose.patch
+++ b/0095-Make-grub_error-more-verbose.patch
@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 2 files changed, 17 insertions(+), 4 deletions(-)

 diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c
-index 53c734de70e..aebfe0cf839 100644
+index 53c734de7..aebfe0cf8 100644
 --- a/grub-core/kern/err.c
 +++ b/grub-core/kern/err.c
@@ -33,15 +33,24 @@ static struct grub_error_saved grub_error_stack_items[GRUB_ERROR_STACK_SIZE];
@ -41,7 +41,7 @@ index 53c734de70e..aebfe0cf839 100644
 
   return n;
 diff --git a/include/grub/err.h b/include/grub/err.h
-index b08d5d0de4c..c0f90ef07c8 100644
+index b08d5d0de..c0f90ef07 100644
 --- a/include/grub/err.h
 +++ b/include/grub/err.h
@@ -85,8 +85,12 @@ struct grub_error_saved
--- a/0096-Make-reset-an-alias-for-the-reboot-command.patch
+++ b/0096-Make-reset-an-alias-for-the-reboot-command.patch
@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 1 file changed, 7 insertions(+), 4 deletions(-)

 diff --git a/grub-core/commands/reboot.c b/grub-core/commands/reboot.c
-index 46d364c99a9..f5cc2283636 100644
+index 46d364c99..f5cc22836 100644
 --- a/grub-core/commands/reboot.c
 +++ b/grub-core/commands/reboot.c
@@ -32,15 +32,18 @@ grub_cmd_reboot (grub_command_t cmd __attribute__ ((unused)),
--- a/0097-Add-a-version-command.patch
+++ b/0097-Add-a-version-command.patch
@ -17,10 +17,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 create mode 100644 grub-core/commands/version.c

 diff --git a/configure.ac b/configure.ac
-index bb4e05ceef3..59ccda24475 100644
+index f42be6533..2af5f23ad 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -312,6 +312,19 @@ AC_SUBST(target_cpu)
+@@ -285,6 +285,19 @@ AC_SUBST(target_cpu)
 AC_SUBST(platform)
 
 # Define default variables
@ -41,7 +41,7 @@ index bb4e05ceef3..59ccda24475 100644
 have_with_bootdir=n
 AC_ARG_WITH([bootdir],
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 84a3d89de9a..498ca11762a 100644
+index 84a3d89de..498ca1176 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
@@ -579,6 +579,11 @@ image = {
@ -58,7 +58,7 @@ index 84a3d89de9a..498ca11762a 100644
   common = lib/disk.c;
 diff --git a/grub-core/commands/version.c b/grub-core/commands/version.c
 new file mode 100644
-index 00000000000..f0966a518f7
+index 000000000..f0966a518
 --- /dev/null
 +++ b/grub-core/commands/version.c
@@ -0,0 +1,56 @@
@ -119,7 +119,7 @@ index 00000000000..f0966a518f7
 +  grub_unregister_command (cmd);
 +}
 diff --git a/config.h.in b/config.h.in
-index 9e8f9911b18..c7e316f0f1f 100644
+index 9e8f9911b..c7e316f0f 100644
 --- a/config.h.in
 +++ b/config.h.in
@@ -59,6 +59,7 @@
--- a/Show More
+++ b/Show More