Merge branch 'c8' into a8

1 year ago · 7faece4aae
parent 4bcb992cc3 222ef7350f
commit 7faece4aae
504 changed files with 3100 additions and 1433 deletions
--- a/SOURCES/0001-Add-support-for-Linux-EFI-stub-loading.patch
+++ b/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
--- a/SOURCES/0002-Rework-linux-command.patch
+++ b/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)),
--- a/SOURCES/0003-Rework-linux16-command.patch
+++ b/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)),
--- a/SOURCES/0004-Add-secureboot-support-on-efi-chainloader.patch
+++ b/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
--- a/SOURCES/0005-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
+++ b/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
--- a/SOURCES/0006-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
+++ b/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
--- a/SOURCES/0007-re-write-.gitignore.patch
+++ b/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 @@
--- a/SOURCES/0008-IBM-client-architecture-CAS-reboot-support.patch
+++ b/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
--- a/SOURCES/0009-for-ppc-reset-console-display-attr-when-clear-screen.patch
+++ b/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,
--- a/SOURCES/0010-Disable-GRUB-video-support-for-IBM-power-machines.patch
+++ b/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
--- a/SOURCES/0011-Honor-a-symlink-when-generating-configuration-by-gru.patch
+++ b/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
--- a/SOURCES/0012-Move-bash-completion-script-922997.patch
+++ b/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)
--- a/SOURCES/0013-Update-to-minilzo-2.08.patch
+++ b/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 @@
--- a/SOURCES/0014-Allow-fallback-to-include-entries-by-title-not-just-.patch
+++ b/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)
--- a/SOURCES/0015-Add-GRUB_DISABLE_UUID.patch
+++ b/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 ()
--- a/SOURCES/0016-Make-exit-take-a-return-code.patch
+++ b/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,
--- a/SOURCES/0017-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
+++ b/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 @@
--- a/SOURCES/0018-Make-efi-machines-load-an-env-block-from-a-variable.patch
+++ b/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 @@
--- a/SOURCES/0019-DHCP-client-ID-and-UUID-options-added.patch
+++ b/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
--- a/SOURCES/0020-trim-arp-packets-with-abnormal-size.patch
+++ b/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,
--- a/SOURCES/0021-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
+++ b/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
--- a/SOURCES/0022-Add-support-for-UEFI-operating-systems-returned-by-o.patch
+++ b/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
--- a/SOURCES/0023-Migrate-PPC-from-Yaboot-to-Grub2.patch
+++ b/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 @@
--- a/SOURCES/0024-Add-fw_path-variable-revised.patch
+++ b/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)),
--- a/SOURCES/0025-Pass-x-hex-hex-straight-through-unmolested.patch
+++ b/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;
--- a/SOURCES/0026-Add-X-option-to-printf-functions.patch
+++ b/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)
--- a/SOURCES/0027-Search-for-specific-config-file-for-netboot.patch
+++ b/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;
--- a/SOURCES/0028-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+++ b/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 @@
--- a/SOURCES/0029-Add-devicetree-loading.patch
+++ b/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
--- a/SOURCES/0030-Don-t-write-messages-to-the-screen.patch
+++ b/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 ()
--- a/SOURCES/0031-Don-t-print-GNU-GRUB-header.patch
+++ b/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)
--- a/SOURCES/0032-Don-t-add-to-highlighted-row.patch
+++ b/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,
--- a/SOURCES/0033-Message-string-cleanups.patch
+++ b/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)
--- a/SOURCES/0034-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
+++ b/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,
--- a/SOURCES/0035-Use-the-correct-indentation-for-the-term-help-text.patch
+++ b/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)
--- a/SOURCES/0036-Indent-menu-entries.patch
+++ b/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,
--- a/SOURCES/0037-Fix-margins.patch
+++ b/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,
--- a/SOURCES/0038-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
+++ b/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,
--- a/SOURCES/0039-Enable-pager-by-default.-985860.patch
+++ b/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_
--- a/SOURCES/0040-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
+++ b/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)
--- a/SOURCES/0041-Don-t-say-GNU-Linux-in-generated-menus.patch
+++ b/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@"
--- a/SOURCES/0042-Don-t-draw-a-border-around-the-menu.patch
+++ b/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,
--- a/SOURCES/0043-Use-the-standard-margin-for-the-timeout-string.patch
+++ b/SOURCES/0043-Use-the-standard-margin-for-the-timeout-string.patch
@ -9,7 +9,7 @@ So that it aligns with the other messages