Merge branch 'c8' into a8

SOURCES/0001-Add-support-for-Linux-EFI-stub-loading.patch

@@ -45,7 +45,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 9590e87d9c0..0b4b0c2122d 100644
+index 9590e87d9..0b4b0c212 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -1626,13 +1626,6 @@ module = {
@@ -89,7 +89,7 @@ index 9590e87d9c0..0b4b0c2122d 100644
  
  module = {
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index e394cd96f8c..04e804d1668 100644
+index e394cd96f..04e804d16 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
 @@ -38,6 +38,14 @@
@@ -128,7 +128,7 @@ index e394cd96f8c..04e804d1668 100644
  
    file = grub_file_open (filename);
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 708581fcbde..c8a9d8307c0 100644
+index 708581fcb..c8a9d8307 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -273,6 +273,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@@ -167,7 +167,7 @@ index 708581fcbde..c8a9d8307c0 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 42ad7c570a5..5cdf6c943f2 100644
+index 42ad7c570..5cdf6c943 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,
@@ -210,7 +210,7 @@ index 42ad7c570a5..5cdf6c943f2 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 1f86229f86b..6c00af98dce 100644
+index 1f86229f8..6c00af98d 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -29,6 +29,7 @@
@@ -391,7 +391,7 @@ index 1f86229f86b..6c00af98dce 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 1003a0b9997..f35b16caa92 100644
+index 1003a0b99..f35b16caa 100644
 --- a/grub-core/loader/arm64/xen_boot.c
 +++ b/grub-core/loader/arm64/xen_boot.c
 @@ -266,7 +266,6 @@ xen_boot (void)
@@ -404,7 +404,7 @@ index 1003a0b9997..f35b16caa92 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 @@
@@ -480,7 +480,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..3db82e782df
+index 000000000..3db82e782
 --- /dev/null
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -0,0 +1,335 @@
@@ -820,7 +820,7 @@ index 00000000000..3db82e782df
 +  grub_unregister_command (cmd_initrdefi);
 +}
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index b69cb7a3a7f..a3c87cf2fc2 100644
+index b69cb7a3a..a3c87cf2f 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
 @@ -468,14 +468,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -854,7 +854,7 @@ index b69cb7a3a7f..a3c87cf2fc2 100644
 +  grub_unregister_command (cmd_initrd16);
  }
 diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
-index 712ba17b9ba..5900fc8a40c 100644
+index 712ba17b9..5900fc8a4 100644
 --- a/include/grub/arm/linux.h
 +++ b/include/grub/arm/linux.h
 @@ -20,6 +20,7 @@
@@ -884,7 +884,7 @@ index 712ba17b9ba..5900fc8a40c 100644
  
  #if defined GRUB_MACHINE_UBOOT
 diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
-index 8655067e039..7b533b57139 100644
+index 8655067e0..7b533b571 100644
 --- a/include/grub/arm64/linux.h
 +++ b/include/grub/arm64/linux.h
 @@ -19,6 +19,8 @@
@@ -915,7 +915,7 @@ index 8655067e039..7b533b57139 100644
  
  #endif /* ! GRUB_ARM64_LINUX_HEADER */
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 2c6648d46fc..1061aee9726 100644
+index 2c6648d46..1061aee97 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,
@@ -948,7 +948,7 @@ index 2c6648d46fc..1061aee9726 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 @@
@@ -984,7 +984,7 @@ index 00000000000..d9ede36773b
 +
 +#endif /* ! GRUB_EFI_LINUX_HEADER */
 diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
-index 60c7c3b5e66..bb19dbd5a77 100644
+index 60c7c3b5e..bb19dbd5a 100644
 --- a/include/grub/i386/linux.h
 +++ b/include/grub/i386/linux.h
 @@ -142,6 +142,7 @@ struct linux_i386_kernel_header

SOURCES/0002-Rework-linux-command.patch

@@ -11,7 +11,7 @@ before pulling out the individual blocks later on.
  1 file changed, 24 insertions(+), 13 deletions(-)
 
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 9b53d3168f9..f7186be4002 100644
+index 9b53d3168..f7186be40 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
 @@ -685,13 +685,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

SOURCES/0003-Rework-linux16-command.patch

@@ -11,7 +11,7 @@ before pulling out the individual blocks later on.
  1 file changed, 21 insertions(+), 13 deletions(-)
 
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index a3c87cf2fc2..caa76bee8af 100644
+index a3c87cf2f..caa76bee8 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
 @@ -123,13 +123,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

SOURCES/0004-Add-secureboot-support-on-efi-chainloader.patch

@@ -175,7 +175,7 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
  7 files changed, 840 insertions(+), 91 deletions(-)
 
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index c8a9d8307c0..91129e33566 100644
+index c8a9d8307..91129e335 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -283,14 +283,20 @@ grub_efi_secure_boot (void)
@@ -204,7 +204,7 @@ index c8a9d8307c0..91129e33566 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 6c00af98dce..a1ac7a38867 100644
+index 6c00af98d..a1ac7a388 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -282,6 +282,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -226,7 +226,7 @@ index 6c00af98dce..a1ac7a38867 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 adc85636633..af2189619a3 100644
+index adc856366..af2189619 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -32,6 +32,8 @@
@@ -1173,7 +1173,7 @@ index adc85636633..af2189619a3 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
@@ -1218,7 +1218,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 3db82e782df..8db228c5bf5 100644
+index 3db82e782..8db228c5b 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -118,6 +118,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -1286,7 +1286,7 @@ index 3db82e782df..8db228c5bf5 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 @@
@@ -1299,7 +1299,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 7d44732d2c3..c03cc599f63 100644
+index 7d44732d2..c03cc599f 100644
 --- a/include/grub/efi/pe32.h
 +++ b/include/grub/efi/pe32.h
 @@ -214,7 +214,11 @@ struct grub_pe64_optional_header

SOURCES/0005-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch

@@ -38,7 +38,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  create mode 100644 include/grub/sparc64/linux.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 0b4b0c2122d..e92a7ef322f 100644
+index 0b4b0c212..e92a7ef32 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -195,6 +195,7 @@ kernel = {
@@ -50,7 +50,7 @@ index 0b4b0c2122d..e92a7ef322f 100644
    x86 = kern/i386/tsc.c;
    x86 = kern/i386/tsc_pit.c;
 diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
-index a0c164e54f0..41a7f3f0466 100644
+index a0c164e54..41a7f3f04 100644
 --- a/grub-core/commands/iorw.c
 +++ b/grub-core/commands/iorw.c
 @@ -23,6 +23,7 @@
@@ -82,7 +82,7 @@ index a0c164e54f0..41a7f3f0466 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 98769eadb34..088cbe9e2bc 100644
+index 98769eadb..088cbe9e2 100644
 --- a/grub-core/commands/memrw.c
 +++ b/grub-core/commands/memrw.c
 @@ -22,6 +22,7 @@
@@ -114,7 +114,7 @@ index 98769eadb34..088cbe9e2bc 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 04e804d1668..621070918d4 100644
+index 04e804d16..621070918 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
 @@ -32,6 +32,7 @@
@@ -126,7 +126,7 @@ index 04e804d1668..621070918d4 100644
  /* Platforms where modules are in a readonly area of memory.  */
  #if defined(GRUB_MACHINE_QEMU)
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 91129e33566..708581fcbde 100644
+index 91129e335..708581fcb 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -273,40 +273,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@@ -172,7 +172,7 @@ index 91129e33566..708581fcbde 100644
  /* Search the mods section from the PE32/PE32+ image. This code uses
 diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c
 new file mode 100644
-index 00000000000..d74778b0cac
+index 000000000..d74778b0c
 --- /dev/null
 +++ b/grub-core/kern/efi/sb.c
 @@ -0,0 +1,64 @@
@@ -241,7 +241,7 @@ index 00000000000..d74778b0cac
 +#endif
 +}
 diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
-index 74888c463ba..69c2a10d351 100644
+index 74888c463..69c2a10d3 100644
 --- a/grub-core/loader/efi/appleloader.c
 +++ b/grub-core/loader/efi/appleloader.c
 @@ -24,6 +24,7 @@
@@ -272,7 +272,7 @@ index 74888c463ba..69c2a10d351 100644
    grub_unregister_command (cmd);
  }
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index af2189619a3..5cd9b6e08a8 100644
+index af2189619..5cd9b6e08 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -34,6 +34,7 @@
@@ -284,7 +284,7 @@ index af2189619a3..5cd9b6e08a8 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 7f96515da65..87709aa23e8 100644
+index 7f96515da..87709aa23 100644
 --- a/grub-core/loader/i386/bsd.c
 +++ b/grub-core/loader/i386/bsd.c
 @@ -38,6 +38,7 @@
@@ -316,7 +316,7 @@ index 7f96515da65..87709aa23e8 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 f7186be4002..c84747ea857 100644
+index f7186be40..c84747ea8 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
 @@ -35,6 +35,7 @@
@@ -348,7 +348,7 @@ index f7186be4002..c84747ea857 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 caa76bee8af..783a3cd93bc 100644
+index caa76bee8..783a3cd93 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
 @@ -35,6 +35,7 @@
@@ -380,7 +380,7 @@ index caa76bee8af..783a3cd93bc 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 40c67e82489..26df46a4161 100644
+index 40c67e824..26df46a41 100644
 --- a/grub-core/loader/multiboot.c
 +++ b/grub-core/loader/multiboot.c
 @@ -50,6 +50,7 @@
@@ -412,7 +412,7 @@ index 40c67e82489..26df46a4161 100644
    grub_unregister_command (cmd_module);
  }
 diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index c9885b1bcd7..df8dfdb4ba0 100644
+index c9885b1bc..df8dfdb4b 100644
 --- a/grub-core/loader/xnu.c
 +++ b/grub-core/loader/xnu.c
 @@ -33,6 +33,7 @@
@@ -444,7 +444,7 @@ index c9885b1bcd7..df8dfdb4ba0 100644
    grub_unregister_command (cmd_resume);
  #endif
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 1061aee9726..39480b38674 100644
+index 1061aee97..39480b386 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
 @@ -85,7 +85,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
@@ -457,7 +457,7 @@ index 1061aee9726..39480b38674 100644
  					     const grub_efi_device_path_t *dp2);
 diff --git a/include/grub/efi/sb.h b/include/grub/efi/sb.h
 new file mode 100644
-index 00000000000..9629fbb0f9e
+index 000000000..9629fbb0f
 --- /dev/null
 +++ b/include/grub/efi/sb.h
 @@ -0,0 +1,29 @@
@@ -492,18 +492,18 @@ index 00000000000..9629fbb0f9e
 +#endif /* ! GRUB_EFI_SB_HEADER */
 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
 diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index f4ff62b769a..9c69aa88626 100644
+index f4ff62b76..9c69aa886 100644
 --- a/grub-core/Makefile.am
 +++ b/grub-core/Makefile.am
 @@ -71,6 +71,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h

SOURCES/0006-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 8db228c5bf5..800c3e54022 100644
+index 8db228c5b..800c3e540 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;
@@ -244,7 +244,7 @@ index 8db228c5bf5..800c3e54022 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 bb19dbd5a77..8474a857ed2 100644
+index bb19dbd5a..8474a857e 100644
 --- a/include/grub/i386/linux.h
 +++ b/include/grub/i386/linux.h
 @@ -133,7 +133,12 @@ struct linux_i386_kernel_header

SOURCES/0007-re-write-.gitignore.patch

@@ -24,7 +24,7 @@ Subject: [PATCH] re-write .gitignore
  create mode 100644 util/bash-completion.d/.gitignore
 
 diff --git a/.gitignore b/.gitignore
-index eca17bec9b8..43f04d47277 100644
+index eca17bec9..43f04d472 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -1,249 +1,126 @@
@@ -396,7 +396,7 @@ index eca17bec9b8..43f04d47277 100644
 +/widthspec.h
 diff --git a/build-aux/.gitignore b/build-aux/.gitignore
 new file mode 100644
-index 00000000000..f2f17aab9ff
+index 000000000..f2f17aab9
 --- /dev/null
 +++ b/build-aux/.gitignore
 @@ -0,0 +1,9 @@
@@ -411,7 +411,7 @@ index 00000000000..f2f17aab9ff
 +/texinfo.tex
 diff --git a/docs/.gitignore b/docs/.gitignore
 new file mode 100644
-index 00000000000..91aee84d3e9
+index 000000000..91aee84d3
 --- /dev/null
 +++ b/docs/.gitignore
 @@ -0,0 +1,4 @@
@@ -421,7 +421,7 @@ index 00000000000..91aee84d3e9
 +/version*.texi
 diff --git a/grub-core/.gitignore b/grub-core/.gitignore
 new file mode 100644
-index 00000000000..c738ac6c649
+index 000000000..c738ac6c6
 --- /dev/null
 +++ b/grub-core/.gitignore
 @@ -0,0 +1,15 @@
@@ -442,7 +442,7 @@ index 00000000000..c738ac6c649
 +/trigtables.c
 diff --git a/grub-core/gnulib/.gitignore b/grub-core/gnulib/.gitignore
 new file mode 100644
-index 00000000000..29e199c2db4
+index 000000000..29e199c2d
 --- /dev/null
 +++ b/grub-core/gnulib/.gitignore
 @@ -0,0 +1,22 @@
@@ -470,14 +470,14 @@ index 00000000000..29e199c2db4
 +/wctype.h
 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 @@
@@ -485,7 +485,7 @@ index 00000000000..8fbf5646246
 +gcrypt.h
 diff --git a/po/.gitignore b/po/.gitignore
 new file mode 100644
-index 00000000000..97b679c3138
+index 000000000..97b679c31
 --- /dev/null
 +++ b/po/.gitignore
 @@ -0,0 +1,4 @@
@@ -495,7 +495,7 @@ index 00000000000..97b679c3138
 +/stamp-po
 diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore
 new file mode 100644
-index 00000000000..b7e1eb12428
+index 000000000..b7e1eb124
 --- /dev/null
 +++ b/util/bash-completion.d/.gitignore
 @@ -0,0 +1 @@

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

@@ -25,7 +25,7 @@ parameters
  4 files changed, 91 insertions(+)
 
 diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
-index 62929d983bf..2d53c0e8608 100644
+index 62929d983..2d53c0e86 100644
 --- a/grub-core/kern/ieee1275/openfw.c
 +++ b/grub-core/kern/ieee1275/openfw.c
 @@ -588,3 +588,66 @@ grub_ieee1275_get_boot_dev (void)
@@ -96,7 +96,7 @@ index 62929d983bf..2d53c0e8608 100644
 +  return 0;
 +}
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 78a70a8bf47..249e19bc788 100644
+index 78a70a8bf..249e19bc7 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -33,6 +33,9 @@
@@ -133,7 +133,7 @@ index 78a70a8bf47..249e19bc788 100644
        grub_errno = GRUB_ERR_NONE;
      }
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index a8502d90711..ab78ca87f90 100644
+index a8502d907..ab78ca87f 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
 @@ -27,6 +27,9 @@
@@ -158,7 +158,7 @@ index a8502d90711..ab78ca87f90 100644
      {
        char *line;
 diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index 8868f3a756f..2310f33dbc2 100644
+index 8868f3a75..2310f33db 100644
 --- a/include/grub/ieee1275/ieee1275.h
 +++ b/include/grub/ieee1275/ieee1275.h
 @@ -252,6 +252,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali

SOURCES/0009-for-ppc-reset-console-display-attr-when-clear-screen.patch

@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
-index d317efa368d..29df35e6d20 100644
+index d317efa36..29df35e6d 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,

SOURCES/0010-Disable-GRUB-video-support-for-IBM-power-machines.patch

@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=973205
  3 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
-index 3e12e6b24e1..3e14f539368 100644
+index 3e12e6b24..3e14f5393 100644
 --- a/grub-core/kern/ieee1275/cmain.c
 +++ b/grub-core/kern/ieee1275/cmain.c
 @@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
@@ -28,7 +28,7 @@ index 3e12e6b24e1..3e14f539368 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 =
@@ -48,7 +48,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 2310f33dbc2..ca08bd96681 100644
+index 2310f33db..ca08bd966 100644
 --- a/include/grub/ieee1275/ieee1275.h
 +++ b/include/grub/ieee1275/ieee1275.h
 @@ -146,6 +146,8 @@ enum grub_ieee1275_flag

SOURCES/0011-Honor-a-symlink-when-generating-configuration-by-gru.patch

@@ -11,7 +11,7 @@ the -o option follows it rather than overwriting it with a regular file.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 33332360eec..bc5a3f17541 100644
+index 33332360e..bc5a3f175 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -287,7 +287,8 @@ and /etc/grub.d/* files or please file a bug report with

SOURCES/0012-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 c7888e40f66..783118ccdcd 100644
+index c7888e40f..783118ccd 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -289,6 +289,14 @@ AC_SUBST(grubdirname)
@@ -39,7 +39,7 @@ index c7888e40f66..783118ccdcd 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)

SOURCES/0013-Update-to-minilzo-2.08.patch

@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  4 files changed, 4489 insertions(+), 1869 deletions(-)
 
 diff --git a/grub-core/lib/minilzo/minilzo.c b/grub-core/lib/minilzo/minilzo.c
-index 25a1f68b3b5..ab2be5f4fd0 100644
+index 25a1f68b3..ab2be5f4f 100644
 --- a/grub-core/lib/minilzo/minilzo.c
 +++ b/grub-core/lib/minilzo/minilzo.c
 @@ -2,22 +2,7 @@
@@ -5251,7 +5251,7 @@ index 25a1f68b3b5..ab2be5f4fd0 100644
  /***** End of minilzo.c *****/
 -
 diff --git a/grub-core/lib/minilzo/lzoconf.h b/grub-core/lib/minilzo/lzoconf.h
-index 1d0fe14fcda..61be29c5dc2 100644
+index 1d0fe14fc..61be29c5d 100644
 --- a/grub-core/lib/minilzo/lzoconf.h
 +++ b/grub-core/lib/minilzo/lzoconf.h
 @@ -2,22 +2,7 @@
@@ -5590,7 +5590,7 @@ index 1d0fe14fcda..61be29c5dc2 100644
 -/* vim:set ts=4 et: */
 +/* vim:set ts=4 sw=4 et: */
 diff --git a/grub-core/lib/minilzo/lzodefs.h b/grub-core/lib/minilzo/lzodefs.h
-index 0e40e332a8d..f4ae9487ebe 100644
+index 0e40e332a..f4ae9487e 100644
 --- a/grub-core/lib/minilzo/lzodefs.h
 +++ b/grub-core/lib/minilzo/lzodefs.h
 @@ -2,22 +2,7 @@
@@ -8462,7 +8462,7 @@ index 0e40e332a8d..f4ae9487ebe 100644
 -/* vim:set ts=4 et: */
 +/* vim:set ts=4 sw=4 et: */
 diff --git a/grub-core/lib/minilzo/minilzo.h b/grub-core/lib/minilzo/minilzo.h
-index 74fefa9fe20..79374546748 100644
+index 74fefa9fe..793745467 100644
 --- a/grub-core/lib/minilzo/minilzo.h
 +++ b/grub-core/lib/minilzo/minilzo.h
 @@ -2,22 +2,7 @@

SOURCES/0014-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 e7a83c2d6e2..d2f64b05e0a 100644
+index e7a83c2d6..d2f64b05e 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -163,16 +163,41 @@ grub_menu_set_timeout (int timeout)

SOURCES/0015-Add-GRUB_DISABLE_UUID.patch

@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  3 files changed, 28 insertions(+), 5 deletions(-)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 2adfa97bee8..2fd32608c01 100644
+index 2adfa97be..2fd32608c 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -1441,6 +1441,13 @@ enable the use of partition UUIDs, set this option to @samp{false}.
@@ -33,7 +33,7 @@ index 2adfa97bee8..2fd32608c01 100644
  If graphical video support is required, either because the @samp{gfxterm}
  graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set,
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index bc5a3f17541..b0a8626dd1c 100644
+index bc5a3f175..b0a8626dd 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -133,12 +133,12 @@ fi
@@ -83,7 +83,7 @@ index bc5a3f17541..b0a8626dd1c 100644
    GRUB_GFXMODE \
    GRUB_BACKGROUND \
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 0f801cab3e4..1001a12232b 100644
+index 0f801cab3..1001a1223 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -156,7 +156,7 @@ prepare_grub_to_access_device ()

SOURCES/0016-Make-exit-take-a-return-code.patch

@@ -27,7 +27,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  14 files changed, 39 insertions(+), 21 deletions(-)
 
 diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
-index a3a11824172..b25ca4b9f17 100644
+index a3a118241..b25ca4b9f 100644
 --- a/grub-core/commands/minicmd.c
 +++ b/grub-core/commands/minicmd.c
 @@ -176,12 +176,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
@@ -60,7 +60,7 @@ index a3a11824172..b25ca4b9f17 100644
  }
  
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 708581fcbde..e339f264b3a 100644
+index 708581fcb..e339f264b 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -164,11 +164,16 @@ grub_reboot (void)
@@ -83,7 +83,7 @@ index 708581fcbde..e339f264b3a 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 76661337f10..82012a72fcb 100644
+index 76661337f..82012a72f 100644
 --- a/grub-core/kern/emu/misc.c
 +++ b/grub-core/kern/emu/misc.c
 @@ -137,9 +137,10 @@ xasprintf (const char *fmt, ...)
@@ -113,7 +113,7 @@ index 76661337f10..82012a72fcb 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 0d8ebf58b95..f5423ce27d9 100644
+index 0d8ebf58b..f5423ce27 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
 @@ -68,7 +68,7 @@ grub_addr_t grub_ieee1275_original_stack;
@@ -152,7 +152,7 @@ index 0d8ebf58b95..f5423ce27d9 100644
    grub_ieee1275_exit ();
  }
 diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
-index 3834a149093..86b3a25ec40 100644
+index 3834a1490..86b3a25ec 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 3834a149093..86b3a25ec40 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 3b633d51f4c..952411d5dc6 100644
+index 3b633d51f..952411d5d 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
 @@ -1095,7 +1095,7 @@ grub_abort (void)
@@ -204,7 +204,7 @@ index 3b633d51f4c..952411d5dc6 100644
  
  void
 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;
@@ -229,7 +229,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 0559c033c3d..fce526d417b 100644
+index 0559c033c..fce526d41 100644
 --- a/grub-core/kern/xen/init.c
 +++ b/grub-core/kern/xen/init.c
 @@ -549,7 +549,7 @@ grub_machine_init (void)
@@ -242,7 +242,7 @@ index 0559c033c3d..fce526d417b 100644
    struct sched_shutdown arg;
  
 diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 372f009e84f..83fd69f4ada 100644
+index 372f009e8..83fd69f4a 100644
 --- a/include/grub/misc.h
 +++ b/include/grub/misc.h
 @@ -334,7 +334,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,

SOURCES/0017-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch

@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
 
 diff --git a/.gitattributes b/.gitattributes
 new file mode 100644
-index 00000000000..33ffaa40460
+index 000000000..33ffaa404
 --- /dev/null
 +++ b/.gitattributes
 @@ -0,0 +1 @@

SOURCES/0018-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, 34 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index e92a7ef322f..f8065388213 100644
+index e92a7ef32..f80653882 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -191,6 +191,7 @@ kernel = {
@@ -22,7 +22,7 @@ index e92a7ef322f..f8065388213 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 3dfdf2d22b0..71d2279a0c1 100644
+index 3dfdf2d22..71d2279a0 100644
 --- a/grub-core/kern/efi/init.c
 +++ b/grub-core/kern/efi/init.c
 @@ -25,9 +25,40 @@

SOURCES/0019-DHCP-client-ID-and-UUID-options-added.patch

@@ -9,7 +9,7 @@ Subject: [PATCH] DHCP client ID and UUID options added.
  2 files changed, 81 insertions(+), 8 deletions(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 9e2fdb795f5..f03eeab2fb4 100644
+index 9e2fdb795..f03eeab2f 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -25,6 +25,49 @@
@@ -128,7 +128,7 @@ index 9e2fdb795f5..f03eeab2fb4 100644
  grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),
  		  int argc, char **args)
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 1096b24322e..e266bae23f4 100644
+index 1096b2432..e266bae23 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
 @@ -457,6 +457,8 @@ enum

SOURCES/0020-trim-arp-packets-with-abnormal-size.patch

@@ -10,7 +10,7 @@ is foobared, GRUB needs to trim the arp response packet before sending it.
  1 file changed, 6 insertions(+)
 
 diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
-index 54306e3b16d..d1c69ed2b55 100644
+index 54306e3b1..d1c69ed2b 100644
 --- a/grub-core/net/arp.c
 +++ b/grub-core/net/arp.c
 @@ -150,6 +150,12 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,

SOURCES/0021-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch

@@ -20,7 +20,7 @@ Resolves: rhbz#1063414
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 61ebd7dc714..87a7da34982 100644
+index 61ebd7dc7..87a7da349 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -261,7 +261,11 @@ while [ "x$list" != "x" ] ; do

SOURCES/0022-Add-support-for-UEFI-operating-systems-returned-by-o.patch

@@ -14,7 +14,7 @@ contrast to legacy OSes, where path is the device string. Handle this case.
  1 file changed, 18 insertions(+), 3 deletions(-)
 
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 515a68c7aa0..9b8f5968e2d 100644
+index 515a68c7a..9b8f5968e 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -328,8 +328,23 @@ EOF

SOURCES/0023-Migrate-PPC-from-Yaboot-to-Grub2.patch

@@ -12,7 +12,7 @@ maximum screen size so that text is not overwritten.
  create mode 100644 util/grub.d/20_ppc_terminfo.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 3180ac880a9..c7b775bce73 100644
+index 3180ac880..c7b775bce 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -487,6 +487,13 @@ script = {
@@ -31,7 +31,7 @@ index 3180ac880a9..c7b775bce73 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 @@

SOURCES/0024-Add-fw_path-variable-revised.patch

@@ -14,7 +14,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=857936
  2 files changed, 30 insertions(+), 8 deletions(-)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 9cad0c4485c..8ab7794c47b 100644
+index 9cad0c448..8ab7794c4 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -127,16 +127,15 @@ grub_set_prefix_and_root (void)
@@ -41,7 +41,7 @@ index 9cad0c4485c..8ab7794c47b 100644
      }
  
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 249e19bc788..759c475c4d9 100644
+index 249e19bc7..759c475c4 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -338,7 +338,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),

SOURCES/0025-Pass-x-hex-hex-straight-through-unmolested.patch

@@ -10,7 +10,7 @@ Subject: [PATCH] Pass "\x[[:hex:]][[:hex:]]" straight through unmolested.
  3 files changed, 84 insertions(+), 9 deletions(-)
 
 diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
-index 9b4e72766ff..02c46f9fdfa 100644
+index 9b4e72766..02c46f9fd 100644
 --- a/grub-core/commands/wildcard.c
 +++ b/grub-core/commands/wildcard.c
 @@ -462,6 +462,12 @@ check_file (const char *dir, const char *basename)
@@ -44,7 +44,7 @@ index 9b4e72766ff..02c46f9fdfa 100644
  	  *optr++ = iptr[1];
  	  iptr += 2;
 diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index d5e10ee8798..0a5b2afb94b 100644
+index d5e10ee87..0a5b2afb9 100644
 --- a/grub-core/lib/cmdline.c
 +++ b/grub-core/lib/cmdline.c
 @@ -20,6 +20,12 @@
@@ -103,7 +103,7 @@ index d5e10ee8798..0a5b2afb94b 100644
  
  	  *buf++ = *c;
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index ab78ca87f90..cf6cd6601d6 100644
+index ab78ca87f..cf6cd6601 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
 @@ -55,6 +55,12 @@ static struct grub_script_scope *scope = 0;

SOURCES/0026-Add-X-option-to-printf-functions.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] Add %X option to printf functions.
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 952411d5dc6..8344526be7f 100644
+index 952411d5d..8344526be 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
 @@ -588,7 +588,7 @@ grub_divmod64 (grub_uint64_t n, grub_uint64_t d, grub_uint64_t *r)

SOURCES/0027-Search-for-specific-config-file-for-netboot.patch

@@ -22,7 +22,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=873406
  3 files changed, 135 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 10773fc3435..0769bf850d3 100644
+index 10773fc34..0769bf850 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
 @@ -1735,6 +1735,124 @@ grub_net_restore_hw (void)
@@ -151,7 +151,7 @@ index 10773fc3435..0769bf850d3 100644
  
  static grub_command_t cmd_addaddr, cmd_deladdr, cmd_addroute, cmd_delroute;
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 759c475c4d9..b2654ef62e8 100644
+index 759c475c4..b2654ef62 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -33,6 +33,7 @@
@@ -187,7 +187,7 @@ index 759c475c4d9..b2654ef62e8 100644
  	  grub_enter_normal_mode (config);
  	  grub_free (config);
 diff --git a/include/grub/net.h b/include/grub/net.h
-index e266bae23f4..50d62ab0c8c 100644
+index e266bae23..50d62ab0c 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
 @@ -566,4 +566,7 @@ extern char *grub_net_default_server;

SOURCES/0028-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch

@@ -21,7 +21,7 @@ Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
  create mode 100644 grub-core/commands/blscfg.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index f8065388213..cd0902b46b8 100644
+index f80653882..cd0902b46 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -768,6 +768,14 @@ module = {
@@ -41,7 +41,7 @@ index f8065388213..cd0902b46b8 100644
    common = commands/boot.c;
 diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
 new file mode 100644
-index 00000000000..4274aca5a9d
+index 000000000..4274aca5a
 --- /dev/null
 +++ b/grub-core/commands/blscfg.c
 @@ -0,0 +1,201 @@

SOURCES/0029-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 b0a8626dd1c..f68d4925ee6 100644
+index b0a8626dd..f68d4925e 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -254,7 +254,8 @@ export GRUB_DEFAULT \
@@ -34,7 +34,7 @@ index b0a8626dd1c..f68d4925ee6 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 87a7da34982..233754ff296 100644
+index 87a7da349..233754ff2 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -153,6 +153,13 @@ EOF

SOURCES/0030-Don-t-write-messages-to-the-screen.patch

@@ -15,7 +15,7 @@ very appealing.
  5 files changed, 5 insertions(+), 40 deletions(-)
 
 diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index 4880cefe3f8..b22e1bcc94b 100644
+index 4880cefe3..b22e1bcc9 100644
 --- a/grub-core/gettext/gettext.c
 +++ b/grub-core/gettext/gettext.c
 @@ -434,16 +434,12 @@ static char *
@@ -97,7 +97,7 @@ index 4880cefe3f8..b22e1bcc94b 100644
    grub_register_variable_hook ("locale_dir", NULL, read_main);
    grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary);
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 8ab7794c47b..da47b18b50e 100644
+index 8ab7794c4..da47b18b5 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -268,11 +268,6 @@ grub_main (void)
@@ -113,7 +113,7 @@ index 8ab7794c47b..da47b18b50e 100644
  
    grub_boot_time ("Before loading embedded modules.");
 diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
-index 2bd0b2d2866..ea167fe1206 100644
+index 2bd0b2d28..ea167fe12 100644
 --- a/grub-core/boot/i386/pc/boot.S
 +++ b/grub-core/boot/i386/pc/boot.S
 @@ -249,9 +249,6 @@ real_start:
@@ -127,7 +127,7 @@ index 2bd0b2d2866..ea167fe1206 100644
  	movw	$disk_address_packet, %si
  
 diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
-index c1addc0df29..68d31de0c4c 100644
+index c1addc0df..68d31de0c 100644
 --- a/grub-core/boot/i386/pc/diskboot.S
 +++ b/grub-core/boot/i386/pc/diskboot.S
 @@ -50,11 +50,6 @@ _start:
@@ -143,7 +143,7 @@ index c1addc0df29..68d31de0c4c 100644
  	movw	$LOCAL(firstlist), %di
  
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 233754ff296..3a5aa0f8dc9 100644
+index 233754ff2..3a5aa0f8d 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -138,27 +138,20 @@ linux_entry ()

SOURCES/0031-Don-t-print-GNU-GRUB-header.patch

@@ -9,7 +9,7 @@ No one cares.
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index b2654ef62e8..f57b7508a76 100644
+index b2654ef62..f57b7508a 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -202,15 +202,16 @@ read_config_file (const char *config)

SOURCES/0032-Don-t-add-to-highlighted-row.patch

@@ -9,7 +9,7 @@ It is already highlighted.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index e22bb91f6e8..a3d1f23f68f 100644
+index e22bb91f6..a3d1f23f6 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -242,7 +242,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,

SOURCES/0033-Message-string-cleanups.patch

@@ -9,7 +9,7 @@ Make use of terminology consistent. Remove jargon.
  1 file changed, 9 insertions(+), 12 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index a3d1f23f68f..64a83862f66 100644
+index a3d1f23f6..64a83862f 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -157,9 +157,8 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)

SOURCES/0034-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] Fix border spacing now that we aren't displaying it
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 64a83862f66..1062d64ee29 100644
+index 64a83862f..1062d64ee 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -331,12 +331,12 @@ grub_menu_init_page (int nested, int edit,

SOURCES/0035-Use-the-correct-indentation-for-the-term-help-text.patch

@@ -9,7 +9,7 @@ That is consistent with the menu help text
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index f57b7508a76..0ce59fdc3f0 100644
+index f57b7508a..0ce59fdc3 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -426,8 +426,8 @@ grub_normal_reader_init (int nested)

SOURCES/0036-Indent-menu-entries.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] Indent menu entries
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 1062d64ee29..ecc60f99fc3 100644
+index 1062d64ee..ecc60f99f 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -239,7 +239,8 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,

SOURCES/0037-Fix-margins.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] Fix margins
  1 file changed, 3 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index ecc60f99fc3..0e43f2c10cc 100644
+index ecc60f99f..0e43f2c10 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -333,17 +333,15 @@ grub_menu_init_page (int nested, int edit,

SOURCES/0038-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch

@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 0e43f2c10cc..537d4bf86ff 100644
+index 0e43f2c10..537d4bf86 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -334,7 +334,7 @@ grub_menu_init_page (int nested, int edit,

SOURCES/0039-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_

SOURCES/0040-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch

@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 537d4bf86ff..452d55bf9ff 100644
+index 537d4bf86..452d55bf9 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -157,7 +157,7 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)

SOURCES/0041-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 3a5aa0f8dc9..6299836b5cd 100644
+index 3a5aa0f8d..6299836b5 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 3a5aa0f8dc9..6299836b5cd 100644
  fi
  
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index e8143b079dc..972a4b5a03d 100644
+index e8143b079..972a4b5a0 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
 @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"

SOURCES/0042-Don-t-draw-a-border-around-the-menu.patch

@@ -9,7 +9,7 @@ It looks cleaner without it.
  1 file changed, 43 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 452d55bf9ff..1ed2bd92cf8 100644
+index 452d55bf9..1ed2bd92c 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,

SOURCES/0043-Use-the-standard-margin-for-the-timeout-string.patch

@@ -9,7 +9,7 @@ So that it aligns with the other messages
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 1ed2bd92cf8..7681f7d2893 100644
+index 1ed2bd92c..7681f7d28 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -372,7 +372,7 @@ grub_menu_init_page (int nested, int edit,

SOURCES/0044-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 311da61c6c5..044ab3abe88 100644
+index 311da61c6..044ab3abe 100644
 --- a/conf/Makefile.common
 +++ b/conf/Makefile.common
 @@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding

SOURCES/0045-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch

@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 1 insertion(+), 10 deletions(-)
 
 diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index 0a5b2afb94b..970ea868c14 100644
+index 0a5b2afb9..970ea868c 100644
 --- a/grub-core/lib/cmdline.c
 +++ b/grub-core/lib/cmdline.c
 @@ -97,16 +97,7 @@ int grub_create_loader_cmdline (int argc, char *argv[], char *buf,

SOURCES/0046-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 6299836b5cd..b744438e04a 100644
+index 6299836b5..b744438e0 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -26,7 +26,7 @@ datarootdir="@datarootdir@"

SOURCES/0047-Don-t-emit-Booting-.-message.patch

@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index d2f64b05e0a..5e2f5283d3d 100644
+index d2f64b05e..5e2f5283d 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -838,12 +838,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -34,7 +34,7 @@ index d2f64b05e0a..5e2f5283d3d 100644
  
  /* Callback invoked when a default menu entry executed because of a timeout
 diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
-index cdf3590a364..5785f67ee1c 100644
+index cdf3590a3..5785f67ee 100644
 --- a/grub-core/normal/menu_entry.c
 +++ b/grub-core/normal/menu_entry.c
 @@ -1167,9 +1167,6 @@ run (struct screen *screen)

SOURCES/0048-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch

@@ -122,7 +122,7 @@ Replace a bunch of machine generated ones with ones that look nicer.
  create mode 100644 util/grub-sparc64-setup.8
 
 diff --git a/configure.ac b/configure.ac
-index 783118ccdcd..d5db2803ec4 100644
+index 783118ccd..d5db2803e 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -70,6 +70,29 @@ grub_TRANSFORM([grub-set-default])
@@ -156,7 +156,7 @@ index 783118ccdcd..d5db2803ec4 100644
  # Optimization flag.  Allow user to override.
  if test "x$TARGET_CFLAGS" = x; then
 diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index b16bd925320..39eb94bded6 100644
+index b16bd9253..39eb94bde 100644
 --- a/conf/Makefile.extra-dist
 +++ b/conf/Makefile.extra-dist
 @@ -11,7 +11,6 @@ EXTRA_DIST += unicode
@@ -168,7 +168,7 @@ index b16bd925320..39eb94bded6 100644
  EXTRA_DIST += docs/grub.cfg
  EXTRA_DIST += docs/osdetect.cfg
 diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 93eb3962765..ab28f199694 100644
+index 93eb39627..ab28f1996 100644
 --- a/docs/Makefile.am
 +++ b/docs/Makefile.am
 @@ -5,5 +5,3 @@ info_TEXINFOS = grub.texi grub-dev.texi
@@ -179,7 +179,7 @@ index 93eb3962765..ab28f199694 100644
 -
 diff --git a/docs/man/grub-bios-setup.h2m b/docs/man/grub-bios-setup.h2m
 deleted file mode 100644
-index ac6ede36296..00000000000
+index ac6ede362..000000000
 --- a/docs/man/grub-bios-setup.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -191,7 +191,7 @@ index ac6ede36296..00000000000
 -.BR grub-mkrescue (1)
 diff --git a/docs/man/grub-editenv.h2m b/docs/man/grub-editenv.h2m
 deleted file mode 100644
-index 3859d3d4c4f..00000000000
+index 3859d3d4c..000000000
 --- a/docs/man/grub-editenv.h2m
 +++ /dev/null
 @@ -1,5 +0,0 @@
@@ -202,7 +202,7 @@ index 3859d3d4c4f..00000000000
 -.BR grub-set-default (8)
 diff --git a/docs/man/grub-emu.h2m b/docs/man/grub-emu.h2m
 deleted file mode 100644
-index ef1c000656a..00000000000
+index ef1c00065..000000000
 --- a/docs/man/grub-emu.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -214,7 +214,7 @@ index ef1c000656a..00000000000
 -rather than this program.
 diff --git a/docs/man/grub-file.h2m b/docs/man/grub-file.h2m
 deleted file mode 100644
-index e09bb4d3101..00000000000
+index e09bb4d31..000000000
 --- a/docs/man/grub-file.h2m
 +++ /dev/null
 @@ -1,2 +0,0 @@
@@ -222,7 +222,7 @@ index e09bb4d3101..00000000000
 -grub-file \- check file type
 diff --git a/docs/man/grub-fstest.h2m b/docs/man/grub-fstest.h2m
 deleted file mode 100644
-index 9676b159afd..00000000000
+index 9676b159a..000000000
 --- a/docs/man/grub-fstest.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -232,7 +232,7 @@ index 9676b159afd..00000000000
 -.BR grub-probe (8)
 diff --git a/docs/man/grub-glue-efi.h2m b/docs/man/grub-glue-efi.h2m
 deleted file mode 100644
-index c1c6ded49ff..00000000000
+index c1c6ded49..000000000
 --- a/docs/man/grub-glue-efi.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -242,7 +242,7 @@ index c1c6ded49ff..00000000000
 -grub-glue-efi processes ia32 and amd64 EFI images and glues them according to Apple format.
 diff --git a/docs/man/grub-install.h2m b/docs/man/grub-install.h2m
 deleted file mode 100644
-index 8cbbc87a0f2..00000000000
+index 8cbbc87a0..000000000
 --- a/docs/man/grub-install.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -254,7 +254,7 @@ index 8cbbc87a0f2..00000000000
 -.BR grub-mkrescue (1)
 diff --git a/docs/man/grub-kbdcomp.h2m b/docs/man/grub-kbdcomp.h2m
 deleted file mode 100644
-index d81f9157e01..00000000000
+index d81f9157e..000000000
 --- a/docs/man/grub-kbdcomp.h2m
 +++ /dev/null
 @@ -1,10 +0,0 @@
@@ -270,7 +270,7 @@ index d81f9157e01..00000000000
 -.BR grub-mklayout (8)
 diff --git a/docs/man/grub-macbless.h2m b/docs/man/grub-macbless.h2m
 deleted file mode 100644
-index 0197c0087d7..00000000000
+index 0197c0087..000000000
 --- a/docs/man/grub-macbless.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -280,7 +280,7 @@ index 0197c0087d7..00000000000
 -.BR grub-install (1)
 diff --git a/docs/man/grub-macho2img.h2m b/docs/man/grub-macho2img.h2m
 deleted file mode 100644
-index d79aaeed8f9..00000000000
+index d79aaeed8..000000000
 --- a/docs/man/grub-macho2img.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -290,7 +290,7 @@ index d79aaeed8f9..00000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-menulst2cfg.h2m b/docs/man/grub-menulst2cfg.h2m
 deleted file mode 100644
-index c2e0055ed7e..00000000000
+index c2e0055ed..000000000
 --- a/docs/man/grub-menulst2cfg.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -300,7 +300,7 @@ index c2e0055ed7e..00000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-mkconfig.h2m b/docs/man/grub-mkconfig.h2m
 deleted file mode 100644
-index 9b42f813010..00000000000
+index 9b42f8130..000000000
 --- a/docs/man/grub-mkconfig.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -310,7 +310,7 @@ index 9b42f813010..00000000000
 -.BR grub-install (8)
 diff --git a/docs/man/grub-mkfont.h2m b/docs/man/grub-mkfont.h2m
 deleted file mode 100644
-index d46fe600eca..00000000000
+index d46fe600e..000000000
 --- a/docs/man/grub-mkfont.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -320,7 +320,7 @@ index d46fe600eca..00000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-mkimage.h2m b/docs/man/grub-mkimage.h2m
 deleted file mode 100644
-index f0fbc2bb197..00000000000
+index f0fbc2bb1..000000000
 --- a/docs/man/grub-mkimage.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -332,7 +332,7 @@ index f0fbc2bb197..00000000000
 -.BR grub-mknetdir (8)
 diff --git a/docs/man/grub-mklayout.h2m b/docs/man/grub-mklayout.h2m
 deleted file mode 100644
-index 1e43409c0ab..00000000000
+index 1e43409c0..000000000
 --- a/docs/man/grub-mklayout.h2m
 +++ /dev/null
 @@ -1,10 +0,0 @@
@@ -348,7 +348,7 @@ index 1e43409c0ab..00000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-mknetdir.h2m b/docs/man/grub-mknetdir.h2m
 deleted file mode 100644
-index a2ef13ec111..00000000000
+index a2ef13ec1..000000000
 --- a/docs/man/grub-mknetdir.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -358,7 +358,7 @@ index a2ef13ec111..00000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-mkpasswd-pbkdf2.h2m b/docs/man/grub-mkpasswd-pbkdf2.h2m
 deleted file mode 100644
-index 4d202f3da7e..00000000000
+index 4d202f3da..000000000
 --- a/docs/man/grub-mkpasswd-pbkdf2.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -368,7 +368,7 @@ index 4d202f3da7e..00000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-mkrelpath.h2m b/docs/man/grub-mkrelpath.h2m
 deleted file mode 100644
-index d01f3961e3f..00000000000
+index d01f3961e..000000000
 --- a/docs/man/grub-mkrelpath.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -378,7 +378,7 @@ index d01f3961e3f..00000000000
 -.BR grub-probe (8)
 diff --git a/docs/man/grub-mkrescue.h2m b/docs/man/grub-mkrescue.h2m
 deleted file mode 100644
-index a427f02e3c6..00000000000
+index a427f02e3..000000000
 --- a/docs/man/grub-mkrescue.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -388,7 +388,7 @@ index a427f02e3c6..00000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-mkstandalone.h2m b/docs/man/grub-mkstandalone.h2m
 deleted file mode 100644
-index c77313978ad..00000000000
+index c77313978..000000000
 --- a/docs/man/grub-mkstandalone.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -398,7 +398,7 @@ index c77313978ad..00000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-mount.h2m b/docs/man/grub-mount.h2m
 deleted file mode 100644
-index 8d168982d72..00000000000
+index 8d168982d..000000000
 --- a/docs/man/grub-mount.h2m
 +++ /dev/null
 @@ -1,2 +0,0 @@
@@ -406,7 +406,7 @@ index 8d168982d72..00000000000
 -grub-mount \- export GRUB filesystem with FUSE
 diff --git a/docs/man/grub-ofpathname.h2m b/docs/man/grub-ofpathname.h2m
 deleted file mode 100644
-index 74b43eea039..00000000000
+index 74b43eea0..000000000
 --- a/docs/man/grub-ofpathname.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -416,7 +416,7 @@ index 74b43eea039..00000000000
 -.BR grub-probe (8)
 diff --git a/docs/man/grub-pe2elf.h2m b/docs/man/grub-pe2elf.h2m
 deleted file mode 100644
-index 7ca29bd703c..00000000000
+index 7ca29bd70..000000000
 --- a/docs/man/grub-pe2elf.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -426,7 +426,7 @@ index 7ca29bd703c..00000000000
 -.BR grub-mkimage (1)
 diff --git a/docs/man/grub-probe.h2m b/docs/man/grub-probe.h2m
 deleted file mode 100644
-index 6e1ffdcf937..00000000000
+index 6e1ffdcf9..000000000
 --- a/docs/man/grub-probe.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -436,7 +436,7 @@ index 6e1ffdcf937..00000000000
 -.BR grub-fstest (1)
 diff --git a/docs/man/grub-reboot.h2m b/docs/man/grub-reboot.h2m
 deleted file mode 100644
-index e4acace65ce..00000000000
+index e4acace65..000000000
 --- a/docs/man/grub-reboot.h2m
 +++ /dev/null
 @@ -1,5 +0,0 @@
@@ -447,7 +447,7 @@ index e4acace65ce..00000000000
 -.BR grub-editenv (1)
 diff --git a/docs/man/grub-render-label.h2m b/docs/man/grub-render-label.h2m
 deleted file mode 100644
-index 50ae5247c05..00000000000
+index 50ae5247c..000000000
 --- a/docs/man/grub-render-label.h2m
 +++ /dev/null
 @@ -1,3 +0,0 @@
@@ -456,7 +456,7 @@ index 50ae5247c05..00000000000
 -
 diff --git a/docs/man/grub-script-check.h2m b/docs/man/grub-script-check.h2m
 deleted file mode 100644
-index 3653682671a..00000000000
+index 365368267..000000000
 --- a/docs/man/grub-script-check.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -466,7 +466,7 @@ index 3653682671a..00000000000
 -.BR grub-mkconfig (8)
 diff --git a/docs/man/grub-set-default.h2m b/docs/man/grub-set-default.h2m
 deleted file mode 100644
-index 7945001c154..00000000000
+index 7945001c1..000000000
 --- a/docs/man/grub-set-default.h2m
 +++ /dev/null
 @@ -1,5 +0,0 @@
@@ -477,7 +477,7 @@ index 7945001c154..00000000000
 -.BR grub-editenv (1)
 diff --git a/docs/man/grub-sparc64-setup.h2m b/docs/man/grub-sparc64-setup.h2m
 deleted file mode 100644
-index 18f803a50db..00000000000
+index 18f803a50..000000000
 --- a/docs/man/grub-sparc64-setup.h2m
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -489,7 +489,7 @@ index 18f803a50db..00000000000
 -.BR grub-mkrescue (1)
 diff --git a/docs/man/grub-syslinux2cfg.h2m b/docs/man/grub-syslinux2cfg.h2m
 deleted file mode 100644
-index ad25c8ab753..00000000000
+index ad25c8ab7..000000000
 --- a/docs/man/grub-syslinux2cfg.h2m
 +++ /dev/null
 @@ -1,4 +0,0 @@
@@ -498,7 +498,7 @@ index ad25c8ab753..00000000000
 -[SEE ALSO]
 -.BR grub-menulst2cfg (8)
 diff --git a/gentpl.py b/gentpl.py
-index da67965a41a..bf8439fa743 100644
+index da67965a4..bf8439fa7 100644
 --- a/gentpl.py
 +++ b/gentpl.py
 @@ -802,10 +802,7 @@ def manpage(defn, adddeps):
@@ -515,7 +515,7 @@ index da67965a41a..bf8439fa743 100644
  
 diff --git a/util/grub-bios-setup.8 b/util/grub-bios-setup.8
 new file mode 100644
-index 00000000000..56f582b3d75
+index 000000000..56f582b3d
 --- /dev/null
 +++ b/util/grub-bios-setup.8
 @@ -0,0 +1,54 @@
@@ -575,7 +575,7 @@ index 00000000000..56f582b3d75
 +.BR "info grub"
 diff --git a/util/grub-editenv.1 b/util/grub-editenv.1
 new file mode 100644
-index 00000000000..d28ba03ba42
+index 000000000..d28ba03ba
 --- /dev/null
 +++ b/util/grub-editenv.1
 @@ -0,0 +1,46 @@
@@ -627,7 +627,7 @@ index 00000000000..d28ba03ba42
 +.BR "info grub"
 diff --git a/util/grub-file.1 b/util/grub-file.1
 new file mode 100644
-index 00000000000..b29cb327889
+index 000000000..b29cb3278
 --- /dev/null
 +++ b/util/grub-file.1
 @@ -0,0 +1,165 @@
@@ -798,7 +798,7 @@ index 00000000000..b29cb327889
 +.BR "info grub"
 diff --git a/util/grub-fstest.1 b/util/grub-fstest.1
 new file mode 100644
-index 00000000000..792fa78634c
+index 000000000..792fa7863
 --- /dev/null
 +++ b/util/grub-fstest.1
 @@ -0,0 +1,99 @@
@@ -903,7 +903,7 @@ index 00000000000..792fa78634c
 +.BR "info grub"
 diff --git a/util/grub-glue-efi.1 b/util/grub-glue-efi.1
 new file mode 100644
-index 00000000000..72bd555d577
+index 000000000..72bd555d5
 --- /dev/null
 +++ b/util/grub-glue-efi.1
 @@ -0,0 +1,31 @@
@@ -940,7 +940,7 @@ index 00000000000..72bd555d577
 +.BR "info grub"
 diff --git a/util/grub-install.8 b/util/grub-install.8
 new file mode 100644
-index 00000000000..76272a39d2e
+index 000000000..76272a39d
 --- /dev/null
 +++ b/util/grub-install.8
 @@ -0,0 +1,129 @@
@@ -1075,7 +1075,7 @@ index 00000000000..76272a39d2e
 +.BR "info grub"
 diff --git a/util/grub-kbdcomp.1 b/util/grub-kbdcomp.1
 new file mode 100644
-index 00000000000..0bb969a5b43
+index 000000000..0bb969a5b
 --- /dev/null
 +++ b/util/grub-kbdcomp.1
 @@ -0,0 +1,19 @@
@@ -1100,7 +1100,7 @@ index 00000000000..0bb969a5b43
 +.BR "info grub"
 diff --git a/util/grub-macbless.1 b/util/grub-macbless.1
 new file mode 100644
-index 00000000000..41a96186f70
+index 000000000..41a96186f
 --- /dev/null
 +++ b/util/grub-macbless.1
 @@ -0,0 +1,22 @@
@@ -1128,7 +1128,7 @@ index 00000000000..41a96186f70
 +.BR "info grub"
 diff --git a/util/grub-menulst2cfg.1 b/util/grub-menulst2cfg.1
 new file mode 100644
-index 00000000000..91e2ef87113
+index 000000000..91e2ef871
 --- /dev/null
 +++ b/util/grub-menulst2cfg.1
 @@ -0,0 +1,12 @@
@@ -1146,7 +1146,7 @@ index 00000000000..91e2ef87113
 +.BR "info grub"
 diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8
 new file mode 100644
-index 00000000000..a2d1f577b9b
+index 000000000..a2d1f577b
 --- /dev/null
 +++ b/util/grub-mkconfig.8
 @@ -0,0 +1,17 @@
@@ -1169,7 +1169,7 @@ index 00000000000..a2d1f577b9b
 +.BR "info grub"
 diff --git a/util/grub-mkfont.1 b/util/grub-mkfont.1
 new file mode 100644
-index 00000000000..3494857987d
+index 000000000..349485798
 --- /dev/null
 +++ b/util/grub-mkfont.1
 @@ -0,0 +1,87 @@
@@ -1262,7 +1262,7 @@ index 00000000000..3494857987d
 +.BR "info grub"
 diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
 new file mode 100644
-index 00000000000..4dea4f54597
+index 000000000..4dea4f545
 --- /dev/null
 +++ b/util/grub-mkimage.1
 @@ -0,0 +1,95 @@
@@ -1363,7 +1363,7 @@ index 00000000000..4dea4f54597
 +.BR "info grub"
 diff --git a/util/grub-mklayout.1 b/util/grub-mklayout.1
 new file mode 100644
-index 00000000000..d1bbc2ec515
+index 000000000..d1bbc2ec5
 --- /dev/null
 +++ b/util/grub-mklayout.1
 @@ -0,0 +1,27 @@
@@ -1396,7 +1396,7 @@ index 00000000000..d1bbc2ec515
 +.BR "info grub"
 diff --git a/util/grub-mknetdir.1 b/util/grub-mknetdir.1
 new file mode 100644
-index 00000000000..fa7e8d4ef0d
+index 000000000..fa7e8d4ef
 --- /dev/null
 +++ b/util/grub-mknetdir.1
 @@ -0,0 +1,12 @@
@@ -1414,7 +1414,7 @@ index 00000000000..fa7e8d4ef0d
 +.BR "info grub"
 diff --git a/util/grub-mkpasswd-pbkdf2.1 b/util/grub-mkpasswd-pbkdf2.1
 new file mode 100644
-index 00000000000..73c437c15d8
+index 000000000..73c437c15
 --- /dev/null
 +++ b/util/grub-mkpasswd-pbkdf2.1
 @@ -0,0 +1,27 @@
@@ -1447,7 +1447,7 @@ index 00000000000..73c437c15d8
 +.BR "info grub"
 diff --git a/util/grub-mkrelpath.1 b/util/grub-mkrelpath.1
 new file mode 100644
-index 00000000000..85f1113621d
+index 000000000..85f111362
 --- /dev/null
 +++ b/util/grub-mkrelpath.1
 @@ -0,0 +1,12 @@
@@ -1465,7 +1465,7 @@ index 00000000000..85f1113621d
 +.BR "info grub"
 diff --git a/util/grub-mkrescue.1 b/util/grub-mkrescue.1
 new file mode 100644
-index 00000000000..4ed9fc723fd
+index 000000000..4ed9fc723
 --- /dev/null
 +++ b/util/grub-mkrescue.1
 @@ -0,0 +1,123 @@
@@ -1594,7 +1594,7 @@ index 00000000000..4ed9fc723fd
 +.BR "info grub"
 diff --git a/util/grub-mkstandalone.1 b/util/grub-mkstandalone.1
 new file mode 100644
-index 00000000000..ba2d2bdf279
+index 000000000..ba2d2bdf2
 --- /dev/null
 +++ b/util/grub-mkstandalone.1
 @@ -0,0 +1,100 @@
@@ -1700,7 +1700,7 @@ index 00000000000..ba2d2bdf279
 +.BR "info grub"
 diff --git a/util/grub-ofpathname.8 b/util/grub-ofpathname.8
 new file mode 100644
-index 00000000000..bf3743aeba1
+index 000000000..bf3743aeb
 --- /dev/null
 +++ b/util/grub-ofpathname.8
 @@ -0,0 +1,12 @@
@@ -1718,7 +1718,7 @@ index 00000000000..bf3743aeba1
 +.BR "info grub"
 diff --git a/util/grub-probe.8 b/util/grub-probe.8
 new file mode 100644
-index 00000000000..04e26c832bb
+index 000000000..04e26c832
 --- /dev/null
 +++ b/util/grub-probe.8
 @@ -0,0 +1,80 @@
@@ -1804,7 +1804,7 @@ index 00000000000..04e26c832bb
 +.BR "info grub"
 diff --git a/util/grub-reboot.8 b/util/grub-reboot.8
 new file mode 100644
-index 00000000000..faa5e4eece2
+index 000000000..faa5e4eec
 --- /dev/null
 +++ b/util/grub-reboot.8
 @@ -0,0 +1,21 @@
@@ -1831,7 +1831,7 @@ index 00000000000..faa5e4eece2
 +.BR "info grub"
 diff --git a/util/grub-render-label.1 b/util/grub-render-label.1
 new file mode 100644
-index 00000000000..4d51c8abf01
+index 000000000..4d51c8abf
 --- /dev/null
 +++ b/util/grub-render-label.1
 @@ -0,0 +1,51 @@
@@ -1888,7 +1888,7 @@ index 00000000000..4d51c8abf01
 +.BR "info grub"
 diff --git a/util/grub-script-check.1 b/util/grub-script-check.1
 new file mode 100644
-index 00000000000..0f1f625b05d
+index 000000000..0f1f625b0
 --- /dev/null
 +++ b/util/grub-script-check.1
 @@ -0,0 +1,21 @@
@@ -1915,7 +1915,7 @@ index 00000000000..0f1f625b05d
 +.BR "info grub"
 diff --git a/util/grub-set-default.8 b/util/grub-set-default.8
 new file mode 100644
-index 00000000000..a96265a1509
+index 000000000..a96265a15
 --- /dev/null
 +++ b/util/grub-set-default.8
 @@ -0,0 +1,21 @@
@@ -1942,7 +1942,7 @@ index 00000000000..a96265a1509
 +.BR "info grub"
 diff --git a/util/grub-sparc64-setup.8 b/util/grub-sparc64-setup.8
 new file mode 100644
-index 00000000000..37ea2dd5eaa
+index 000000000..37ea2dd5e
 --- /dev/null
 +++ b/util/grub-sparc64-setup.8
 @@ -0,0 +1,12 @@

SOURCES/0049-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 0ce59fdc3f0..a3713efcd90 100644
+index 0ce59fdc3..a3713efcd 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -343,7 +343,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),

SOURCES/0050-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, 43 insertions(+), 37 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index a3713efcd90..7d9c4f09b9b 100644
+index a3713efcd..7d9c4f09b 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -341,53 +341,59 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),

SOURCES/0051-Fix-convert-function-to-support-NVMe-devices.patch

@@ -18,7 +18,7 @@ Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
  1 file changed, 19 insertions(+)
 
 diff --git a/util/getroot.c b/util/getroot.c
-index 847406fbab0..fa3460d6cd8 100644
+index 847406fba..fa3460d6c 100644
 --- a/util/getroot.c
 +++ b/util/getroot.c
 @@ -153,6 +153,7 @@ convert_system_partition_to_system_disk (const char *os_dev, int *is_part)

SOURCES/0052-reopen-SNP-protocol-for-exclusive-use-by-grub.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] reopen SNP protocol for exclusive use by grub
  1 file changed, 16 insertions(+)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952ba9..ea0e0ca360e 100644
+index 5388f952b..ea0e0ca36 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -330,6 +330,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,

SOURCES/0053-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch

@@ -16,7 +16,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 16 deletions(-)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index ea0e0ca360e..5388f952ba9 100644
+index ea0e0ca36..5388f952b 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -330,7 +330,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,

SOURCES/0054-Add-grub_util_readlink.patch

@@ -54,7 +54,7 @@ Reviewed-by: Adam Jackson <ajax@redhat.com>
 
 diff --git a/grub-core/gnulib/gettimeofday.c b/grub-core/gnulib/gettimeofday.c
 new file mode 100644
-index 00000000000..8b2058e8c87
+index 000000000..8b2058e8c
 --- /dev/null
 +++ b/grub-core/gnulib/gettimeofday.c
 @@ -0,0 +1,154 @@
@@ -214,7 +214,7 @@ index 00000000000..8b2058e8c87
 +}
 diff --git a/grub-core/gnulib/readlink.c b/grub-core/gnulib/readlink.c
 new file mode 100644
-index 00000000000..4c496395176
+index 000000000..4c4963951
 --- /dev/null
 +++ b/grub-core/gnulib/readlink.c
 @@ -0,0 +1,74 @@
@@ -294,7 +294,7 @@ index 00000000000..4c496395176
 +#endif /* HAVE_READLINK */
 diff --git a/grub-core/gnulib/stat.c b/grub-core/gnulib/stat.c
 new file mode 100644
-index 00000000000..35f4b0b1a51
+index 000000000..35f4b0b1a
 --- /dev/null
 +++ b/grub-core/gnulib/stat.c
 @@ -0,0 +1,138 @@
@@ -437,7 +437,7 @@ index 00000000000..35f4b0b1a51
 +  return result;
 +}
 diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-core/osdep/windows/hostdisk.c
-index 85507af88e3..6f49df465d7 100644
+index 85507af88..6f49df465 100644
 --- a/grub-core/osdep/windows/hostdisk.c
 +++ b/grub-core/osdep/windows/hostdisk.c
 @@ -353,6 +353,12 @@ grub_util_mkdir (const char *dir)
@@ -455,7 +455,7 @@ index 85507af88e3..6f49df465d7 100644
  {
 diff --git a/grub-core/gnulib/pathmax.h b/grub-core/gnulib/pathmax.h
 new file mode 100644
-index 00000000000..33fc3553d75
+index 000000000..33fc3553d
 --- /dev/null
 +++ b/grub-core/gnulib/pathmax.h
 @@ -0,0 +1,83 @@
@@ -544,7 +544,7 @@ index 00000000000..33fc3553d75
 +#endif /* _PATHMAX_H */
 diff --git a/grub-core/gnulib/sys_stat.in.h b/grub-core/gnulib/sys_stat.in.h
 new file mode 100644
-index 00000000000..b47a7ff0ae7
+index 000000000..b47a7ff0a
 --- /dev/null
 +++ b/grub-core/gnulib/sys_stat.in.h
 @@ -0,0 +1,732 @@
@@ -1282,7 +1282,7 @@ index 00000000000..b47a7ff0ae7
 +#endif
 diff --git a/grub-core/gnulib/sys_time.in.h b/grub-core/gnulib/sys_time.in.h
 new file mode 100644
-index 00000000000..30057ad49fd
+index 000000000..30057ad49
 --- /dev/null
 +++ b/grub-core/gnulib/sys_time.in.h
 @@ -0,0 +1,213 @@
@@ -1500,7 +1500,7 @@ index 00000000000..30057ad49fd
 +#endif /* _CYGWIN_SYS_TIME_H */
 +#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
 diff --git a/grub-core/gnulib/sys_types.in.h b/grub-core/gnulib/sys_types.in.h
-index d7da35623b1..9520c09030c 100644
+index d7da35623..9520c0903 100644
 --- a/grub-core/gnulib/sys_types.in.h
 +++ b/grub-core/gnulib/sys_types.in.h
 @@ -23,7 +23,9 @@
@@ -1515,7 +1515,7 @@ index d7da35623b1..9520c09030c 100644
  #define _@GUARD_PREFIX@_SYS_TYPES_H
 diff --git a/grub-core/gnulib/time.h b/grub-core/gnulib/time.h
 new file mode 100644
-index 00000000000..b9203d5569a
+index 000000000..b9203d556
 --- /dev/null
 +++ b/grub-core/gnulib/time.h
 @@ -0,0 +1,586 @@
@@ -2107,7 +2107,7 @@ index 00000000000..b9203d5569a
 +#endif
 diff --git a/grub-core/gnulib/time.in.h b/grub-core/gnulib/time.in.h
 new file mode 100644
-index 00000000000..81abdf46e0b
+index 000000000..81abdf46e
 --- /dev/null
 +++ b/grub-core/gnulib/time.in.h
 @@ -0,0 +1,274 @@
@@ -2386,7 +2386,7 @@ index 00000000000..81abdf46e0b
 +
 +#endif
 diff --git a/include/grub/osdep/hostfile_aros.h b/include/grub/osdep/hostfile_aros.h
-index a059c0fa40a..161fbb7bdfd 100644
+index a059c0fa4..161fbb7bd 100644
 --- a/include/grub/osdep/hostfile_aros.h
 +++ b/include/grub/osdep/hostfile_aros.h
 @@ -68,6 +68,12 @@ grub_util_rename (const char *from, const char *to)
@@ -2403,7 +2403,7 @@ index a059c0fa40a..161fbb7bdfd 100644
  
  struct grub_util_fd
 diff --git a/include/grub/osdep/hostfile_unix.h b/include/grub/osdep/hostfile_unix.h
-index 9ffe46fa3ca..17cd3aa8b30 100644
+index 9ffe46fa3..17cd3aa8b 100644
 --- a/include/grub/osdep/hostfile_unix.h
 +++ b/include/grub/osdep/hostfile_unix.h
 @@ -71,6 +71,12 @@ grub_util_rename (const char *from, const char *to)
@@ -2420,7 +2420,7 @@ index 9ffe46fa3ca..17cd3aa8b30 100644
  
  #if defined (__NetBSD__)
 diff --git a/include/grub/osdep/hostfile_windows.h b/include/grub/osdep/hostfile_windows.h
-index bf6451b6db4..8c92d0591bb 100644
+index bf6451b6d..8c92d0591 100644
 --- a/include/grub/osdep/hostfile_windows.h
 +++ b/include/grub/osdep/hostfile_windows.h
 @@ -41,6 +41,8 @@ typedef struct grub_util_fd_dir *grub_util_fd_dir_t;
@@ -2433,7 +2433,7 @@ index bf6451b6db4..8c92d0591bb 100644
  grub_util_unlink (const char *name);
  void
 diff --git a/grub-core/gnulib/Makefile.am b/grub-core/gnulib/Makefile.am
-index 3444397fe37..b7c5e60e1c3 100644
+index 3444397fe..b7c5e60e1 100644
 --- a/grub-core/gnulib/Makefile.am
 +++ b/grub-core/gnulib/Makefile.am
 @@ -21,7 +21,7 @@
@@ -2664,7 +2664,7 @@ index 3444397fe37..b7c5e60e1c3 100644
  BUILT_SOURCES += unistd.h
 diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
 new file mode 100644
-index 00000000000..1c2d66ee261
+index 000000000..1c2d66ee2
 --- /dev/null
 +++ b/m4/gettimeofday.m4
 @@ -0,0 +1,138 @@
@@ -2807,7 +2807,7 @@ index 00000000000..1c2d66ee261
 +  AC_CHECK_FUNCS([_ftime])
 +])
 diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
-index 408918440b6..ef2ec5bcce0 100644
+index 408918440..ef2ec5bcc 100644
 --- a/m4/gnulib-cache.m4
 +++ b/m4/gnulib-cache.m4
 @@ -27,7 +27,7 @@
@@ -2828,7 +2828,7 @@ index 408918440b6..ef2ec5bcce0 100644
  ])
  gl_AVOID([])
 diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
-index 7a19f60d85e..66fd0eda901 100644
+index 7a19f60d8..66fd0eda9 100644
 --- a/m4/gnulib-comp.m4
 +++ b/m4/gnulib-comp.m4
 @@ -60,10 +60,13 @@ AC_DEFUN([gl_EARLY],
@@ -3035,7 +3035,7 @@ index 7a19f60d85e..66fd0eda901 100644
    m4/vasnprintf.m4
 diff --git a/m4/largefile.m4 b/m4/largefile.m4
 new file mode 100644
-index 00000000000..a1b564ad9af
+index 000000000..a1b564ad9
 --- /dev/null
 +++ b/m4/largefile.m4
 @@ -0,0 +1,146 @@
@@ -3187,7 +3187,7 @@ index 00000000000..a1b564ad9af
 +])
 diff --git a/m4/pathmax.m4 b/m4/pathmax.m4
 new file mode 100644
-index 00000000000..114f91f04b5
+index 000000000..114f91f04
 --- /dev/null
 +++ b/m4/pathmax.m4
 @@ -0,0 +1,42 @@
@@ -3235,7 +3235,7 @@ index 00000000000..114f91f04b5
 +])
 diff --git a/m4/readlink.m4 b/m4/readlink.m4
 new file mode 100644
-index 00000000000..f9ce868c2e4
+index 000000000..f9ce868c2
 --- /dev/null
 +++ b/m4/readlink.m4
 @@ -0,0 +1,71 @@
@@ -3312,7 +3312,7 @@ index 00000000000..f9ce868c2e4
 +])
 diff --git a/m4/stat.m4 b/m4/stat.m4
 new file mode 100644
-index 00000000000..1ae327b3684
+index 000000000..1ae327b36
 --- /dev/null
 +++ b/m4/stat.m4
 @@ -0,0 +1,71 @@
@@ -3389,7 +3389,7 @@ index 00000000000..1ae327b3684
 +AC_DEFUN([gl_PREREQ_STAT], [:])
 diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4
 new file mode 100644
-index 00000000000..eaa7642ba31
+index 000000000..eaa7642ba
 --- /dev/null
 +++ b/m4/sys_stat_h.m4
 @@ -0,0 +1,96 @@
@@ -3491,7 +3491,7 @@ index 00000000000..eaa7642ba31
 +])
 diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4
 new file mode 100644
-index 00000000000..5c79300f8ec
+index 000000000..5c79300f8
 --- /dev/null
 +++ b/m4/sys_time_h.m4
 @@ -0,0 +1,110 @@
@@ -3607,7 +3607,7 @@ index 00000000000..5c79300f8ec
 +])
 diff --git a/m4/time_h.m4 b/m4/time_h.m4
 new file mode 100644
-index 00000000000..9852778f9a5
+index 000000000..9852778f9
 --- /dev/null
 +++ b/m4/time_h.m4
 @@ -0,0 +1,118 @@

SOURCES/0055-Make-editenv-chase-symlinks-including-those-across-d.patch

@@ -16,7 +16,7 @@ Reviewed-by: Adam Jackson <ajax@redhat.com>
  2 files changed, 53 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index c7b775bce73..d08713b5500 100644
+index c7b775bce..d08713b55 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -231,8 +231,17 @@ program = {
@@ -38,7 +38,7 @@ index c7b775bce73..d08713b5500 100644
    ldadd = libgrubgcry.a;
    ldadd = libgrubkern.a;
 diff --git a/util/editenv.c b/util/editenv.c
-index c6f8d2298c3..d8d1dad6ab9 100644
+index c6f8d2298..d8d1dad6a 100644
 --- a/util/editenv.c
 +++ b/util/editenv.c
 @@ -37,6 +37,7 @@ grub_util_create_envblk_file (const char *name)

SOURCES/0056-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 b744438e04a..43d98476b88 100644
+index b744438e0..43d98476b 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@"

SOURCES/0057-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 1001a12232b..1a4a57898f9 100644
+index 1001a1223..1a4a57898 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -249,6 +249,14 @@ version_test_gt ()

SOURCES/0058-Try-prefix-if-fw_path-doesn-t-work.patch

@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  3 files changed, 75 insertions(+), 75 deletions(-)
 
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index f5423ce27d9..e01bc6eab19 100644
+index f5423ce27..e01bc6eab 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
 @@ -124,23 +124,25 @@ grub_machine_get_bootlocation (char **device, char **path)
@@ -56,7 +56,7 @@ index f5423ce27d9..e01bc6eab19 100644
  }
  
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 0769bf850d3..16d2ce06d5a 100644
+index 0769bf850..16d2ce06d 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
 @@ -1850,7 +1850,7 @@ grub_net_search_configfile (char *config)
@@ -69,7 +69,7 @@ index 0769bf850d3..16d2ce06d5a 100644
  
  static struct grub_preboot *fini_hnd;
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 7d9c4f09b9b..b69f9e738fa 100644
+index 7d9c4f09b..b69f9e738 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -331,74 +331,72 @@ grub_enter_normal_mode (const char *config)

SOURCES/0059-Update-info-with-grub.cfg-netboot-selection-order-11.patch

@@ -12,7 +12,7 @@ Resolves rhbz#1148650
  1 file changed, 42 insertions(+)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 2fd32608c01..a7155c22ffe 100644
+index 2fd32608c..a7155c22f 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -2493,6 +2493,48 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38

SOURCES/0060-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch

@@ -21,7 +21,7 @@ Resolves rhbz#1124074
  create mode 100644 util/grub-rpm-sort.8
 
 diff --git a/configure.ac b/configure.ac
-index d5db2803ec4..056df1cbaf9 100644
+index d5db2803e..056df1cba 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-mkrelpath])
@@ -75,7 +75,7 @@ index d5db2803ec4..056df1cbaf9 100644
  if test x$host_kernel = xkfreebsd; then
    AC_CHECK_LIB([geom], [geom_gettree], [],
 diff --git a/Makefile.util.def b/Makefile.util.def
-index d08713b5500..406d96861b6 100644
+index d08713b55..406d96861 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -685,6 +685,22 @@ program = {
@@ -103,7 +103,7 @@ index d08713b5500..406d96861b6 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 @@
@@ -389,7 +389,7 @@ index 00000000000..f33bd1ed568
 +  return 0;
 +}
 diff --git a/.gitignore b/.gitignore
-index 43f04d47277..fa2e5b609b1 100644
+index 43f04d472..fa2e5b609 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -105,6 +105,8 @@ grub-*.tar.*
@@ -402,7 +402,7 @@ index 43f04d47277..fa2e5b609b1 100644
  /grub*-script-check.1
  /grub*-set-default
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 1a4a57898f9..7fe3598435c 100644
+index 1a4a57898..7fe359843 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -214,6 +214,12 @@ version_sort ()
@@ -429,7 +429,7 @@ index 1a4a57898f9..7fe3598435c 100644
      return 1
 diff --git a/util/grub-rpm-sort.8 b/util/grub-rpm-sort.8
 new file mode 100644
-index 00000000000..8ce21488448
+index 000000000..8ce214884
 --- /dev/null
 +++ b/util/grub-rpm-sort.8
 @@ -0,0 +1,12 @@

SOURCES/0061-Handle-rssd-storage-devices.patch

@@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 13 insertions(+)
 
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 90d92d3ad5c..6d9f4e5faa2 100644
+index 90d92d3ad..6d9f4e5fa 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
 @@ -921,6 +921,19 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,

SOURCES/0062-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 43d98476b88..a8a8e2cf325 100644
+index 43d98476b..a8a8e2cf3 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -78,6 +78,32 @@ case x"$GRUB_FS" in

SOURCES/0063-Add-friendly-grub2-password-config-tool-985962.patch

@@ -22,7 +22,7 @@ Resolves: rhbz#985962
  create mode 100644 util/grub.d/01_users.in
 
 diff --git a/configure.ac b/configure.ac
-index 056df1cbaf9..679f634ce4c 100644
+index 056df1cba..679f634ce 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-mkrelpath])
@@ -34,7 +34,7 @@ index 056df1cbaf9..679f634ce4c 100644
  grub_TRANSFORM([grub-script-check])
  grub_TRANSFORM([grub-set-default])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 406d96861b6..fd91045bd6d 100644
+index 406d96861..fd91045bd 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -440,6 +440,12 @@ script = {
@@ -65,7 +65,7 @@ index 406d96861b6..fd91045bd6d 100644
    name = grub-mkconfig_lib;
    common = util/grub-mkconfig_lib.in;
 diff --git a/.gitignore b/.gitignore
-index fa2e5b609b1..5066689bc0a 100644
+index fa2e5b609..5066689bc 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -111,6 +111,8 @@ grub-*.tar.*
@@ -78,7 +78,7 @@ index fa2e5b609b1..5066689bc0a 100644
  /grub*-shell-tester
  /grub*-sparc64-setup
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index f68d4925ee6..bdb9982aefb 100644
+index f68d4925e..bdb9982ae 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -282,6 +282,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
@@ -92,7 +92,7 @@ index f68d4925ee6..bdb9982aefb 100644
          echo
 diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8
 new file mode 100644
-index 00000000000..49200a848b7
+index 000000000..49200a848
 --- /dev/null
 +++ b/util/grub-setpassword.8
 @@ -0,0 +1,28 @@
@@ -126,7 +126,7 @@ index 00000000000..49200a848b7
 +.BR "info grub2-mkpasswd-pbkdf2"
 diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
 new file mode 100644
-index 00000000000..dd76f00fc0e
+index 000000000..dd76f00fc
 --- /dev/null
 +++ b/util/grub-setpassword.in
 @@ -0,0 +1,123 @@
@@ -255,7 +255,7 @@ index 00000000000..dd76f00fc0e
 +echo "GRUB2_PASSWORD=${MYPASS}" > "${grubdir}/user.cfg"
 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 @@

SOURCES/0064-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch

@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 679f634ce4c..71d1056969e 100644
+index 679f634ce..71d105696 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1796,7 +1796,7 @@ AC_SUBST([LIBDEVMAPPER])
@@ -28,7 +28,7 @@ index 679f634ce4c..71d1056969e 100644
  fi
  
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 7fe3598435c..113a41f9409 100644
+index 7fe359843..113a41f94 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -33,6 +33,9 @@ fi

SOURCES/0065-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

SOURCES/0066-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] efinet: add filter for the first exclusive reopen of SNP
  1 file changed, 39 insertions(+)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952ba9..d15a799f29a 100644
+index 5388f952b..d15a799f2 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -383,6 +383,45 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,

SOURCES/0067-Fix-security-issue-when-reading-username-and-passwor.patch

@@ -17,7 +17,7 @@ Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
-index ca334d5a40e..e6c78d16d39 100644
+index ca334d5a4..e6c78d16d 100644
 --- a/grub-core/lib/crypto.c
 +++ b/grub-core/lib/crypto.c
 @@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned buf_size)
@@ -30,7 +30,7 @@ index ca334d5a40e..e6c78d16d39 100644
  	  if (cur_len)
  	    cur_len--;
 diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
-index 6be678c0de1..c35ce972473 100644
+index 6be678c0d..c35ce9724 100644
 --- a/grub-core/normal/auth.c
 +++ b/grub-core/normal/auth.c
 @@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size)

SOURCES/0068-Warn-if-grub-password-will-not-be-read-1290803.patch

@@ -14,7 +14,7 @@ Resolves: rhbz#1290803
  1 file changed, 5 insertions(+)
 
 diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
-index dd76f00fc0e..fb9d3a3b6f9 100644
+index dd76f00fc..fb9d3a3b6 100644
 --- a/util/grub-setpassword.in
 +++ b/util/grub-setpassword.in
 @@ -121,3 +121,8 @@ fi

SOURCES/0069-Clean-up-grub-setpassword-documentation-1290799.patch

@@ -14,7 +14,7 @@ Resolves: rhbz#1290799
  2 files changed, 8 insertions(+), 9 deletions(-)
 
 diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8
-index 49200a848b7..dc91dd6697b 100644
+index 49200a848..dc91dd669 100644
 --- a/util/grub-setpassword.8
 +++ b/util/grub-setpassword.8
 @@ -19,7 +19,7 @@ Display program usage and exit.
@@ -27,7 +27,7 @@ index 49200a848b7..dc91dd6697b 100644
  
  .SH SEE ALSO
 diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
-index fb9d3a3b6f9..c8c0fa4199d 100644
+index fb9d3a3b6..c8c0fa419 100644
 --- a/util/grub-setpassword.in
 +++ b/util/grub-setpassword.in
 @@ -16,15 +16,14 @@ grub_mkpasswd="${bindir}/@grub_mkpasswd_pbkdf2@"

SOURCES/0070-Fix-locale-issue-in-grub-setpassword-1294243.patch

@@ -13,7 +13,7 @@ Resolves: rhbz#1294243
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
-index c8c0fa4199d..d7924af5192 100644
+index c8c0fa419..d7924af51 100644
 --- a/util/grub-setpassword.in
 +++ b/util/grub-setpassword.in
 @@ -104,7 +104,7 @@ getpass() {

SOURCES/0071-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch

@@ -12,7 +12,7 @@ Resolves: rhbz#1288608
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c
-index 52a032f7b2e..92e7df7e501 100644
+index 52a032f7b..92e7df7e5 100644
 --- a/grub-core/efiemu/mm.c
 +++ b/grub-core/efiemu/mm.c
 @@ -410,8 +410,8 @@ fill_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,

SOURCES/0072-efiemu-Fix-compilation-failure.patch

@@ -11,7 +11,7 @@ Resolves: rhbz#1288608
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c
-index 92e7df7e501..52a032f7b2e 100644
+index 92e7df7e5..52a032f7b 100644
 --- a/grub-core/efiemu/mm.c
 +++ b/grub-core/efiemu/mm.c
 @@ -410,8 +410,8 @@ fill_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,

SOURCES/0073-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch

@@ -14,7 +14,7 @@ This reverts commit 147daeab22db793978f952b6f0d832919a1b0081.
  1 file changed, 39 deletions(-)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index d15a799f29a..5388f952ba9 100644
+index d15a799f2..5388f952b 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -383,45 +383,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,

SOURCES/0074-Add-a-url-parser.patch

@@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  create mode 100644 include/grub/net/url.h
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index cd0902b46b8..991891a6e09 100644
+index cd0902b46..991891a6e 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -2185,6 +2185,7 @@ module = {
@@ -32,7 +32,7 @@ index cd0902b46b8..991891a6e09 100644
  
  module = {
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 8344526be7f..f1fab700048 100644
+index 8344526be..f1fab7000 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
 @@ -296,6 +296,19 @@ grub_strrchr (const char *s, int c)
@@ -57,7 +57,7 @@ index 8344526be7f..f1fab700048 100644
  {
 diff --git a/grub-core/net/url.c b/grub-core/net/url.c
 new file mode 100644
-index 00000000000..146858284cd
+index 000000000..146858284
 --- /dev/null
 +++ b/grub-core/net/url.c
 @@ -0,0 +1,861 @@
@@ -923,7 +923,7 @@ index 00000000000..146858284cd
 +}
 +#endif
 diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 83fd69f4ada..fcaf1201e39 100644
+index 83fd69f4a..fcaf1201e 100644
 --- a/include/grub/misc.h
 +++ b/include/grub/misc.h
 @@ -85,6 +85,7 @@ int EXPORT_FUNC(grub_strncmp) (const char *s1, const char *s2, grub_size_t n);
@@ -987,7 +987,7 @@ index 83fd69f4ada..fcaf1201e39 100644
  {
 diff --git a/include/grub/net/url.h b/include/grub/net/url.h
 new file mode 100644
-index 00000000000..a215fa27d0a
+index 000000000..a215fa27d
 --- /dev/null
 +++ b/include/grub/net/url.h
 @@ -0,0 +1,28 @@

SOURCES/0075-efinet-and-bootp-add-support-for-dhcpv6.patch

@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  6 files changed, 478 insertions(+), 14 deletions(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index f03eeab2fb4..da3e454466b 100644
+index f03eeab2f..da3e45446 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -23,6 +23,7 @@
@@ -206,7 +206,7 @@ index f03eeab2fb4..da3e454466b 100644
  grub_net_process_dhcp (struct grub_net_buff *nb,
  		       struct grub_net_card *card)
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952ba9..a4daaa460bd 100644
+index 5388f952b..a4daaa460 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -18,11 +18,15 @@
@@ -315,7 +315,7 @@ index 5388f952ba9..a4daaa460bd 100644
    }
  }
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 16d2ce06d5a..4be228d9576 100644
+index 16d2ce06d..4be228d95 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
 @@ -955,6 +955,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
@@ -398,7 +398,7 @@ index 16d2ce06d5a..4be228d9576 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 7d90bf66e76..1157524fc50 100644
+index 7d90bf66e..1157524fc 100644
 --- a/grub-core/net/tftp.c
 +++ b/grub-core/net/tftp.c
 @@ -379,19 +379,23 @@ tftp_open (struct grub_file *file, const char *filename)
@@ -426,7 +426,7 @@ index 7d90bf66e76..1157524fc50 100644
        grub_free (data);
        return grub_errno;
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index c7c9f0e1db1..28b6adf7648 100644
+index c7c9f0e1d..28b6adf76 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -572,10 +572,16 @@ typedef void *grub_efi_handle_t;
@@ -581,7 +581,7 @@ index c7c9f0e1db1..28b6adf7648 100644
  
  typedef struct grub_efi_pxe
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 50d62ab0c8c..f8f3ec13acc 100644
+index 50d62ab0c..f8f3ec13a 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
 @@ -442,6 +442,51 @@ struct grub_net_bootp_packet

SOURCES/0076-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch

@@ -24,7 +24,7 @@ Resolves: rhbz#1226325
  create mode 100644 util/grub-get-kernel-settings.in
 
 diff --git a/configure.ac b/configure.ac
-index 71d1056969e..aa06ed59c8d 100644
+index 71d105696..aa06ed59c 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -58,6 +58,7 @@ grub_TRANSFORM([grub-install])
@@ -44,7 +44,7 @@ index 71d1056969e..aa06ed59c8d 100644
  grub_TRANSFORM([grub-install.1])
  grub_TRANSFORM([grub-kbdcomp.3])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index fd91045bd6d..2d032643de7 100644
+index fd91045bd..2d032643d 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -714,6 +714,13 @@ script = {
@@ -62,7 +62,7 @@ index fd91045bd6d..2d032643de7 100644
    name = grub-set-default;
    common = util/grub-set-default.in;
 diff --git a/.gitignore b/.gitignore
-index 5066689bc0a..54795fa60be 100644
+index 5066689bc..54795fa60 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -68,6 +68,8 @@ grub-*.tar.*
@@ -75,7 +75,7 @@ index 5066689bc0a..54795fa60be 100644
  /grub*-glue-efi.1
  /grub*-install
 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} && \
@@ -109,7 +109,7 @@ index 44bf135b9f8..5c4acd496d4 100644
  #
 diff --git a/util/grub-get-kernel-settings.3 b/util/grub-get-kernel-settings.3
 new file mode 100644
-index 00000000000..ba33330e28d
+index 000000000..ba33330e2
 --- /dev/null
 +++ b/util/grub-get-kernel-settings.3
 @@ -0,0 +1,20 @@
@@ -135,7 +135,7 @@ index 00000000000..ba33330e28d
 +.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..12046219878
+index 000000000..120462198
 --- /dev/null
 +++ b/util/grub-get-kernel-settings.in
 @@ -0,0 +1,78 @@
@@ -218,7 +218,7 @@ index 00000000000..12046219878
 +    echo export GRUB_LINUX_DEBUG_TITLE_POSTFIX
 +fi
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index bdb9982aefb..8218f3d477f 100644
+index bdb9982ae..8218f3d47 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@"
@@ -239,7 +239,7 @@ index bdb9982aefb..8218f3d477f 100644
    if [ -z "$GRUB_DEVICE_UUID" ]; then
      GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED"
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index a8a8e2cf325..4e49ccdf742 100644
+index a8a8e2cf3..4e49ccdf7 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -111,7 +111,8 @@ linux_entry ()

SOURCES/0077-Normalize-slashes-in-tftp-paths.patch

@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 23 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 1157524fc50..5ca0a96a6f6 100644
+index 1157524fc..5ca0a96a6 100644
 --- a/grub-core/net/tftp.c
 +++ b/grub-core/net/tftp.c
 @@ -300,6 +300,25 @@ destroy_pq (tftp_data_t data)

SOURCES/0078-Fix-malformed-tftp-packets.patch

@@ -16,7 +16,7 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 5ca0a96a6f6..dcd82494309 100644
+index 5ca0a96a6..dcd824943 100644
 --- a/grub-core/net/tftp.c
 +++ b/grub-core/net/tftp.c
 @@ -360,8 +360,8 @@ tftp_open (struct grub_file *file, const char *filename)

SOURCES/0079-bz1374141-fix-incorrect-mask-for-ppc64.patch

@@ -30,7 +30,7 @@ The count of zero with __builtin_clz can be 22. (clz counts the number of one bi
  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 002446be1c3..3df75357a70 100644
+index 002446be1..3df75357a 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,

SOURCES/0080-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 991891a6e09..27563743ba9 100644
+index 991891a6e..27563743b 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -175,6 +175,9 @@ kernel = {
@@ -27,7 +27,7 @@ index 991891a6e09..27563743ba9 100644
    i386_xen = kern/i386/dl.c;
  
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index f1fab700048..5ce89a40c68 100644
+index f1fab7000..5ce89a40c 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
 @@ -24,6 +24,7 @@
@@ -55,7 +55,7 @@ index f1fab700048..5ce89a40c68 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 @@

SOURCES/0081-Make-grub-editenv-build-again.patch

@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 2d032643de7..879e8eb98a4 100644
+index 2d032643d..879e8eb98 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -237,6 +237,8 @@ program = {

SOURCES/0082-Fix-up-some-man-pages-rpmdiff-noticed.patch

@@ -13,7 +13,7 @@ Subject: [PATCH] Fix up some man pages rpmdiff noticed.
  create mode 100644 util/grub-syslinux2cfg.1
 
 diff --git a/configure.ac b/configure.ac
-index aa06ed59c8d..f69f8986791 100644
+index aa06ed59c..f69f89867 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -80,6 +80,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
@@ -34,7 +34,7 @@ index aa06ed59c8d..f69f8986791 100644
  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
+index 000000000..ae842f3a6
 --- /dev/null
 +++ b/util/grub-macbless.8
 @@ -0,0 +1,26 @@
@@ -65,7 +65,7 @@ index 00000000000..ae842f3a606
 +.SH SEE ALSO
 +.BR "info grub"
 diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
-index 4dea4f54597..0eaaafe505b 100644
+index 4dea4f545..0eaaafe50 100644
 --- a/util/grub-mkimage.1
 +++ b/util/grub-mkimage.1
 @@ -17,7 +17,7 @@
@@ -79,7 +79,7 @@ index 4dea4f54597..0eaaafe505b 100644
  .TP
 diff --git a/util/grub-syslinux2cfg.1 b/util/grub-syslinux2cfg.1
 new file mode 100644
-index 00000000000..85309482718
+index 000000000..853094827
 --- /dev/null
 +++ b/util/grub-syslinux2cfg.1
 @@ -0,0 +1,65 @@

SOURCES/0083-Make-exit-take-a-return-code.patch

@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 15 insertions(+)
 
 diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
-index 55ea5a11ccd..7e47ec81263 100644
+index 55ea5a11c..7e47ec812 100644
 --- a/grub-core/kern/emu/main.c
 +++ b/grub-core/kern/emu/main.c
 @@ -72,6 +72,12 @@ grub_exit (int retval __attribute__((unused)))
@@ -32,7 +32,7 @@ index 55ea5a11ccd..7e47ec81263 100644
  grub_machine_init (void)
  {
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 5ce89a40c68..04371ac49f2 100644
+index 5ce89a40c..04371ac49 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
 @@ -1120,6 +1120,15 @@ grub_abort (void)

SOURCES/0084-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch

@@ -14,7 +14,7 @@ make sure they exist.
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index a1ac7a38867..93b5cd306eb 100644
+index a1ac7a388..93b5cd306 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -80,7 +80,21 @@ finalize_params_linux (void)

SOURCES/0085-Make-our-info-pages-say-grub2-where-appropriate.patch

@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 161 insertions(+), 161 deletions(-)
 
 diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
-index a9f4de6318c..3ce827ab726 100644
+index a9f4de631..3ce827ab7 100644
 --- a/docs/grub-dev.texi
 +++ b/docs/grub-dev.texi
 @@ -1,7 +1,7 @@
@@ -35,7 +35,7 @@ index a9f4de6318c..3ce827ab726 100644
  
  @setchapternewpage odd
 diff --git a/docs/grub.texi b/docs/grub.texi
-index a7155c22ffe..2b7b7faf847 100644
+index a7155c22f..2b7b7faf8 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -1,7 +1,7 @@

SOURCES/0086-print-more-debug-info-in-our-module-loader.patch

@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 13 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index e339f264b3a..562d6887e0e 100644
+index e339f264b..562d6887e 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -313,13 +313,23 @@ grub_efi_modules_addr (void)

SOURCES/0087-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 9b8f5968e2d..13a3a6bc752 100644
+index 9b8f5968e..13a3a6bc7 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

SOURCES/0088-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 be195448dbe..51ed63d429b 100644
+index be195448d..51ed63d42 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -29,6 +29,9 @@
@@ -690,7 +690,7 @@ index be195448dbe..51ed63d429b 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

SOURCES/0089-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 51ed63d429b..88d727d161f 100644
+index 51ed63d42..88d727d16 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -2273,6 +2273,8 @@ GRUB_MOD_INIT (btrfs)

SOURCES/0090-grub2-btrfs-03-follow_default.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] grub2-btrfs-03-follow_default
  1 file changed, 76 insertions(+), 31 deletions(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 88d727d161f..a47d297567f 100644
+index 88d727d16..a47d29756 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -920,6 +920,7 @@ grub_btrfs_mount (grub_device_t dev)

SOURCES/0091-grub2-btrfs-04-grub2-install.patch

@@ -13,7 +13,7 @@ Subject: [PATCH] grub2-btrfs-04-grub2-install
  6 files changed, 54 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 6d9f4e5faa2..5d50dd6f8dc 100644
+index 6d9f4e5fa..5d50dd6f8 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)
@@ -38,7 +38,7 @@ index 6d9f4e5faa2..5d50dd6f8dc 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 65effa9f3a7..b637c58efb7 100644
+index 65effa9f3..b637c58ef 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)
@@ -73,7 +73,7 @@ index 65effa9f3a7..b637c58efb7 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)
@@ -94,7 +94,7 @@ index ebcdd8f5e22..f044a880a76 100644
  			sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0)
  	{
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 78d0138cb0a..4375c161955 100644
+index 78d0138cb..4375c1619 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -816,6 +816,8 @@ fill_core_services (const char *core_services)
@@ -134,7 +134,7 @@ index 78d0138cb0a..4375c161955 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
@@ -161,7 +161,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

SOURCES/0092-grub2-btrfs-05-grub2-mkconfig.patch

@@ -12,7 +12,7 @@ Subject: [PATCH] grub2-btrfs-05-grub2-mkconfig
  5 files changed, 37 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 8218f3d477f..4248b9341ab 100644
+index 8218f3d47..4248b9341 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -258,7 +258,8 @@ export GRUB_DEFAULT \
@@ -26,7 +26,7 @@ index 8218f3d477f..4248b9341ab 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 113a41f9409..b3aae534ddc 100644
+index 113a41f94..b3aae534d 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -52,7 +52,11 @@ grub_warn ()
@@ -42,7 +42,7 @@ index 113a41f9409..b3aae534ddc 100644
  
  is_path_readable_by_grub ()
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 858b526c925..e2a53300126 100644
+index 858b526c9..e2a533001 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@"
@@ -88,7 +88,7 @@ index 858b526c925..e2a53300126 100644
 +EOF
 +fi
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 4e49ccdf742..d9a05937e46 100644
+index 4e49ccdf7..d9a05937e 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -66,10 +66,14 @@ fi
@@ -107,7 +107,7 @@ index 4e49ccdf742..d9a05937e46 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 972a4b5a03d..bcdc3ceac02 100644
+index 972a4b5a0..bcdc3ceac 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
 @@ -73,10 +73,14 @@ fi

SOURCES/0093-grub2-btrfs-06-subvol-mount.patch

@@ -11,7 +11,7 @@ Subject: [PATCH] grub2-btrfs-06-subvol-mount
  4 files changed, 392 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index a47d297567f..2e36ac47e8a 100644
+index a47d29756..2e36ac47e 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -32,6 +32,7 @@
@@ -277,7 +277,7 @@ index a47d297567f..2e36ac47e8a 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 5d50dd6f8dc..4c5a13022dc 100644
+index 5d50dd6f8..4c5a13022 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
 @@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key
@@ -460,7 +460,7 @@ index 5d50dd6f8dc..4c5a13022dc 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 4375c161955..a0ad99729fd 100644
+index 4375c1619..a0ad99729 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -1535,6 +1535,55 @@ main (int argc, char *argv[])
@@ -520,7 +520,7 @@ index 4375c161955..a0ad99729fd 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 **

SOURCES/0094-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch

@@ -10,7 +10,7 @@ does a search for "menuentry".
  1 file changed, 12 deletions(-)
 
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index e2a53300126..8a16fea347e 100644
+index e2a533001..8a16fea34 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -366,15 +366,3 @@ fi

SOURCES/0095-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 2e36ac47e8a..4a31d39ee74 100644
+index 2e36ac47e..4a31d39ee 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -924,11 +924,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)

SOURCES/0096-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] Grub not working correctly with btrfs snapshots (bsc#1026511)
  1 file changed, 238 insertions(+)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 4a31d39ee74..7002ad81b7e 100644
+index 4a31d39ee..7002ad81b 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -2446,6 +2446,238 @@ out:

SOURCES/0097-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 39480b38674..09a18e56302 100644
+index 39480b386..09a18e563 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
 @@ -24,6 +24,10 @@

SOURCES/0098-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 5cd9b6e08a8..106eb10a362 100644
+index 5cd9b6e08..106eb10a3 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -65,7 +65,7 @@ grub_chainloader_unload (void)

SOURCES/0099-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch

@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 106eb10a362..3630b0cbf2d 100644
+index 106eb10a3..3630b0cbf 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -783,7 +783,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
@@ -26,7 +26,7 @@ index 106eb10a362..3630b0cbf2d 100644
    efi_status = grub_efi_free_pool (buffer);
  
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 28b6adf7648..e5b521bd9be 100644
+index 28b6adf76..e5b521bd9 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -527,6 +527,14 @@ typedef grub_uint8_t grub_efi_char8_t;

SOURCES/0100-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch

@@ -9,7 +9,7 @@ Subject: [PATCH] Don't use dynamic sized arrays since we don't build with
  1 file changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 4be228d9576..fa3e2912643 100644
+index 4be228d95..fa3e29126 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
 @@ -1853,14 +1853,25 @@ grub_net_search_configfile (char *config)