rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import grub2-2.06-27.el9_0.7

Browse Source
This commit is contained in:
CentOS Sources 2022-06-16 09:18:30 -04:00 committed by Stepan Oksanichenko
parent 3135c808a6
commit e7d645f1d9
278 changed files with 6011 additions and 677 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SOURCES/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch
View File

@ -10,7 +10,7 @@ This reverts commit 722737630889607c3b5761f1f5a48f1674cd2821.
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 5984e92d291..94622481284 100644 index 5984e92d29..9462248128 100644
--- a/util/grub.d/30_os-prober.in --- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in
@@ -36,7 +36,7 @@ if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/n @@ -36,7 +36,7 @@ if ! command -v os-prober > /dev/null || ! command -v linux-boot-prober > /dev/n

4
SOURCES/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch
View File

@ -10,7 +10,7 @@ This reverts commit 54e0a1bbf1e9106901a557195bb35e5e20fb3925.
2 files changed, 5 insertions(+), 8 deletions(-) 2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index f8cbb8d7a2b..d3e879b8e5c 100644 index f8cbb8d7a2..d3e879b8e5 100644
--- a/util/grub-mkconfig.in --- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in
@@ -140,9 +140,6 @@ GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2 @@ -140,9 +140,6 @@ GRUB_DEVICE_PARTUUID="`${grub_probe} --device ${GRUB_DEVICE} --target=partuuid 2
@ -40,7 +40,7 @@ index f8cbb8d7a2b..d3e879b8e5c 100644
GRUB_SAVEDEFAULT \ GRUB_SAVEDEFAULT \
GRUB_ENABLE_CRYPTODISK \ GRUB_ENABLE_CRYPTODISK \
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 94622481284..80685b15f4d 100644 index 9462248128..80685b15f4 100644
--- a/util/grub.d/30_os-prober.in --- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in
@@ -26,8 +26,8 @@ export TEXTDOMAINDIR="@localedir@" @@ -26,8 +26,8 @@ export TEXTDOMAINDIR="@localedir@"

4
SOURCES/0003-Revert-templates-Disable-the-os-prober-by-default.patch
View File

@ -10,7 +10,7 @@ This reverts commit e346414725a70e5c74ee87ca14e580c66f517666.
2 files changed, 9 insertions(+), 14 deletions(-) 2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/docs/grub.texi b/docs/grub.texi diff --git a/docs/grub.texi b/docs/grub.texi
index f8b4b3b21a7..69f08d289f9 100644 index f8b4b3b21a..69f08d289f 100644
--- a/docs/grub.texi --- a/docs/grub.texi
+++ b/docs/grub.texi +++ b/docs/grub.texi
@@ -1519,13 +1519,10 @@ boot sequence. If you have problems, set this option to @samp{text} and @@ -1519,13 +1519,10 @@ boot sequence. If you have problems, set this option to @samp{text} and
@ -46,7 +46,7 @@ index f8b4b3b21a7..69f08d289f9 100644
First create a separate GRUB partition, big enough to hold GRUB. Some of the First create a separate GRUB partition, big enough to hold GRUB. Some of the
following entries show how to load OS installer images from this same partition, following entries show how to load OS installer images from this same partition,
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 80685b15f4d..1b91c102f35 100644 index 80685b15f4..1b91c102f3 100644
--- a/util/grub.d/30_os-prober.in --- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in
@@ -26,8 +26,7 @@ export TEXTDOMAINDIR="@localedir@" @@ -26,8 +26,7 @@ export TEXTDOMAINDIR="@localedir@"

26
SOURCES/0004-Add-support-for-Linux-EFI-stub-loading.patch
View File

@ -44,7 +44,7 @@ moves the check into grub_dl_load_file.
create mode 100644 include/grub/efi/linux.h create mode 100644 include/grub/efi/linux.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 8022e1c0a79..45d3edaa4dc 100644 index 8022e1c0a7..45d3edaa4d 100644
--- a/grub-core/Makefile.core.def --- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def
@@ -1734,13 +1734,6 @@ module = { @@ -1734,13 +1734,6 @@ module = {
@ -88,7 +88,7 @@ index 8022e1c0a79..45d3edaa4dc 100644
module = { module = {
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
index 48f8a79073d..b7149370950 100644 index 48f8a79073..b714937095 100644
--- a/grub-core/kern/dl.c --- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c
@@ -38,6 +38,14 @@ @@ -38,6 +38,14 @@
@ -127,7 +127,7 @@ index 48f8a79073d..b7149370950 100644
file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE); file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE);
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
index 8cff7be0289..35b8f670602 100644 index 8cff7be028..35b8f67060 100644
--- a/grub-core/kern/efi/efi.c --- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c
@@ -286,6 +286,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, @@ -286,6 +286,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@ -166,7 +166,7 @@ index 8cff7be0289..35b8f670602 100644
/* Search the mods section from the PE32/PE32+ image. This code uses /* 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 diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
index 9838fb2f50d..f6aef0ef649 100644 index 9838fb2f50..f6aef0ef64 100644
--- a/grub-core/kern/efi/mm.c --- a/grub-core/kern/efi/mm.c
+++ b/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, @@ -113,6 +113,38 @@ grub_efi_drop_alloc (grub_efi_physical_address_t address,
@ -209,7 +209,7 @@ index 9838fb2f50d..f6aef0ef649 100644
void * void *
grub_efi_allocate_pages_real (grub_efi_physical_address_t address, 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 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
index ef3e9f9444c..a312c668685 100644 index ef3e9f9444..a312c66868 100644
--- a/grub-core/loader/arm64/linux.c --- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
@ -390,7 +390,7 @@ index ef3e9f9444c..a312c668685 100644
linux_args = grub_malloc (cmdline_size); linux_args = grub_malloc (cmdline_size);
if (!linux_args) if (!linux_args)
diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
index 22cc25eccd9..d9b7a9ba400 100644 index 22cc25eccd..d9b7a9ba40 100644
--- a/grub-core/loader/arm64/xen_boot.c --- a/grub-core/loader/arm64/xen_boot.c
+++ b/grub-core/loader/arm64/xen_boot.c +++ b/grub-core/loader/arm64/xen_boot.c
@@ -266,7 +266,6 @@ xen_boot (void) @@ -266,7 +266,6 @@ xen_boot (void)
@ -403,7 +403,7 @@ index 22cc25eccd9..d9b7a9ba400 100644
diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
new file mode 100644 new file mode 100644
index 00000000000..c24202a5dd1 index 0000000000..c24202a5dd
--- /dev/null --- /dev/null
+++ b/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c
@@ -0,0 +1,70 @@ @@ -0,0 +1,70 @@
@ -479,7 +479,7 @@ index 00000000000..c24202a5dd1
+#pragma GCC diagnostic pop +#pragma GCC diagnostic pop
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
new file mode 100644 new file mode 100644
index 00000000000..bb2616a8092 index 0000000000..bb2616a809
--- /dev/null --- /dev/null
+++ b/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c
@@ -0,0 +1,335 @@ @@ -0,0 +1,335 @@
@ -819,7 +819,7 @@ index 00000000000..bb2616a8092
+ grub_unregister_command (cmd_initrdefi); + grub_unregister_command (cmd_initrdefi);
+} +}
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
index 2a299520160..8be4c3b3f48 100644 index 2a29952016..8be4c3b3f4 100644
--- a/grub-core/loader/i386/pc/linux.c --- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c +++ b/grub-core/loader/i386/pc/linux.c
@@ -474,14 +474,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), @@ -474,14 +474,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@ -853,7 +853,7 @@ index 2a299520160..8be4c3b3f48 100644
+ grub_unregister_command (cmd_initrd16); + grub_unregister_command (cmd_initrd16);
} }
diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
index bcd5a7eb186..b582f67f661 100644 index bcd5a7eb18..b582f67f66 100644
--- a/include/grub/arm/linux.h --- a/include/grub/arm/linux.h
+++ b/include/grub/arm/linux.h +++ b/include/grub/arm/linux.h
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
@ -883,7 +883,7 @@ index bcd5a7eb186..b582f67f661 100644
#if defined GRUB_MACHINE_UBOOT #if defined GRUB_MACHINE_UBOOT
diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
index 7e22b4ab699..ea030312df3 100644 index 7e22b4ab69..ea030312df 100644
--- a/include/grub/arm64/linux.h --- a/include/grub/arm64/linux.h
+++ b/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
@ -913,7 +913,7 @@ index 7e22b4ab699..ea030312df3 100644
#endif /* ! GRUB_ARM64_LINUX_HEADER */ #endif /* ! GRUB_ARM64_LINUX_HEADER */
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
index 83d958f9945..6295df85f3f 100644 index 83d958f994..6295df85f3 100644
--- a/include/grub/efi/efi.h --- a/include/grub/efi/efi.h
+++ b/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, @@ -47,6 +47,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
@ -946,7 +946,7 @@ index 83d958f9945..6295df85f3f 100644
grub_addr_t grub_efi_modules_addr (void); grub_addr_t grub_efi_modules_addr (void);
diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
new file mode 100644 new file mode 100644
index 00000000000..d9ede36773b index 0000000000..d9ede36773
--- /dev/null --- /dev/null
+++ b/include/grub/efi/linux.h +++ b/include/grub/efi/linux.h
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@

2
SOURCES/0005-Rework-linux-command.patch
View File

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

2
SOURCES/0006-Rework-linux16-command.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett <mjg59@coreos.com>
1 file changed, 21 insertions(+), 12 deletions(-) 1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
index 8be4c3b3f48..4b1750e360e 100644 index 8be4c3b3f4..4b1750e360 100644
--- a/grub-core/loader/i386/pc/linux.c --- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c +++ b/grub-core/loader/i386/pc/linux.c
@@ -124,13 +124,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), @@ -124,13 +124,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

14
SOURCES/0007-Add-secureboot-support-on-efi-chainloader.patch
View File

@ -175,7 +175,7 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
7 files changed, 840 insertions(+), 90 deletions(-) 7 files changed, 840 insertions(+), 90 deletions(-)
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
index 35b8f670602..4a2259aa1c7 100644 index 35b8f67060..4a2259aa1c 100644
--- a/grub-core/kern/efi/efi.c --- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c
@@ -296,14 +296,20 @@ grub_efi_secure_boot (void) @@ -296,14 +296,20 @@ grub_efi_secure_boot (void)
@ -204,7 +204,7 @@ index 35b8f670602..4a2259aa1c7 100644
if (*secure_boot && !*setup_mode) if (*secure_boot && !*setup_mode)
ret = 1; ret = 1;
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
index a312c668685..04994d5c67d 100644 index a312c66868..04994d5c67 100644
--- a/grub-core/loader/arm64/linux.c --- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c
@@ -284,6 +284,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), @@ -284,6 +284,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@ -226,7 +226,7 @@ index a312c668685..04994d5c67d 100644
grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]); grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
goto fail; goto fail;
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
index 2bd80f4db3d..b54cf6986fc 100644 index 2bd80f4db3..b54cf6986f 100644
--- a/grub-core/loader/efi/chainloader.c --- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c
@@ -32,6 +32,8 @@ @@ -32,6 +32,8 @@
@ -1165,7 +1165,7 @@ index 2bd80f4db3d..b54cf6986fc 100644
return grub_errno; return grub_errno;
diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
index c24202a5dd1..c8ecce6dfd0 100644 index c24202a5dd..c8ecce6dfd 100644
--- a/grub-core/loader/efi/linux.c --- a/grub-core/loader/efi/linux.c
+++ b/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c
@@ -33,21 +33,34 @@ struct grub_efi_shim_lock @@ -33,21 +33,34 @@ struct grub_efi_shim_lock
@ -1210,7 +1210,7 @@ index c24202a5dd1..c8ecce6dfd0 100644
#pragma GCC diagnostic push #pragma GCC diagnostic push
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
index bb2616a8092..6b24cbb9483 100644 index bb2616a809..6b24cbb948 100644
--- a/grub-core/loader/i386/efi/linux.c --- a/grub-core/loader/i386/efi/linux.c
+++ b/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c
@@ -117,6 +117,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), @@ -117,6 +117,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@ -1278,7 +1278,7 @@ index bb2616a8092..6b24cbb9483 100644
grub_file_close (file); grub_file_close (file);
diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
index d9ede36773b..0033d9305a9 100644 index d9ede36773..0033d9305a 100644
--- a/include/grub/efi/linux.h --- a/include/grub/efi/linux.h
+++ b/include/grub/efi/linux.h +++ b/include/grub/efi/linux.h
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
@ -1291,7 +1291,7 @@ index d9ede36773b..0033d9305a9 100644
grub_err_t grub_err_t
EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset, 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 diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
index 0ed8781f037..a43adf27464 100644 index 0ed8781f03..a43adf2746 100644
--- a/include/grub/efi/pe32.h --- a/include/grub/efi/pe32.h
+++ b/include/grub/efi/pe32.h +++ b/include/grub/efi/pe32.h
@@ -223,7 +223,11 @@ struct grub_pe64_optional_header @@ -223,7 +223,11 @@ struct grub_pe64_optional_header

32
SOURCES/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
View File

@ -32,7 +32,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
create mode 100644 include/grub/sparc64/linux.h create mode 100644 include/grub/sparc64/linux.h
diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
index 584baec8f91..7b2999b14b5 100644 index 584baec8f9..7b2999b14b 100644
--- a/grub-core/commands/iorw.c --- a/grub-core/commands/iorw.c
+++ b/grub-core/commands/iorw.c +++ b/grub-core/commands/iorw.c
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
@ -64,7 +64,7 @@ index 584baec8f91..7b2999b14b5 100644
grub_unregister_extcmd (cmd_read_word); grub_unregister_extcmd (cmd_read_word);
grub_unregister_extcmd (cmd_read_dword); grub_unregister_extcmd (cmd_read_dword);
diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c
index d401a6db0ef..39cf3a06dbd 100644 index d401a6db0e..39cf3a06db 100644
--- a/grub-core/commands/memrw.c --- a/grub-core/commands/memrw.c
+++ b/grub-core/commands/memrw.c +++ b/grub-core/commands/memrw.c
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
@ -96,7 +96,7 @@ index d401a6db0ef..39cf3a06dbd 100644
grub_unregister_extcmd (cmd_read_word); grub_unregister_extcmd (cmd_read_word);
grub_unregister_extcmd (cmd_read_dword); grub_unregister_extcmd (cmd_read_dword);
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
index b7149370950..7afb9e6f724 100644 index b714937095..7afb9e6f72 100644
--- a/grub-core/kern/dl.c --- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
@ -117,7 +117,7 @@ index b7149370950..7afb9e6f724 100644
#if 0 #if 0
/* This is an error, but grub2-mkconfig still generates a pile of /* This is an error, but grub2-mkconfig still generates a pile of
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
index 4a2259aa1c7..8cff7be0289 100644 index 4a2259aa1c..8cff7be028 100644
--- a/grub-core/kern/efi/efi.c --- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c
@@ -286,40 +286,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, @@ -286,40 +286,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@ -162,7 +162,7 @@ index 4a2259aa1c7..8cff7be0289 100644
/* Search the mods section from the PE32/PE32+ image. This code uses /* Search the mods section from the PE32/PE32+ image. This code uses
diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
index 74888c463ba..585f2b57385 100644 index 74888c463b..585f2b5738 100644
--- a/grub-core/loader/efi/appleloader.c --- a/grub-core/loader/efi/appleloader.c
+++ b/grub-core/loader/efi/appleloader.c +++ b/grub-core/loader/efi/appleloader.c
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
@ -193,7 +193,7 @@ index 74888c463ba..585f2b57385 100644
grub_unregister_command (cmd); grub_unregister_command (cmd);
} }
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
index b54cf6986fc..3ff305b1d32 100644 index b54cf6986f..3ff305b1d3 100644
--- a/grub-core/loader/efi/chainloader.c --- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
@ -205,7 +205,7 @@ index b54cf6986fc..3ff305b1d32 100644
#include <grub/i18n.h> #include <grub/i18n.h>
#include <grub/net.h> #include <grub/net.h>
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index 5f3290ce17b..54befc26626 100644 index 5f3290ce17..54befc2662 100644
--- a/grub-core/loader/i386/bsd.c --- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c +++ b/grub-core/loader/i386/bsd.c
@@ -40,6 +40,7 @@ @@ -40,6 +40,7 @@
@ -237,7 +237,7 @@ index 5f3290ce17b..54befc26626 100644
grub_unregister_extcmd (cmd_openbsd); grub_unregister_extcmd (cmd_openbsd);
grub_unregister_extcmd (cmd_netbsd); grub_unregister_extcmd (cmd_netbsd);
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index dccf3bb3005..4aeb0e4b9a6 100644 index dccf3bb300..4aeb0e4b9a 100644
--- a/grub-core/loader/i386/linux.c --- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c +++ b/grub-core/loader/i386/linux.c
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
@ -269,7 +269,7 @@ index dccf3bb3005..4aeb0e4b9a6 100644
grub_unregister_command (cmd_initrd); grub_unregister_command (cmd_initrd);
} }
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
index 4b1750e360e..e3fa1221e81 100644 index 4b1750e360..e3fa1221e8 100644
--- a/grub-core/loader/i386/pc/linux.c --- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c +++ b/grub-core/loader/i386/pc/linux.c
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
@ -301,7 +301,7 @@ index 4b1750e360e..e3fa1221e81 100644
grub_unregister_command (cmd_linux16); grub_unregister_command (cmd_linux16);
grub_unregister_command (cmd_initrd); grub_unregister_command (cmd_initrd);
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
index facb13f3d36..47e481f4576 100644 index facb13f3d3..47e481f457 100644
--- a/grub-core/loader/multiboot.c --- a/grub-core/loader/multiboot.c
+++ b/grub-core/loader/multiboot.c +++ b/grub-core/loader/multiboot.c
@@ -50,6 +50,7 @@ @@ -50,6 +50,7 @@
@ -333,7 +333,7 @@ index facb13f3d36..47e481f4576 100644
grub_unregister_command (cmd_module); grub_unregister_command (cmd_module);
} }
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
index 1c0cf6a430a..baa54e652ab 100644 index 1c0cf6a430..baa54e652a 100644
--- a/grub-core/loader/xnu.c --- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c +++ b/grub-core/loader/xnu.c
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
@ -365,7 +365,7 @@ index 1c0cf6a430a..baa54e652ab 100644
grub_unregister_command (cmd_resume); grub_unregister_command (cmd_resume);
#endif #endif
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
index 6295df85f3f..585fa6662b6 100644 index 6295df85f3..585fa6662b 100644
--- a/include/grub/efi/efi.h --- a/include/grub/efi/efi.h
+++ b/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h
@@ -91,7 +91,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var, @@ -91,7 +91,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
@ -378,13 +378,13 @@ index 6295df85f3f..585fa6662b6 100644
const grub_efi_device_path_t *dp2); const grub_efi_device_path_t *dp2);
diff --git a/include/grub/ia64/linux.h b/include/grub/ia64/linux.h diff --git a/include/grub/ia64/linux.h b/include/grub/ia64/linux.h
new file mode 100644 new file mode 100644
index 00000000000..e69de29bb2d index 0000000000..e69de29bb2
diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h
new file mode 100644 new file mode 100644
index 00000000000..e69de29bb2d index 0000000000..e69de29bb2
diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h
new file mode 100644 new file mode 100644
index 00000000000..e69de29bb2d index 0000000000..e69de29bb2
diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h
new file mode 100644 new file mode 100644
index 00000000000..e69de29bb2d index 0000000000..e69de29bb2

6
SOURCES/0009-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
3 files changed, 89 insertions(+), 37 deletions(-) 3 files changed, 89 insertions(+), 37 deletions(-)
diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
index c8ecce6dfd0..0622dfa48d4 100644 index c8ecce6dfd..0622dfa48d 100644
--- a/grub-core/loader/efi/linux.c --- a/grub-core/loader/efi/linux.c
+++ b/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) @@ -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; return GRUB_ERR_BUG;
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
index 6b24cbb9483..3017d0f3e52 100644 index 6b24cbb948..3017d0f3e5 100644
--- a/grub-core/loader/i386/efi/linux.c --- a/grub-core/loader/i386/efi/linux.c
+++ b/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c
@@ -44,14 +44,10 @@ static char *linux_cmdline; @@ -44,14 +44,10 @@ static char *linux_cmdline;
@ -245,7 +245,7 @@ index 6b24cbb9483..3017d0f3e52 100644
if (kernel_mem && !loaded) if (kernel_mem && !loaded)
grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem, 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 diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
index eddf9251d9a..25ef52c04eb 100644 index eddf9251d9..25ef52c04e 100644
--- a/include/grub/i386/linux.h --- a/include/grub/i386/linux.h
+++ b/include/grub/i386/linux.h +++ b/include/grub/i386/linux.h
@@ -138,7 +138,12 @@ struct linux_i386_kernel_header @@ -138,7 +138,12 @@ struct linux_i386_kernel_header

14
SOURCES/0010-re-write-.gitignore.patch
View File

@ -20,7 +20,7 @@ Subject: [PATCH] re-write .gitignore
create mode 100644 util/bash-completion.d/.gitignore create mode 100644 util/bash-completion.d/.gitignore
diff --git a/.gitignore b/.gitignore diff --git a/.gitignore b/.gitignore
index f6a1bd05175..594d0134d33 100644 index f6a1bd0517..594d0134d3 100644
--- a/.gitignore --- a/.gitignore
+++ b/.gitignore +++ b/.gitignore
@@ -275,3 +275,155 @@ widthspec.bin @@ -275,3 +275,155 @@ widthspec.bin
@ -181,7 +181,7 @@ index f6a1bd05175..594d0134d33 100644
+/widthspec.h +/widthspec.h
diff --git a/docs/.gitignore b/docs/.gitignore diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644 new file mode 100644
index 00000000000..e1d849ef95b index 0000000000..e1d849ef95
--- /dev/null --- /dev/null
+++ b/docs/.gitignore +++ b/docs/.gitignore
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
@ -192,7 +192,7 @@ index 00000000000..e1d849ef95b
+/version*.texi +/version*.texi
diff --git a/grub-core/.gitignore b/grub-core/.gitignore diff --git a/grub-core/.gitignore b/grub-core/.gitignore
new file mode 100644 new file mode 100644
index 00000000000..2acce281159 index 0000000000..2acce28115
--- /dev/null --- /dev/null
+++ b/grub-core/.gitignore +++ b/grub-core/.gitignore
@@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
@ -214,14 +214,14 @@ index 00000000000..2acce281159
+/trigtables.c +/trigtables.c
diff --git a/grub-core/lib/.gitignore b/grub-core/lib/.gitignore diff --git a/grub-core/lib/.gitignore b/grub-core/lib/.gitignore
new file mode 100644 new file mode 100644
index 00000000000..68154591404 index 0000000000..6815459140
--- /dev/null --- /dev/null
+++ b/grub-core/lib/.gitignore +++ b/grub-core/lib/.gitignore
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+/libgcrypt-grub/ +/libgcrypt-grub/
diff --git a/include/grub/gcrypt/.gitignore b/include/grub/gcrypt/.gitignore diff --git a/include/grub/gcrypt/.gitignore b/include/grub/gcrypt/.gitignore
new file mode 100644 new file mode 100644
index 00000000000..8fbf5646246 index 0000000000..8fbf564624
--- /dev/null --- /dev/null
+++ b/include/grub/gcrypt/.gitignore +++ b/include/grub/gcrypt/.gitignore
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
@ -229,7 +229,7 @@ index 00000000000..8fbf5646246
+gcrypt.h +gcrypt.h
diff --git a/po/.gitignore b/po/.gitignore diff --git a/po/.gitignore b/po/.gitignore
new file mode 100644 new file mode 100644
index 00000000000..f507e7741e3 index 0000000000..f507e7741e
--- /dev/null --- /dev/null
+++ b/po/.gitignore +++ b/po/.gitignore
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
@ -240,7 +240,7 @@ index 00000000000..f507e7741e3
+/stamp-po +/stamp-po
diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore
new file mode 100644 new file mode 100644
index 00000000000..6813a527ad3 index 0000000000..6813a527ad
--- /dev/null --- /dev/null
+++ b/util/bash-completion.d/.gitignore +++ b/util/bash-completion.d/.gitignore
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@

8
SOURCES/0011-IBM-client-architecture-CAS-reboot-support.patch
View File

@ -25,7 +25,7 @@ parameters
4 files changed, 91 insertions(+) 4 files changed, 91 insertions(+)
diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
index 4d493ab7661..3a6689abb11 100644 index 4d493ab766..3a6689abb1 100644
--- a/grub-core/kern/ieee1275/openfw.c --- a/grub-core/kern/ieee1275/openfw.c
+++ b/grub-core/kern/ieee1275/openfw.c +++ b/grub-core/kern/ieee1275/openfw.c
@@ -591,3 +591,66 @@ grub_ieee1275_get_boot_dev (void) @@ -591,3 +591,66 @@ grub_ieee1275_get_boot_dev (void)
@ -96,7 +96,7 @@ index 4d493ab7661..3a6689abb11 100644
+ return 0; + return 0;
+} +}
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index c4ebe9e22ad..70614de1565 100644 index c4ebe9e22a..70614de156 100644
--- a/grub-core/normal/main.c --- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c +++ b/grub-core/normal/main.c
@@ -34,6 +34,9 @@ @@ -34,6 +34,9 @@
@ -133,7 +133,7 @@ index c4ebe9e22ad..70614de1565 100644
grub_errno = GRUB_ERR_NONE; grub_errno = GRUB_ERR_NONE;
} }
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
index 25158407dd8..ad80399246a 100644 index 25158407dd..ad80399246 100644
--- a/grub-core/script/execute.c --- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c +++ b/grub-core/script/execute.c
@@ -28,6 +28,9 @@ @@ -28,6 +28,9 @@
@ -158,7 +158,7 @@ index 25158407dd8..ad80399246a 100644
{ {
char *line; char *line;
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
index 73e2f464475..0a599607f31 100644 index 73e2f46447..0a599607f3 100644
--- a/include/grub/ieee1275/ieee1275.h --- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h
@@ -254,6 +254,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali @@ -254,6 +254,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali

2
SOURCES/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
index 85ecf06b4df..05c88dcf49e 100644 index 85ecf06b4d..05c88dcf49 100644
--- a/grub-core/term/terminfo.c --- a/grub-core/term/terminfo.c
+++ b/grub-core/term/terminfo.c +++ b/grub-core/term/terminfo.c
@@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term, @@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term,

6
SOURCES/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch
View File

@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=973205
3 files changed, 12 insertions(+), 4 deletions(-) 3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
index 20cbbd761ec..04df9d2c667 100644 index 20cbbd761e..04df9d2c66 100644
--- a/grub-core/kern/ieee1275/cmain.c --- a/grub-core/kern/ieee1275/cmain.c
+++ b/grub-core/kern/ieee1275/cmain.c +++ b/grub-core/kern/ieee1275/cmain.c
@@ -90,7 +90,10 @@ grub_ieee1275_find_options (void) @@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
@ -28,7 +28,7 @@ index 20cbbd761ec..04df9d2c667 100644
/* Old Macs have no key repeat, newer ones have fully working one. /* Old Macs have no key repeat, newer ones have fully working one.
The ones inbetween when repeated key generates an escaoe sequence The ones inbetween when repeated key generates an escaoe sequence
diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c
index 17a3dbbb575..b8e4b3feb32 100644 index 17a3dbbb57..b8e4b3feb3 100644
--- a/grub-core/video/ieee1275.c --- a/grub-core/video/ieee1275.c
+++ b/grub-core/video/ieee1275.c +++ b/grub-core/video/ieee1275.c
@@ -352,9 +352,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter = @@ -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) GRUB_MOD_FINI(ieee1275_fb)
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
index 0a599607f31..b5a1d49bbc3 100644 index 0a599607f3..b5a1d49bbc 100644
--- a/include/grub/ieee1275/ieee1275.h --- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h
@@ -148,6 +148,8 @@ enum grub_ieee1275_flag @@ -148,6 +148,8 @@ enum grub_ieee1275_flag

4
SOURCES/0014-Move-bash-completion-script-922997.patch
View File

@ -10,7 +10,7 @@ Apparently these go in a new place now.
2 files changed, 11 insertions(+), 1 deletion(-) 2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 7517fc49d98..8331f95b645 100644 index 7517fc49d9..8331f95b64 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -314,6 +314,14 @@ AC_SUBST(grubdirname) @@ -314,6 +314,14 @@ AC_SUBST(grubdirname)
@ -39,7 +39,7 @@ index 7517fc49d98..8331f95b645 100644
if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
tmp_ac_tool_prefix="$ac_tool_prefix" tmp_ac_tool_prefix="$ac_tool_prefix"
diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am
index 136287cf1bf..61108f05429 100644 index 136287cf1b..61108f0542 100644
--- a/util/bash-completion.d/Makefile.am --- a/util/bash-completion.d/Makefile.am
+++ b/util/bash-completion.d/Makefile.am +++ b/util/bash-completion.d/Makefile.am
@@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source) @@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source)

2
SOURCES/0015-Allow-fallback-to-include-entries-by-title-not-just-.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 58 insertions(+), 27 deletions(-) 1 file changed, 58 insertions(+), 27 deletions(-)
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
index 8397886fa05..d7a222e681b 100644 index 8397886fa0..d7a222e681 100644
--- a/grub-core/normal/menu.c --- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c
@@ -163,15 +163,40 @@ grub_menu_set_timeout (int timeout) @@ -163,15 +163,40 @@ grub_menu_set_timeout (int timeout)

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

@ -27,7 +27,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
14 files changed, 48 insertions(+), 21 deletions(-) 14 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
index fa498931ed2..2bd3ac76f2d 100644 index fa498931ed..2bd3ac76f2 100644
--- a/grub-core/commands/minicmd.c --- a/grub-core/commands/minicmd.c
+++ b/grub-core/commands/minicmd.c +++ b/grub-core/commands/minicmd.c
@@ -182,12 +182,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)), @@ -182,12 +182,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
@ -60,7 +60,7 @@ index fa498931ed2..2bd3ac76f2d 100644
} }
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
index 8cff7be0289..05d8237a9b2 100644 index 8cff7be028..05d8237a9b 100644
--- a/grub-core/kern/efi/efi.c --- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c
@@ -165,11 +165,16 @@ grub_reboot (void) @@ -165,11 +165,16 @@ grub_reboot (void)
@ -83,7 +83,7 @@ index 8cff7be0289..05d8237a9b2 100644
} }
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 425bb960347..55ea5a11ccd 100644 index 425bb96034..55ea5a11cc 100644
--- a/grub-core/kern/emu/main.c --- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c
@@ -67,7 +67,7 @@ grub_reboot (void) @@ -67,7 +67,7 @@ grub_reboot (void)
@ -96,7 +96,7 @@ index 425bb960347..55ea5a11ccd 100644
grub_reboot (); grub_reboot ();
} }
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
index dfd8a8ec488..0ff13bcaf8c 100644 index dfd8a8ec48..0ff13bcaf8 100644
--- a/grub-core/kern/emu/misc.c --- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c +++ b/grub-core/kern/emu/misc.c
@@ -151,9 +151,10 @@ xasprintf (const char *fmt, ...) @@ -151,9 +151,10 @@ xasprintf (const char *fmt, ...)
@ -113,7 +113,7 @@ index dfd8a8ec488..0ff13bcaf8c 100644
#endif #endif
diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
index 3314f027fec..36f9134b7b7 100644 index 3314f027fe..36f9134b7b 100644
--- a/grub-core/kern/i386/coreboot/init.c --- a/grub-core/kern/i386/coreboot/init.c
+++ b/grub-core/kern/i386/coreboot/init.c +++ b/grub-core/kern/i386/coreboot/init.c
@@ -41,7 +41,7 @@ extern grub_uint8_t _end[]; @@ -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 /* 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(). */ 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 diff --git a/grub-core/kern/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c
index 271b6fbfabd..9fafe98f015 100644 index 271b6fbfab..9fafe98f01 100644
--- a/grub-core/kern/i386/qemu/init.c --- a/grub-core/kern/i386/qemu/init.c
+++ b/grub-core/kern/i386/qemu/init.c +++ b/grub-core/kern/i386/qemu/init.c
@@ -42,7 +42,7 @@ extern grub_uint8_t _end[]; @@ -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 /* 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(). */ 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 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
index d483e35eed2..e71d1584164 100644 index d483e35eed..e71d158416 100644
--- a/grub-core/kern/ieee1275/init.c --- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c
@@ -71,7 +71,7 @@ grub_addr_t grub_ieee1275_original_stack; @@ -71,7 +71,7 @@ grub_addr_t grub_ieee1275_original_stack;
@ -152,7 +152,7 @@ index d483e35eed2..e71d1584164 100644
grub_ieee1275_exit (); grub_ieee1275_exit ();
} }
diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
index 2ed3ff3191e..5c40c34078d 100644 index 2ed3ff3191..5c40c34078 100644
--- a/grub-core/kern/mips/arc/init.c --- a/grub-core/kern/mips/arc/init.c
+++ b/grub-core/kern/mips/arc/init.c +++ b/grub-core/kern/mips/arc/init.c
@@ -276,7 +276,7 @@ grub_halt (void) @@ -276,7 +276,7 @@ grub_halt (void)
@ -165,7 +165,7 @@ index 2ed3ff3191e..5c40c34078d 100644
GRUB_ARC_FIRMWARE_VECTOR->exit (); GRUB_ARC_FIRMWARE_VECTOR->exit ();
diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c
index 7b96531b983..dff598ca7b0 100644 index 7b96531b98..dff598ca7b 100644
--- a/grub-core/kern/mips/loongson/init.c --- a/grub-core/kern/mips/loongson/init.c
+++ b/grub-core/kern/mips/loongson/init.c +++ b/grub-core/kern/mips/loongson/init.c
@@ -304,7 +304,7 @@ grub_halt (void) @@ -304,7 +304,7 @@ grub_halt (void)
@ -178,7 +178,7 @@ index 7b96531b983..dff598ca7b0 100644
grub_halt (); grub_halt ();
} }
diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c 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 be88b77d22..8b6c55ffc0 100644
--- a/grub-core/kern/mips/qemu_mips/init.c --- a/grub-core/kern/mips/qemu_mips/init.c
+++ b/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))) @@ -75,7 +75,7 @@ grub_machine_fini (int flags __attribute__ ((unused)))
@ -191,7 +191,7 @@ index be88b77d22d..8b6c55ffc01 100644
grub_halt (); grub_halt ();
} }
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index 3af336ee227..63b586d09cb 100644 index 3af336ee22..63b586d09c 100644
--- a/grub-core/kern/misc.c --- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c
@@ -1209,9 +1209,18 @@ grub_abort (void) @@ -1209,9 +1209,18 @@ grub_abort (void)
@ -215,7 +215,7 @@ index 3af336ee227..63b586d09cb 100644
grub_fatal (const char *fmt, ...) grub_fatal (const char *fmt, ...)
{ {
diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
index 3e338645c57..be2a5be1d07 100644 index 3e338645c5..be2a5be1d0 100644
--- a/grub-core/kern/uboot/init.c --- a/grub-core/kern/uboot/init.c
+++ b/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; @@ -39,9 +39,9 @@ extern grub_size_t grub_total_module_size;
@ -240,7 +240,7 @@ index 3e338645c57..be2a5be1d07 100644
else if (ver > API_SIG_VERSION) else if (ver > API_SIG_VERSION)
{ {
diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c
index 782ca72952a..708b060f324 100644 index 782ca72952..708b060f32 100644
--- a/grub-core/kern/xen/init.c --- a/grub-core/kern/xen/init.c
+++ b/grub-core/kern/xen/init.c +++ b/grub-core/kern/xen/init.c
@@ -584,7 +584,7 @@ grub_machine_init (void) @@ -584,7 +584,7 @@ grub_machine_init (void)
@ -253,7 +253,7 @@ index 782ca72952a..708b060f324 100644
struct sched_shutdown arg; struct sched_shutdown arg;
diff --git a/include/grub/misc.h b/include/grub/misc.h diff --git a/include/grub/misc.h b/include/grub/misc.h
index 7d2b5519690..fd18e6320b8 100644 index 7d2b551969..fd18e6320b 100644
--- a/include/grub/misc.h --- a/include/grub/misc.h
+++ b/include/grub/misc.h +++ b/include/grub/misc.h
@@ -353,7 +353,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt, @@ -353,7 +353,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,

4
SOURCES/0017-Make-efi-machines-load-an-env-block-from-a-variable.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 36 insertions(+), 1 deletion(-) 2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 45d3edaa4dc..c865a08b027 100644 index 45d3edaa4d..c865a08b02 100644
--- a/grub-core/Makefile.core.def --- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def
@@ -207,6 +207,7 @@ kernel = { @@ -207,6 +207,7 @@ kernel = {
@ -22,7 +22,7 @@ index 45d3edaa4dc..c865a08b027 100644
i386_multiboot = kern/i386/pc/acpi.c; i386_multiboot = kern/i386/pc/acpi.c;
i386_coreboot = kern/acpi.c; i386_coreboot = kern/acpi.c;
diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
index 7facacf09c7..6d39bd3ad29 100644 index 7facacf09c..6d39bd3ad2 100644
--- a/grub-core/kern/efi/init.c --- a/grub-core/kern/efi/init.c
+++ b/grub-core/kern/efi/init.c +++ b/grub-core/kern/efi/init.c
@@ -27,8 +27,11 @@ @@ -27,8 +27,11 @@

4
SOURCES/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch
View File

@ -12,7 +12,7 @@ maximum screen size so that text is not overwritten.
create mode 100644 util/grub.d/20_ppc_terminfo.in create mode 100644 util/grub.d/20_ppc_terminfo.in
diff --git a/Makefile.util.def b/Makefile.util.def diff --git a/Makefile.util.def b/Makefile.util.def
index f8b356cc1fa..2c9b283a230 100644 index f8b356cc1f..2c9b283a23 100644
--- a/Makefile.util.def --- a/Makefile.util.def
+++ b/Makefile.util.def +++ b/Makefile.util.def
@@ -508,6 +508,13 @@ script = { @@ -508,6 +508,13 @@ script = {
@ -31,7 +31,7 @@ index f8b356cc1fa..2c9b283a230 100644
common = util/grub.d/30_os-prober.in; 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 diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in
new file mode 100644 new file mode 100644
index 00000000000..10d66586820 index 0000000000..10d6658682
--- /dev/null --- /dev/null
+++ b/util/grub.d/20_ppc_terminfo.in +++ b/util/grub.d/20_ppc_terminfo.in
@@ -0,0 +1,114 @@ @@ -0,0 +1,114 @@

4
SOURCES/0019-Add-fw_path-variable-revised.patch
View File

@ -14,7 +14,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=857936
2 files changed, 30 insertions(+), 8 deletions(-) 2 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
index 73967e2f5b0..d1de9fa6873 100644 index 73967e2f5b..d1de9fa687 100644
--- a/grub-core/kern/main.c --- a/grub-core/kern/main.c
+++ b/grub-core/kern/main.c +++ b/grub-core/kern/main.c
@@ -128,16 +128,15 @@ grub_set_prefix_and_root (void) @@ -128,16 +128,15 @@ grub_set_prefix_and_root (void)
@ -41,7 +41,7 @@ index 73967e2f5b0..d1de9fa6873 100644
} }
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index 70614de1565..62571e6dfcc 100644 index 70614de156..62571e6dfc 100644
--- a/grub-core/normal/main.c --- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c +++ b/grub-core/normal/main.c
@@ -339,7 +339,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), @@ -339,7 +339,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),

6
SOURCES/0020-Pass-x-hex-hex-straight-through-unmolested.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
3 files changed, 75 insertions(+), 9 deletions(-) 3 files changed, 75 insertions(+), 9 deletions(-)
diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
index cc3290311f0..8f67a4be7f0 100644 index cc3290311f..8f67a4be7f 100644
--- a/grub-core/commands/wildcard.c --- a/grub-core/commands/wildcard.c
+++ b/grub-core/commands/wildcard.c +++ b/grub-core/commands/wildcard.c
@@ -488,6 +488,12 @@ check_file (const char *dir, const char *basename) @@ -488,6 +488,12 @@ check_file (const char *dir, const char *basename)
@ -47,7 +47,7 @@ index cc3290311f0..8f67a4be7f0 100644
*optr++ = iptr[1]; *optr++ = iptr[1];
iptr += 2; iptr += 2;
diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
index ed0b149dca5..8e2294d8ff6 100644 index ed0b149dca..8e2294d8ff 100644
--- a/grub-core/lib/cmdline.c --- a/grub-core/lib/cmdline.c
+++ b/grub-core/lib/cmdline.c +++ b/grub-core/lib/cmdline.c
@@ -20,6 +20,12 @@ @@ -20,6 +20,12 @@
@ -97,7 +97,7 @@ index ed0b149dca5..8e2294d8ff6 100644
*buf++ = *c; *buf++ = *c;
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
index ad80399246a..0c6dd9c5201 100644 index ad80399246..0c6dd9c520 100644
--- a/grub-core/script/execute.c --- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c +++ b/grub-core/script/execute.c
@@ -56,6 +56,12 @@ static struct grub_script_scope *scope = 0; @@ -56,6 +56,12 @@ static struct grub_script_scope *scope = 0;

20
SOURCES/0021-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
View File

@ -28,7 +28,7 @@ Signed-off-by: Will Thompson <wjt@endlessm.com>
create mode 100644 grub-core/commands/loadenv.h create mode 100644 grub-core/commands/loadenv.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index c865a08b027..c15e91943b9 100644 index c865a08b02..c15e91943b 100644
--- a/grub-core/Makefile.core.def --- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def
@@ -814,6 +814,16 @@ module = { @@ -814,6 +814,16 @@ module = {
@ -58,7 +58,7 @@ index c865a08b027..c15e91943b9 100644
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
new file mode 100644 new file mode 100644
index 00000000000..e907a6a5d28 index 0000000000..e907a6a5d2
--- /dev/null --- /dev/null
+++ b/grub-core/commands/blscfg.c +++ b/grub-core/commands/blscfg.c
@@ -0,0 +1,1177 @@ @@ -0,0 +1,1177 @@
@ -1240,7 +1240,7 @@ index 00000000000..e907a6a5d28
+ grub_unregister_extcmd (oldcmd); + grub_unregister_extcmd (oldcmd);
+} +}
diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
index cc5971f4dbd..782761c31aa 100644 index cc5971f4db..782761c31a 100644
--- a/grub-core/commands/legacycfg.c --- a/grub-core/commands/legacycfg.c
+++ b/grub-core/commands/legacycfg.c +++ b/grub-core/commands/legacycfg.c
@@ -143,7 +143,7 @@ legacy_file (const char *filename) @@ -143,7 +143,7 @@ legacy_file (const char *filename)
@ -1263,7 +1263,7 @@ index cc5971f4dbd..782761c31aa 100644
} }
diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
index 3fd664aac33..163b9a09042 100644 index 3fd664aac3..163b9a0904 100644
--- a/grub-core/commands/loadenv.c --- a/grub-core/commands/loadenv.c
+++ b/grub-core/commands/loadenv.c +++ b/grub-core/commands/loadenv.c
@@ -28,6 +28,8 @@ @@ -28,6 +28,8 @@
@ -1358,7 +1358,7 @@ index 3fd664aac33..163b9a09042 100644
grub_cmd_load_env (grub_extcmd_context_t ctxt, int argc, char **args) grub_cmd_load_env (grub_extcmd_context_t ctxt, int argc, char **args)
{ {
diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index 720e6d8ea3b..b194123eb67 100644 index 720e6d8ea3..b194123eb6 100644
--- a/grub-core/commands/menuentry.c --- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c +++ b/grub-core/commands/menuentry.c
@@ -78,7 +78,7 @@ grub_normal_add_menu_entry (int argc, const char **args, @@ -78,7 +78,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
@ -1430,7 +1430,7 @@ index 720e6d8ea3b..b194123eb67 100644
src[len - 1] = ch; src[len - 1] = ch;
args[argc - 1] = src; args[argc - 1] = src;
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index 62571e6dfcc..7ca2e5400b1 100644 index 62571e6dfc..7ca2e5400b 100644
--- a/grub-core/normal/main.c --- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c +++ b/grub-core/normal/main.c
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
@ -1455,7 +1455,7 @@ index 62571e6dfcc..7ca2e5400b1 100644
grub_free ((void *) entry->title); grub_free ((void *) entry->title);
diff --git a/grub-core/commands/loadenv.h b/grub-core/commands/loadenv.h diff --git a/grub-core/commands/loadenv.h b/grub-core/commands/loadenv.h
new file mode 100644 new file mode 100644
index 00000000000..952f46121bd index 0000000000..952f46121b
--- /dev/null --- /dev/null
+++ b/grub-core/commands/loadenv.h +++ b/grub-core/commands/loadenv.h
@@ -0,0 +1,93 @@ @@ -0,0 +1,93 @@
@ -1553,7 +1553,7 @@ index 00000000000..952f46121bd
+ return 0; + return 0;
+} +}
diff --git a/include/grub/compiler.h b/include/grub/compiler.h diff --git a/include/grub/compiler.h b/include/grub/compiler.h
index 8f3be3ae706..ebafec68957 100644 index 8f3be3ae70..ebafec6895 100644
--- a/include/grub/compiler.h --- a/include/grub/compiler.h
+++ b/include/grub/compiler.h +++ b/include/grub/compiler.h
@@ -56,4 +56,6 @@ @@ -56,4 +56,6 @@
@ -1564,7 +1564,7 @@ index 8f3be3ae706..ebafec68957 100644
+ +
#endif /* ! GRUB_COMPILER_HEADER */ #endif /* ! GRUB_COMPILER_HEADER */
diff --git a/include/grub/menu.h b/include/grub/menu.h diff --git a/include/grub/menu.h b/include/grub/menu.h
index ee2b5e91045..0acdc2aa6bf 100644 index ee2b5e9104..0acdc2aa6b 100644
--- a/include/grub/menu.h --- a/include/grub/menu.h
+++ b/include/grub/menu.h +++ b/include/grub/menu.h
@@ -20,6 +20,16 @@ @@ -20,6 +20,16 @@
@ -1595,7 +1595,7 @@ index ee2b5e91045..0acdc2aa6bf 100644
typedef struct grub_menu_entry *grub_menu_entry_t; typedef struct grub_menu_entry *grub_menu_entry_t;
diff --git a/include/grub/normal.h b/include/grub/normal.h diff --git a/include/grub/normal.h b/include/grub/normal.h
index 218cbabccaf..8839ad85a19 100644 index 218cbabcca..8839ad85a1 100644
--- a/include/grub/normal.h --- a/include/grub/normal.h
+++ b/include/grub/normal.h +++ b/include/grub/normal.h
@@ -145,7 +145,7 @@ grub_normal_add_menu_entry (int argc, const char **args, char **classes, @@ -145,7 +145,7 @@ grub_normal_add_menu_entry (int argc, const char **args, char **classes,

4
SOURCES/0022-Add-devicetree-loading.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: David A. Marlin <dmarlin@redhat.com>
2 files changed, 17 insertions(+), 1 deletion(-) 2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index d3e879b8e5c..8ea2315ebc2 100644 index d3e879b8e5..8ea2315ebc 100644
--- a/util/grub-mkconfig.in --- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in
@@ -248,7 +248,8 @@ export GRUB_DEFAULT \ @@ -248,7 +248,8 @@ export GRUB_DEFAULT \
@ -34,7 +34,7 @@ index d3e879b8e5c..8ea2315ebc2 100644
if test "x${grub_cfg}" != "x"; then if test "x${grub_cfg}" != "x"; then
rm -f "${grub_cfg}.new" rm -f "${grub_cfg}.new"
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index e8b01c0d0c7..dc75a1c30bf 100644 index e8b01c0d0c..dc75a1c30b 100644
--- a/util/grub.d/10_linux.in --- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in
@@ -153,6 +153,13 @@ EOF @@ -153,6 +153,13 @@ EOF

10
SOURCES/0023-Don-t-write-messages-to-the-screen.patch
View File

@ -15,7 +15,7 @@ very appealing.
5 files changed, 5 insertions(+), 40 deletions(-) 5 files changed, 5 insertions(+), 40 deletions(-)
diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
index 4d02e62c109..84d520cd494 100644 index 4d02e62c10..84d520cd49 100644
--- a/grub-core/gettext/gettext.c --- a/grub-core/gettext/gettext.c
+++ b/grub-core/gettext/gettext.c +++ b/grub-core/gettext/gettext.c
@@ -434,16 +434,12 @@ static char * @@ -434,16 +434,12 @@ static char *
@ -97,7 +97,7 @@ index 4d02e62c109..84d520cd494 100644
grub_register_variable_hook ("locale_dir", NULL, read_main); grub_register_variable_hook ("locale_dir", NULL, read_main);
grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary); grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary);
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
index d1de9fa6873..48058d983ce 100644 index d1de9fa687..48058d983c 100644
--- a/grub-core/kern/main.c --- a/grub-core/kern/main.c
+++ b/grub-core/kern/main.c +++ b/grub-core/kern/main.c
@@ -269,11 +269,6 @@ grub_main (void) @@ -269,11 +269,6 @@ grub_main (void)
@ -113,7 +113,7 @@ index d1de9fa6873..48058d983ce 100644
grub_verifiers_init (); grub_verifiers_init ();
diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
index 2bd0b2d2866..ea167fe1206 100644 index 2bd0b2d286..ea167fe120 100644
--- a/grub-core/boot/i386/pc/boot.S --- a/grub-core/boot/i386/pc/boot.S
+++ b/grub-core/boot/i386/pc/boot.S +++ b/grub-core/boot/i386/pc/boot.S
@@ -249,9 +249,6 @@ real_start: @@ -249,9 +249,6 @@ real_start:
@ -127,7 +127,7 @@ index 2bd0b2d2866..ea167fe1206 100644
movw $disk_address_packet, %si movw $disk_address_packet, %si
diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
index c1addc0df29..68d31de0c4c 100644 index c1addc0df2..68d31de0c4 100644
--- a/grub-core/boot/i386/pc/diskboot.S --- a/grub-core/boot/i386/pc/diskboot.S
+++ b/grub-core/boot/i386/pc/diskboot.S +++ b/grub-core/boot/i386/pc/diskboot.S
@@ -50,11 +50,6 @@ _start: @@ -50,11 +50,6 @@ _start:
@ -143,7 +143,7 @@ index c1addc0df29..68d31de0c4c 100644
movw $LOCAL(firstlist), %di movw $LOCAL(firstlist), %di
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index dc75a1c30bf..ad2ac4b078d 100644 index dc75a1c30b..ad2ac4b078 100644
--- a/util/grub.d/10_linux.in --- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in
@@ -138,27 +138,20 @@ linux_entry () @@ -138,27 +138,20 @@ linux_entry ()

2
SOURCES/0024-Don-t-print-GNU-GRUB-header.patch
View File

@ -9,7 +9,7 @@ No one cares.
1 file changed, 5 insertions(+), 3 deletions(-) 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index 7ca2e5400b1..5d5f7b539f5 100644 index 7ca2e5400b..5d5f7b539f 100644
--- a/grub-core/normal/main.c --- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c +++ b/grub-core/normal/main.c
@@ -208,15 +208,16 @@ read_config_file (const char *config) @@ -208,15 +208,16 @@ read_config_file (const char *config)

2
SOURCES/0025-Don-t-add-to-highlighted-row.patch
View File

@ -9,7 +9,7 @@ It is already highlighted.
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
index 18240e76cea..65deafda531 100644 index 18240e76ce..65deafda53 100644
--- a/grub-core/normal/menu_text.c --- a/grub-core/normal/menu_text.c
+++ b/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, @@ -242,7 +242,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,

2
SOURCES/0026-Message-string-cleanups.patch
View File

@ -9,7 +9,7 @@ Make use of terminology consistent. Remove jargon.
1 file changed, 9 insertions(+), 12 deletions(-) 1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
index 65deafda531..cc5837ed2b8 100644 index 65deafda53..cc5837ed2b 100644
--- a/grub-core/normal/menu_text.c --- a/grub-core/normal/menu_text.c
+++ b/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) @@ -157,9 +157,8 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)

2
SOURCES/0027-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] Fix border spacing now that we aren't displaying it
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
index cc5837ed2b8..b49835a9af7 100644 index cc5837ed2b..b49835a9af 100644
--- a/grub-core/normal/menu_text.c --- a/grub-core/normal/menu_text.c
+++ b/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, @@ -331,12 +331,12 @@ grub_menu_init_page (int nested, int edit,

2
SOURCES/0028-Use-the-correct-indentation-for-the-term-help-text.patch
View File

@ -9,7 +9,7 @@ That is consistent with the menu help text
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index 5d5f7b539f5..ec1cd257397 100644 index 5d5f7b539f..ec1cd25739 100644
--- a/grub-core/normal/main.c --- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c +++ b/grub-core/normal/main.c
@@ -440,8 +440,8 @@ grub_normal_reader_init (int nested) @@ -440,8 +440,8 @@ grub_normal_reader_init (int nested)

2
SOURCES/0029-Indent-menu-entries.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] Indent menu entries
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
index b49835a9af7..6a57376fa80 100644 index b49835a9af..6a57376fa8 100644
--- a/grub-core/normal/menu_text.c --- a/grub-core/normal/menu_text.c
+++ b/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, @@ -239,7 +239,8 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,

2
SOURCES/0030-Fix-margins.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] Fix margins
1 file changed, 3 insertions(+), 5 deletions(-) 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
index 6a57376fa80..cbd62f714cb 100644 index 6a57376fa8..cbd62f714c 100644
--- a/grub-core/normal/menu_text.c --- a/grub-core/normal/menu_text.c
+++ b/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, @@ -333,17 +333,15 @@ grub_menu_init_page (int nested, int edit,

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

@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
index cbd62f714cb..26e9e82042a 100644 index cbd62f714c..26e9e82042 100644
--- a/grub-core/normal/menu_text.c --- a/grub-core/normal/menu_text.c
+++ b/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, @@ -334,7 +334,7 @@ grub_menu_init_page (int nested, int edit,

2
SOURCES/0032-Enable-pager-by-default.-985860.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 93a90233ead..858b526c925 100644 index 93a90233ea..858b526c92 100644
--- a/util/grub.d/00_header.in --- a/util/grub.d/00_header.in
+++ b/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_ @@ -43,6 +43,8 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_

2
SOURCES/0033-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
index 26e9e82042a..4895ffe7d1d 100644 index 26e9e82042..4895ffe7d1 100644
--- a/grub-core/normal/menu_text.c --- a/grub-core/normal/menu_text.c
+++ b/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) @@ -157,7 +157,7 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)

4
SOURCES/0034-Don-t-say-GNU-Linux-in-generated-menus.patch
View File

@ -9,7 +9,7 @@ Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
2 files changed, 4 insertions(+), 4 deletions(-) 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index ad2ac4b078d..4fc58c83304 100644 index ad2ac4b078..4fc58c8330 100644
--- a/util/grub.d/10_linux.in --- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in
@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@" @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
@ -25,7 +25,7 @@ index ad2ac4b078d..4fc58c83304 100644
fi fi
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index 3b1f4704921..ada20775a14 100644 index 3b1f470492..ada20775a1 100644
--- a/util/grub.d/20_linux_xen.in --- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in
@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@" @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"

2
SOURCES/0035-Don-t-draw-a-border-around-the-menu.patch
View File

@ -9,7 +9,7 @@ It looks cleaner without it.
1 file changed, 43 deletions(-) 1 file changed, 43 deletions(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
index 4895ffe7d1d..e72ed438ba3 100644 index 4895ffe7d1..e72ed438ba 100644
--- a/grub-core/normal/menu_text.c --- a/grub-core/normal/menu_text.c
+++ b/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, @@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,

2
SOURCES/0036-Use-the-standard-margin-for-the-timeout-string.patch
View File

@ -9,7 +9,7 @@ So that it aligns with the other messages
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
index e72ed438ba3..ca135624356 100644 index e72ed438ba..ca13562435 100644
--- a/grub-core/normal/menu_text.c --- a/grub-core/normal/menu_text.c
+++ b/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, @@ -372,7 +372,7 @@ grub_menu_init_page (int nested, int edit,

2
SOURCES/0037-Add-.eh_frame-to-list-of-relocations-stripped.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] Add .eh_frame to list of relocations stripped
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/Makefile.common b/conf/Makefile.common diff --git a/conf/Makefile.common b/conf/Makefile.common
index 2a1a886f6d5..191b1a70c6b 100644 index 2a1a886f6d..191b1a70c6 100644
--- a/conf/Makefile.common --- a/conf/Makefile.common
+++ b/conf/Makefile.common +++ b/conf/Makefile.common
@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding @@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding

2
SOURCES/0038-Don-t-require-a-password-to-boot-entries-generated-b.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 4fc58c83304..635d2fe0cd3 100644 index 4fc58c8330..635d2fe0cd 100644
--- a/util/grub.d/10_linux.in --- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in
@@ -26,7 +26,7 @@ datarootdir="@datarootdir@" @@ -26,7 +26,7 @@ datarootdir="@datarootdir@"

4
SOURCES/0039-Don-t-emit-Booting-.-message.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 3 insertions(+), 4 deletions(-) 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
index d7a222e681b..37d753d8081 100644 index d7a222e681..37d753d808 100644
--- a/grub-core/normal/menu.c --- a/grub-core/normal/menu.c
+++ b/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) @@ -838,12 +838,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@ -34,7 +34,7 @@ index d7a222e681b..37d753d8081 100644
/* Callback invoked when a default menu entry executed because of a timeout /* 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 diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
index 50eef918cf6..de64a367c4e 100644 index 50eef918cf..de64a367c4 100644
--- a/grub-core/normal/menu_entry.c --- a/grub-core/normal/menu_entry.c
+++ b/grub-core/normal/menu_entry.c +++ b/grub-core/normal/menu_entry.c
@@ -1176,9 +1176,6 @@ run (struct screen *screen) @@ -1176,9 +1176,6 @@ run (struct screen *screen)

118
SOURCES/0040-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
View File

@ -122,7 +122,7 @@ Replace a bunch of machine generated ones with ones that look nicer.
create mode 100644 util/grub-sparc64-setup.8 create mode 100644 util/grub-sparc64-setup.8
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 8331f95b645..bec8535af70 100644 index 8331f95b64..bec8535af7 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -77,6 +77,29 @@ grub_TRANSFORM([grub-set-default]) @@ -77,6 +77,29 @@ grub_TRANSFORM([grub-set-default])
@ -156,7 +156,7 @@ index 8331f95b645..bec8535af70 100644
# Optimization flag. Allow user to override. # Optimization flag. Allow user to override.
if test "x$TARGET_CFLAGS" = x; then if test "x$TARGET_CFLAGS" = x; then
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index 8f1485d52a5..b909f2c073a 100644 index 8f1485d52a..b909f2c073 100644
--- a/conf/Makefile.extra-dist --- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist +++ b/conf/Makefile.extra-dist
@@ -11,7 +11,6 @@ EXTRA_DIST += unicode @@ -11,7 +11,6 @@ EXTRA_DIST += unicode
@ -168,7 +168,7 @@ index 8f1485d52a5..b909f2c073a 100644
EXTRA_DIST += docs/grub.cfg EXTRA_DIST += docs/grub.cfg
EXTRA_DIST += docs/osdetect.cfg EXTRA_DIST += docs/osdetect.cfg
diff --git a/docs/Makefile.am b/docs/Makefile.am diff --git a/docs/Makefile.am b/docs/Makefile.am
index 93eb3962765..ab28f199694 100644 index 93eb396276..ab28f19969 100644
--- a/docs/Makefile.am --- a/docs/Makefile.am
+++ b/docs/Makefile.am +++ b/docs/Makefile.am
@@ -5,5 +5,3 @@ info_TEXINFOS = grub.texi grub-dev.texi @@ -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 diff --git a/docs/man/grub-bios-setup.h2m b/docs/man/grub-bios-setup.h2m
deleted file mode 100644 deleted file mode 100644
index ac6ede36296..00000000000 index ac6ede3629..0000000000
--- a/docs/man/grub-bios-setup.h2m --- a/docs/man/grub-bios-setup.h2m
+++ /dev/null +++ /dev/null
@@ -1,6 +0,0 @@ @@ -1,6 +0,0 @@
@ -191,7 +191,7 @@ index ac6ede36296..00000000000
-.BR grub-mkrescue (1) -.BR grub-mkrescue (1)
diff --git a/docs/man/grub-editenv.h2m b/docs/man/grub-editenv.h2m diff --git a/docs/man/grub-editenv.h2m b/docs/man/grub-editenv.h2m
deleted file mode 100644 deleted file mode 100644
index 3859d3d4c4f..00000000000 index 3859d3d4c4..0000000000
--- a/docs/man/grub-editenv.h2m --- a/docs/man/grub-editenv.h2m
+++ /dev/null +++ /dev/null
@@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
@ -202,7 +202,7 @@ index 3859d3d4c4f..00000000000
-.BR grub-set-default (8) -.BR grub-set-default (8)
diff --git a/docs/man/grub-emu.h2m b/docs/man/grub-emu.h2m diff --git a/docs/man/grub-emu.h2m b/docs/man/grub-emu.h2m
deleted file mode 100644 deleted file mode 100644
index ef1c000656a..00000000000 index ef1c000656..0000000000
--- a/docs/man/grub-emu.h2m --- a/docs/man/grub-emu.h2m
+++ /dev/null +++ /dev/null
@@ -1,6 +0,0 @@ @@ -1,6 +0,0 @@
@ -214,7 +214,7 @@ index ef1c000656a..00000000000
-rather than this program. -rather than this program.
diff --git a/docs/man/grub-file.h2m b/docs/man/grub-file.h2m diff --git a/docs/man/grub-file.h2m b/docs/man/grub-file.h2m
deleted file mode 100644 deleted file mode 100644
index e09bb4d3101..00000000000 index e09bb4d310..0000000000
--- a/docs/man/grub-file.h2m --- a/docs/man/grub-file.h2m
+++ /dev/null +++ /dev/null
@@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
@ -222,7 +222,7 @@ index e09bb4d3101..00000000000
-grub-file \- check file type -grub-file \- check file type
diff --git a/docs/man/grub-fstest.h2m b/docs/man/grub-fstest.h2m diff --git a/docs/man/grub-fstest.h2m b/docs/man/grub-fstest.h2m
deleted file mode 100644 deleted file mode 100644
index 9676b159afd..00000000000 index 9676b159af..0000000000
--- a/docs/man/grub-fstest.h2m --- a/docs/man/grub-fstest.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -232,7 +232,7 @@ index 9676b159afd..00000000000
-.BR grub-probe (8) -.BR grub-probe (8)
diff --git a/docs/man/grub-glue-efi.h2m b/docs/man/grub-glue-efi.h2m diff --git a/docs/man/grub-glue-efi.h2m b/docs/man/grub-glue-efi.h2m
deleted file mode 100644 deleted file mode 100644
index c1c6ded49ff..00000000000 index c1c6ded49f..0000000000
--- a/docs/man/grub-glue-efi.h2m --- a/docs/man/grub-glue-efi.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -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. -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 diff --git a/docs/man/grub-install.h2m b/docs/man/grub-install.h2m
deleted file mode 100644 deleted file mode 100644
index 8cbbc87a0f2..00000000000 index 8cbbc87a0f..0000000000
--- a/docs/man/grub-install.h2m --- a/docs/man/grub-install.h2m
+++ /dev/null +++ /dev/null
@@ -1,6 +0,0 @@ @@ -1,6 +0,0 @@
@ -254,7 +254,7 @@ index 8cbbc87a0f2..00000000000
-.BR grub-mkrescue (1) -.BR grub-mkrescue (1)
diff --git a/docs/man/grub-kbdcomp.h2m b/docs/man/grub-kbdcomp.h2m diff --git a/docs/man/grub-kbdcomp.h2m b/docs/man/grub-kbdcomp.h2m
deleted file mode 100644 deleted file mode 100644
index d81f9157e01..00000000000 index d81f9157e0..0000000000
--- a/docs/man/grub-kbdcomp.h2m --- a/docs/man/grub-kbdcomp.h2m
+++ /dev/null +++ /dev/null
@@ -1,10 +0,0 @@ @@ -1,10 +0,0 @@
@ -270,7 +270,7 @@ index d81f9157e01..00000000000
-.BR grub-mklayout (8) -.BR grub-mklayout (8)
diff --git a/docs/man/grub-macbless.h2m b/docs/man/grub-macbless.h2m diff --git a/docs/man/grub-macbless.h2m b/docs/man/grub-macbless.h2m
deleted file mode 100644 deleted file mode 100644
index 0197c0087d7..00000000000 index 0197c0087d..0000000000
--- a/docs/man/grub-macbless.h2m --- a/docs/man/grub-macbless.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -280,7 +280,7 @@ index 0197c0087d7..00000000000
-.BR grub-install (1) -.BR grub-install (1)
diff --git a/docs/man/grub-macho2img.h2m b/docs/man/grub-macho2img.h2m diff --git a/docs/man/grub-macho2img.h2m b/docs/man/grub-macho2img.h2m
deleted file mode 100644 deleted file mode 100644
index d79aaeed8f9..00000000000 index d79aaeed8f..0000000000
--- a/docs/man/grub-macho2img.h2m --- a/docs/man/grub-macho2img.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -290,7 +290,7 @@ index d79aaeed8f9..00000000000
-.BR grub-mkimage (1) -.BR grub-mkimage (1)
diff --git a/docs/man/grub-menulst2cfg.h2m b/docs/man/grub-menulst2cfg.h2m diff --git a/docs/man/grub-menulst2cfg.h2m b/docs/man/grub-menulst2cfg.h2m
deleted file mode 100644 deleted file mode 100644
index c2e0055ed7e..00000000000 index c2e0055ed7..0000000000
--- a/docs/man/grub-menulst2cfg.h2m --- a/docs/man/grub-menulst2cfg.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -300,7 +300,7 @@ index c2e0055ed7e..00000000000
-.BR grub-mkconfig (8) -.BR grub-mkconfig (8)
diff --git a/docs/man/grub-mkconfig.h2m b/docs/man/grub-mkconfig.h2m diff --git a/docs/man/grub-mkconfig.h2m b/docs/man/grub-mkconfig.h2m
deleted file mode 100644 deleted file mode 100644
index 9b42f813010..00000000000 index 9b42f81301..0000000000
--- a/docs/man/grub-mkconfig.h2m --- a/docs/man/grub-mkconfig.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -310,7 +310,7 @@ index 9b42f813010..00000000000
-.BR grub-install (8) -.BR grub-install (8)
diff --git a/docs/man/grub-mkfont.h2m b/docs/man/grub-mkfont.h2m diff --git a/docs/man/grub-mkfont.h2m b/docs/man/grub-mkfont.h2m
deleted file mode 100644 deleted file mode 100644
index d46fe600eca..00000000000 index d46fe600ec..0000000000
--- a/docs/man/grub-mkfont.h2m --- a/docs/man/grub-mkfont.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -320,7 +320,7 @@ index d46fe600eca..00000000000
-.BR grub-mkconfig (8) -.BR grub-mkconfig (8)
diff --git a/docs/man/grub-mkimage.h2m b/docs/man/grub-mkimage.h2m diff --git a/docs/man/grub-mkimage.h2m b/docs/man/grub-mkimage.h2m
deleted file mode 100644 deleted file mode 100644
index f0fbc2bb197..00000000000 index f0fbc2bb19..0000000000
--- a/docs/man/grub-mkimage.h2m --- a/docs/man/grub-mkimage.h2m
+++ /dev/null +++ /dev/null
@@ -1,6 +0,0 @@ @@ -1,6 +0,0 @@
@ -332,7 +332,7 @@ index f0fbc2bb197..00000000000
-.BR grub-mknetdir (8) -.BR grub-mknetdir (8)
diff --git a/docs/man/grub-mklayout.h2m b/docs/man/grub-mklayout.h2m diff --git a/docs/man/grub-mklayout.h2m b/docs/man/grub-mklayout.h2m
deleted file mode 100644 deleted file mode 100644
index 1e43409c0ab..00000000000 index 1e43409c0a..0000000000
--- a/docs/man/grub-mklayout.h2m --- a/docs/man/grub-mklayout.h2m
+++ /dev/null +++ /dev/null
@@ -1,10 +0,0 @@ @@ -1,10 +0,0 @@
@ -348,7 +348,7 @@ index 1e43409c0ab..00000000000
-.BR grub-mkconfig (8) -.BR grub-mkconfig (8)
diff --git a/docs/man/grub-mknetdir.h2m b/docs/man/grub-mknetdir.h2m diff --git a/docs/man/grub-mknetdir.h2m b/docs/man/grub-mknetdir.h2m
deleted file mode 100644 deleted file mode 100644
index a2ef13ec111..00000000000 index a2ef13ec11..0000000000
--- a/docs/man/grub-mknetdir.h2m --- a/docs/man/grub-mknetdir.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -358,7 +358,7 @@ index a2ef13ec111..00000000000
-.BR grub-mkimage (1) -.BR grub-mkimage (1)
diff --git a/docs/man/grub-mkpasswd-pbkdf2.h2m b/docs/man/grub-mkpasswd-pbkdf2.h2m diff --git a/docs/man/grub-mkpasswd-pbkdf2.h2m b/docs/man/grub-mkpasswd-pbkdf2.h2m
deleted file mode 100644 deleted file mode 100644
index 4d202f3da7e..00000000000 index 4d202f3da7..0000000000
--- a/docs/man/grub-mkpasswd-pbkdf2.h2m --- a/docs/man/grub-mkpasswd-pbkdf2.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -368,7 +368,7 @@ index 4d202f3da7e..00000000000
-.BR grub-mkconfig (8) -.BR grub-mkconfig (8)
diff --git a/docs/man/grub-mkrelpath.h2m b/docs/man/grub-mkrelpath.h2m diff --git a/docs/man/grub-mkrelpath.h2m b/docs/man/grub-mkrelpath.h2m
deleted file mode 100644 deleted file mode 100644
index d01f3961e3f..00000000000 index d01f3961e3..0000000000
--- a/docs/man/grub-mkrelpath.h2m --- a/docs/man/grub-mkrelpath.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -378,7 +378,7 @@ index d01f3961e3f..00000000000
-.BR grub-probe (8) -.BR grub-probe (8)
diff --git a/docs/man/grub-mkrescue.h2m b/docs/man/grub-mkrescue.h2m diff --git a/docs/man/grub-mkrescue.h2m b/docs/man/grub-mkrescue.h2m
deleted file mode 100644 deleted file mode 100644
index a427f02e3c6..00000000000 index a427f02e3c..0000000000
--- a/docs/man/grub-mkrescue.h2m --- a/docs/man/grub-mkrescue.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -388,7 +388,7 @@ index a427f02e3c6..00000000000
-.BR grub-mkimage (1) -.BR grub-mkimage (1)
diff --git a/docs/man/grub-mkstandalone.h2m b/docs/man/grub-mkstandalone.h2m diff --git a/docs/man/grub-mkstandalone.h2m b/docs/man/grub-mkstandalone.h2m
deleted file mode 100644 deleted file mode 100644
index c77313978ad..00000000000 index c77313978a..0000000000
--- a/docs/man/grub-mkstandalone.h2m --- a/docs/man/grub-mkstandalone.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -398,7 +398,7 @@ index c77313978ad..00000000000
-.BR grub-mkimage (1) -.BR grub-mkimage (1)
diff --git a/docs/man/grub-mount.h2m b/docs/man/grub-mount.h2m diff --git a/docs/man/grub-mount.h2m b/docs/man/grub-mount.h2m
deleted file mode 100644 deleted file mode 100644
index 8d168982d72..00000000000 index 8d168982d7..0000000000
--- a/docs/man/grub-mount.h2m --- a/docs/man/grub-mount.h2m
+++ /dev/null +++ /dev/null
@@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
@ -406,7 +406,7 @@ index 8d168982d72..00000000000
-grub-mount \- export GRUB filesystem with FUSE -grub-mount \- export GRUB filesystem with FUSE
diff --git a/docs/man/grub-ofpathname.h2m b/docs/man/grub-ofpathname.h2m diff --git a/docs/man/grub-ofpathname.h2m b/docs/man/grub-ofpathname.h2m
deleted file mode 100644 deleted file mode 100644
index 74b43eea039..00000000000 index 74b43eea03..0000000000
--- a/docs/man/grub-ofpathname.h2m --- a/docs/man/grub-ofpathname.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -416,7 +416,7 @@ index 74b43eea039..00000000000
-.BR grub-probe (8) -.BR grub-probe (8)
diff --git a/docs/man/grub-pe2elf.h2m b/docs/man/grub-pe2elf.h2m diff --git a/docs/man/grub-pe2elf.h2m b/docs/man/grub-pe2elf.h2m
deleted file mode 100644 deleted file mode 100644
index 7ca29bd703c..00000000000 index 7ca29bd703..0000000000
--- a/docs/man/grub-pe2elf.h2m --- a/docs/man/grub-pe2elf.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -426,7 +426,7 @@ index 7ca29bd703c..00000000000
-.BR grub-mkimage (1) -.BR grub-mkimage (1)
diff --git a/docs/man/grub-probe.h2m b/docs/man/grub-probe.h2m diff --git a/docs/man/grub-probe.h2m b/docs/man/grub-probe.h2m
deleted file mode 100644 deleted file mode 100644
index 6e1ffdcf937..00000000000 index 6e1ffdcf93..0000000000
--- a/docs/man/grub-probe.h2m --- a/docs/man/grub-probe.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -436,7 +436,7 @@ index 6e1ffdcf937..00000000000
-.BR grub-fstest (1) -.BR grub-fstest (1)
diff --git a/docs/man/grub-reboot.h2m b/docs/man/grub-reboot.h2m diff --git a/docs/man/grub-reboot.h2m b/docs/man/grub-reboot.h2m
deleted file mode 100644 deleted file mode 100644
index e4acace65ce..00000000000 index e4acace65c..0000000000
--- a/docs/man/grub-reboot.h2m --- a/docs/man/grub-reboot.h2m
+++ /dev/null +++ /dev/null
@@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
@ -447,7 +447,7 @@ index e4acace65ce..00000000000
-.BR grub-editenv (1) -.BR grub-editenv (1)
diff --git a/docs/man/grub-render-label.h2m b/docs/man/grub-render-label.h2m diff --git a/docs/man/grub-render-label.h2m b/docs/man/grub-render-label.h2m
deleted file mode 100644 deleted file mode 100644
index 50ae5247c05..00000000000 index 50ae5247c0..0000000000
--- a/docs/man/grub-render-label.h2m --- a/docs/man/grub-render-label.h2m
+++ /dev/null +++ /dev/null
@@ -1,3 +0,0 @@ @@ -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 diff --git a/docs/man/grub-script-check.h2m b/docs/man/grub-script-check.h2m
deleted file mode 100644 deleted file mode 100644
index 3653682671a..00000000000 index 3653682671..0000000000
--- a/docs/man/grub-script-check.h2m --- a/docs/man/grub-script-check.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -466,7 +466,7 @@ index 3653682671a..00000000000
-.BR grub-mkconfig (8) -.BR grub-mkconfig (8)
diff --git a/docs/man/grub-set-default.h2m b/docs/man/grub-set-default.h2m diff --git a/docs/man/grub-set-default.h2m b/docs/man/grub-set-default.h2m
deleted file mode 100644 deleted file mode 100644
index 7945001c154..00000000000 index 7945001c15..0000000000
--- a/docs/man/grub-set-default.h2m --- a/docs/man/grub-set-default.h2m
+++ /dev/null +++ /dev/null
@@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
@ -477,7 +477,7 @@ index 7945001c154..00000000000
-.BR grub-editenv (1) -.BR grub-editenv (1)
diff --git a/docs/man/grub-sparc64-setup.h2m b/docs/man/grub-sparc64-setup.h2m diff --git a/docs/man/grub-sparc64-setup.h2m b/docs/man/grub-sparc64-setup.h2m
deleted file mode 100644 deleted file mode 100644
index 18f803a50db..00000000000 index 18f803a50d..0000000000
--- a/docs/man/grub-sparc64-setup.h2m --- a/docs/man/grub-sparc64-setup.h2m
+++ /dev/null +++ /dev/null
@@ -1,6 +0,0 @@ @@ -1,6 +0,0 @@
@ -489,7 +489,7 @@ index 18f803a50db..00000000000
-.BR grub-mkrescue (1) -.BR grub-mkrescue (1)
diff --git a/docs/man/grub-syslinux2cfg.h2m b/docs/man/grub-syslinux2cfg.h2m diff --git a/docs/man/grub-syslinux2cfg.h2m b/docs/man/grub-syslinux2cfg.h2m
deleted file mode 100644 deleted file mode 100644
index ad25c8ab753..00000000000 index ad25c8ab75..0000000000
--- a/docs/man/grub-syslinux2cfg.h2m --- a/docs/man/grub-syslinux2cfg.h2m
+++ /dev/null +++ /dev/null
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
@ -498,7 +498,7 @@ index ad25c8ab753..00000000000
-[SEE ALSO] -[SEE ALSO]
-.BR grub-menulst2cfg (8) -.BR grub-menulst2cfg (8)
diff --git a/gentpl.py b/gentpl.py diff --git a/gentpl.py b/gentpl.py
index c86550d4f9e..2cba0bbbd6f 100644 index c86550d4f9..2cba0bbbd6 100644
--- a/gentpl.py --- a/gentpl.py
+++ b/gentpl.py +++ b/gentpl.py
@@ -805,10 +805,7 @@ def manpage(defn, adddeps): @@ -805,10 +805,7 @@ def manpage(defn, adddeps):
@ -515,7 +515,7 @@ index c86550d4f9e..2cba0bbbd6f 100644
diff --git a/util/grub-bios-setup.8 b/util/grub-bios-setup.8 diff --git a/util/grub-bios-setup.8 b/util/grub-bios-setup.8
new file mode 100644 new file mode 100644
index 00000000000..56f582b3d75 index 0000000000..56f582b3d7
--- /dev/null --- /dev/null
+++ b/util/grub-bios-setup.8 +++ b/util/grub-bios-setup.8
@@ -0,0 +1,54 @@ @@ -0,0 +1,54 @@
@ -575,7 +575,7 @@ index 00000000000..56f582b3d75
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-editenv.1 b/util/grub-editenv.1 diff --git a/util/grub-editenv.1 b/util/grub-editenv.1
new file mode 100644 new file mode 100644
index 00000000000..d28ba03ba42 index 0000000000..d28ba03ba4
--- /dev/null --- /dev/null
+++ b/util/grub-editenv.1 +++ b/util/grub-editenv.1
@@ -0,0 +1,46 @@ @@ -0,0 +1,46 @@
@ -627,7 +627,7 @@ index 00000000000..d28ba03ba42
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-file.1 b/util/grub-file.1 diff --git a/util/grub-file.1 b/util/grub-file.1
new file mode 100644 new file mode 100644
index 00000000000..b29cb327889 index 0000000000..b29cb32788
--- /dev/null --- /dev/null
+++ b/util/grub-file.1 +++ b/util/grub-file.1
@@ -0,0 +1,165 @@ @@ -0,0 +1,165 @@
@ -798,7 +798,7 @@ index 00000000000..b29cb327889
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-fstest.1 b/util/grub-fstest.1 diff --git a/util/grub-fstest.1 b/util/grub-fstest.1
new file mode 100644 new file mode 100644
index 00000000000..792fa78634c index 0000000000..792fa78634
--- /dev/null --- /dev/null
+++ b/util/grub-fstest.1 +++ b/util/grub-fstest.1
@@ -0,0 +1,99 @@ @@ -0,0 +1,99 @@
@ -903,7 +903,7 @@ index 00000000000..792fa78634c
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-glue-efi.1 b/util/grub-glue-efi.1 diff --git a/util/grub-glue-efi.1 b/util/grub-glue-efi.1
new file mode 100644 new file mode 100644
index 00000000000..72bd555d577 index 0000000000..72bd555d57
--- /dev/null --- /dev/null
+++ b/util/grub-glue-efi.1 +++ b/util/grub-glue-efi.1
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
@ -940,7 +940,7 @@ index 00000000000..72bd555d577
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-install.8 b/util/grub-install.8 diff --git a/util/grub-install.8 b/util/grub-install.8
new file mode 100644 new file mode 100644
index 00000000000..1db89e94b3b index 0000000000..1db89e94b3
--- /dev/null --- /dev/null
+++ b/util/grub-install.8 +++ b/util/grub-install.8
@@ -0,0 +1,128 @@ @@ -0,0 +1,128 @@
@ -1074,7 +1074,7 @@ index 00000000000..1db89e94b3b
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-kbdcomp.1 b/util/grub-kbdcomp.1 diff --git a/util/grub-kbdcomp.1 b/util/grub-kbdcomp.1
new file mode 100644 new file mode 100644
index 00000000000..0bb969a5b43 index 0000000000..0bb969a5b4
--- /dev/null --- /dev/null
+++ b/util/grub-kbdcomp.1 +++ b/util/grub-kbdcomp.1
@@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
@ -1099,7 +1099,7 @@ index 00000000000..0bb969a5b43
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-macbless.1 b/util/grub-macbless.1 diff --git a/util/grub-macbless.1 b/util/grub-macbless.1
new file mode 100644 new file mode 100644
index 00000000000..41a96186f70 index 0000000000..41a96186f7
--- /dev/null --- /dev/null
+++ b/util/grub-macbless.1 +++ b/util/grub-macbless.1
@@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
@ -1127,7 +1127,7 @@ index 00000000000..41a96186f70
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-menulst2cfg.1 b/util/grub-menulst2cfg.1 diff --git a/util/grub-menulst2cfg.1 b/util/grub-menulst2cfg.1
new file mode 100644 new file mode 100644
index 00000000000..91e2ef87113 index 0000000000..91e2ef8711
--- /dev/null --- /dev/null
+++ b/util/grub-menulst2cfg.1 +++ b/util/grub-menulst2cfg.1
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
@ -1145,7 +1145,7 @@ index 00000000000..91e2ef87113
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8 diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8
new file mode 100644 new file mode 100644
index 00000000000..a2d1f577b9b index 0000000000..a2d1f577b9
--- /dev/null --- /dev/null
+++ b/util/grub-mkconfig.8 +++ b/util/grub-mkconfig.8
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
@ -1168,7 +1168,7 @@ index 00000000000..a2d1f577b9b
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-mkfont.1 b/util/grub-mkfont.1 diff --git a/util/grub-mkfont.1 b/util/grub-mkfont.1
new file mode 100644 new file mode 100644
index 00000000000..3494857987d index 0000000000..3494857987
--- /dev/null --- /dev/null
+++ b/util/grub-mkfont.1 +++ b/util/grub-mkfont.1
@@ -0,0 +1,87 @@ @@ -0,0 +1,87 @@
@ -1261,7 +1261,7 @@ index 00000000000..3494857987d
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1 diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
new file mode 100644 new file mode 100644
index 00000000000..4dea4f54597 index 0000000000..4dea4f5459
--- /dev/null --- /dev/null
+++ b/util/grub-mkimage.1 +++ b/util/grub-mkimage.1
@@ -0,0 +1,95 @@ @@ -0,0 +1,95 @@
@ -1362,7 +1362,7 @@ index 00000000000..4dea4f54597
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-mklayout.1 b/util/grub-mklayout.1 diff --git a/util/grub-mklayout.1 b/util/grub-mklayout.1
new file mode 100644 new file mode 100644
index 00000000000..d1bbc2ec515 index 0000000000..d1bbc2ec51
--- /dev/null --- /dev/null
+++ b/util/grub-mklayout.1 +++ b/util/grub-mklayout.1
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -1395,7 +1395,7 @@ index 00000000000..d1bbc2ec515
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-mknetdir.1 b/util/grub-mknetdir.1 diff --git a/util/grub-mknetdir.1 b/util/grub-mknetdir.1
new file mode 100644 new file mode 100644
index 00000000000..fa7e8d4ef0d index 0000000000..fa7e8d4ef0
--- /dev/null --- /dev/null
+++ b/util/grub-mknetdir.1 +++ b/util/grub-mknetdir.1
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
@ -1413,7 +1413,7 @@ index 00000000000..fa7e8d4ef0d
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-mkpasswd-pbkdf2.1 b/util/grub-mkpasswd-pbkdf2.1 diff --git a/util/grub-mkpasswd-pbkdf2.1 b/util/grub-mkpasswd-pbkdf2.1
new file mode 100644 new file mode 100644
index 00000000000..73c437c15d8 index 0000000000..73c437c15d
--- /dev/null --- /dev/null
+++ b/util/grub-mkpasswd-pbkdf2.1 +++ b/util/grub-mkpasswd-pbkdf2.1
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -1446,7 +1446,7 @@ index 00000000000..73c437c15d8
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-mkrelpath.1 b/util/grub-mkrelpath.1 diff --git a/util/grub-mkrelpath.1 b/util/grub-mkrelpath.1
new file mode 100644 new file mode 100644
index 00000000000..85f1113621d index 0000000000..85f1113621
--- /dev/null --- /dev/null
+++ b/util/grub-mkrelpath.1 +++ b/util/grub-mkrelpath.1
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
@ -1464,7 +1464,7 @@ index 00000000000..85f1113621d
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-mkrescue.1 b/util/grub-mkrescue.1 diff --git a/util/grub-mkrescue.1 b/util/grub-mkrescue.1
new file mode 100644 new file mode 100644
index 00000000000..4ed9fc723fd index 0000000000..4ed9fc723f
--- /dev/null --- /dev/null
+++ b/util/grub-mkrescue.1 +++ b/util/grub-mkrescue.1
@@ -0,0 +1,123 @@ @@ -0,0 +1,123 @@
@ -1593,7 +1593,7 @@ index 00000000000..4ed9fc723fd
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-mkstandalone.1 b/util/grub-mkstandalone.1 diff --git a/util/grub-mkstandalone.1 b/util/grub-mkstandalone.1
new file mode 100644 new file mode 100644
index 00000000000..ba2d2bdf279 index 0000000000..ba2d2bdf27
--- /dev/null --- /dev/null
+++ b/util/grub-mkstandalone.1 +++ b/util/grub-mkstandalone.1
@@ -0,0 +1,100 @@ @@ -0,0 +1,100 @@
@ -1699,7 +1699,7 @@ index 00000000000..ba2d2bdf279
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-ofpathname.8 b/util/grub-ofpathname.8 diff --git a/util/grub-ofpathname.8 b/util/grub-ofpathname.8
new file mode 100644 new file mode 100644
index 00000000000..bf3743aeba1 index 0000000000..bf3743aeba
--- /dev/null --- /dev/null
+++ b/util/grub-ofpathname.8 +++ b/util/grub-ofpathname.8
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
@ -1717,7 +1717,7 @@ index 00000000000..bf3743aeba1
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-probe.8 b/util/grub-probe.8 diff --git a/util/grub-probe.8 b/util/grub-probe.8
new file mode 100644 new file mode 100644
index 00000000000..04e26c832bb index 0000000000..04e26c832b
--- /dev/null --- /dev/null
+++ b/util/grub-probe.8 +++ b/util/grub-probe.8
@@ -0,0 +1,80 @@ @@ -0,0 +1,80 @@
@ -1803,7 +1803,7 @@ index 00000000000..04e26c832bb
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-reboot.8 b/util/grub-reboot.8 diff --git a/util/grub-reboot.8 b/util/grub-reboot.8
new file mode 100644 new file mode 100644
index 00000000000..faa5e4eece2 index 0000000000..faa5e4eece
--- /dev/null --- /dev/null
+++ b/util/grub-reboot.8 +++ b/util/grub-reboot.8
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
@ -1830,7 +1830,7 @@ index 00000000000..faa5e4eece2
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-render-label.1 b/util/grub-render-label.1 diff --git a/util/grub-render-label.1 b/util/grub-render-label.1
new file mode 100644 new file mode 100644
index 00000000000..4d51c8abf01 index 0000000000..4d51c8abf0
--- /dev/null --- /dev/null
+++ b/util/grub-render-label.1 +++ b/util/grub-render-label.1
@@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
@ -1887,7 +1887,7 @@ index 00000000000..4d51c8abf01
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-script-check.1 b/util/grub-script-check.1 diff --git a/util/grub-script-check.1 b/util/grub-script-check.1
new file mode 100644 new file mode 100644
index 00000000000..0f1f625b05d index 0000000000..0f1f625b05
--- /dev/null --- /dev/null
+++ b/util/grub-script-check.1 +++ b/util/grub-script-check.1
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
@ -1914,7 +1914,7 @@ index 00000000000..0f1f625b05d
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-set-default.8 b/util/grub-set-default.8 diff --git a/util/grub-set-default.8 b/util/grub-set-default.8
new file mode 100644 new file mode 100644
index 00000000000..a96265a1509 index 0000000000..a96265a150
--- /dev/null --- /dev/null
+++ b/util/grub-set-default.8 +++ b/util/grub-set-default.8
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
@ -1941,7 +1941,7 @@ index 00000000000..a96265a1509
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-sparc64-setup.8 b/util/grub-sparc64-setup.8 diff --git a/util/grub-sparc64-setup.8 b/util/grub-sparc64-setup.8
new file mode 100644 new file mode 100644
index 00000000000..37ea2dd5eaa index 0000000000..37ea2dd5ea
--- /dev/null --- /dev/null
+++ b/util/grub-sparc64-setup.8 +++ b/util/grub-sparc64-setup.8
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@

2
SOURCES/0041-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
1 file changed, 3 insertions(+), 2 deletions(-) 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index ec1cd257397..d85f7598d23 100644 index ec1cd25739..d85f7598d2 100644
--- a/grub-core/normal/main.c --- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c +++ b/grub-core/normal/main.c
@@ -349,7 +349,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), @@ -349,7 +349,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),

2
SOURCES/0042-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 51 insertions(+), 46 deletions(-) 1 file changed, 51 insertions(+), 46 deletions(-)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index d85f7598d23..1e509fceb91 100644 index d85f7598d2..1e509fceb9 100644
--- a/grub-core/normal/main.c --- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c +++ b/grub-core/normal/main.c
@@ -347,61 +347,66 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), @@ -347,61 +347,66 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),

2
SOURCES/0043-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 635d2fe0cd3..fed73271478 100644 index 635d2fe0cd..fed7327147 100644
--- a/util/grub.d/10_linux.in --- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in
@@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@" @@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@"

2
SOURCES/0044-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 8 insertions(+) 1 file changed, 8 insertions(+)
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 301d1ac229a..0f6505bf3b6 100644 index 301d1ac229..0f6505bf3b 100644
--- a/util/grub-mkconfig_lib.in --- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in
@@ -253,6 +253,14 @@ version_test_gt () @@ -253,6 +253,14 @@ version_test_gt ()

6
SOURCES/0045-Try-prefix-if-fw_path-doesn-t-work.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
3 files changed, 82 insertions(+), 82 deletions(-) 3 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
index e71d1584164..0cd2a627231 100644 index e71d158416..0cd2a62723 100644
--- a/grub-core/kern/ieee1275/init.c --- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c
@@ -127,23 +127,25 @@ grub_machine_get_bootlocation (char **device, char **path) @@ -127,23 +127,25 @@ grub_machine_get_bootlocation (char **device, char **path)
@ -56,7 +56,7 @@ index e71d1584164..0cd2a627231 100644
} }
diff --git a/grub-core/net/net.c b/grub-core/net/net.c diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index 4d3eb5c1a52..0ef148f4adc 100644 index 4d3eb5c1a5..0ef148f4ad 100644
--- a/grub-core/net/net.c --- a/grub-core/net/net.c
+++ b/grub-core/net/net.c +++ b/grub-core/net/net.c
@@ -1869,7 +1869,7 @@ grub_net_search_config_file (char *config) @@ -1869,7 +1869,7 @@ grub_net_search_config_file (char *config)
@ -69,7 +69,7 @@ index 4d3eb5c1a52..0ef148f4adc 100644
static struct grub_preboot *fini_hnd; static struct grub_preboot *fini_hnd;
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index 1e509fceb91..d5968797f4f 100644 index 1e509fceb9..d5968797f4 100644
--- a/grub-core/normal/main.c --- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c +++ b/grub-core/normal/main.c
@@ -337,81 +337,79 @@ grub_enter_normal_mode (const char *config) @@ -337,81 +337,79 @@ grub_enter_normal_mode (const char *config)

10
SOURCES/0046-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
View File

@ -26,7 +26,7 @@ Signed-off-by: Thierry Vignaud <thierry.vignaud@gmail.com>
create mode 100644 util/grub-rpm-sort.8 create mode 100644 util/grub-rpm-sort.8
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index bec8535af70..fdcb452581c 100644 index bec8535af7..fdcb452581 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath]) @@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
@ -89,7 +89,7 @@ index bec8535af70..fdcb452581c 100644
if test x$host_kernel = xkfreebsd; then if test x$host_kernel = xkfreebsd; then
AC_CHECK_LIB([geom], [geom_gettree], [], AC_CHECK_LIB([geom], [geom_gettree], [],
diff --git a/Makefile.util.def b/Makefile.util.def diff --git a/Makefile.util.def b/Makefile.util.def
index 2c9b283a230..ba4cf4b29b0 100644 index 2c9b283a23..ba4cf4b29b 100644
--- a/Makefile.util.def --- a/Makefile.util.def
+++ b/Makefile.util.def +++ b/Makefile.util.def
@@ -703,6 +703,22 @@ program = { @@ -703,6 +703,22 @@ program = {
@ -117,7 +117,7 @@ index 2c9b283a230..ba4cf4b29b0 100644
common = util/grub-mkconfig.in; common = util/grub-mkconfig.in;
diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
new file mode 100644 new file mode 100644
index 00000000000..f33bd1ed568 index 0000000000..f33bd1ed56
--- /dev/null --- /dev/null
+++ b/util/grub-rpm-sort.c +++ b/util/grub-rpm-sort.c
@@ -0,0 +1,281 @@ @@ -0,0 +1,281 @@
@ -403,7 +403,7 @@ index 00000000000..f33bd1ed568
+ return 0; + return 0;
+} +}
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 0f6505bf3b6..42c2ea9ba50 100644 index 0f6505bf3b..42c2ea9ba5 100644
--- a/util/grub-mkconfig_lib.in --- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in
@@ -33,6 +33,9 @@ fi @@ -33,6 +33,9 @@ fi
@ -440,7 +440,7 @@ index 0f6505bf3b6..42c2ea9ba50 100644
return 1 return 1
diff --git a/util/grub-rpm-sort.8 b/util/grub-rpm-sort.8 diff --git a/util/grub-rpm-sort.8 b/util/grub-rpm-sort.8
new file mode 100644 new file mode 100644
index 00000000000..8ce21488448 index 0000000000..8ce2148844
--- /dev/null --- /dev/null
+++ b/util/grub-rpm-sort.8 +++ b/util/grub-rpm-sort.8
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@

2
SOURCES/0047-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 27 insertions(+), 7 deletions(-) 1 file changed, 27 insertions(+), 7 deletions(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index fed73271478..2e59f3b4197 100644 index fed7327147..2e59f3b419 100644
--- a/util/grub.d/10_linux.in --- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in
@@ -78,6 +78,32 @@ case x"$GRUB_FS" in @@ -78,6 +78,32 @@ case x"$GRUB_FS" in

12
SOURCES/0048-Add-friendly-grub2-password-config-tool-985962.patch
View File

@ -27,7 +27,7 @@ Andy Lutomirski <luto@kernel.org>
create mode 100644 util/grub.d/01_users.in create mode 100644 util/grub.d/01_users.in
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index fdcb452581c..30fd84d8067 100644 index fdcb452581..30fd84d806 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath]) @@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
@ -39,7 +39,7 @@ index fdcb452581c..30fd84d8067 100644
grub_TRANSFORM([grub-script-check]) grub_TRANSFORM([grub-script-check])
grub_TRANSFORM([grub-set-default]) grub_TRANSFORM([grub-set-default])
diff --git a/Makefile.util.def b/Makefile.util.def diff --git a/Makefile.util.def b/Makefile.util.def
index ba4cf4b29b0..1a7dd433e33 100644 index ba4cf4b29b..1a7dd433e3 100644
--- a/Makefile.util.def --- a/Makefile.util.def
+++ b/Makefile.util.def +++ b/Makefile.util.def
@@ -452,6 +452,12 @@ script = { @@ -452,6 +452,12 @@ script = {
@ -70,7 +70,7 @@ index ba4cf4b29b0..1a7dd433e33 100644
name = grub-mkconfig_lib; name = grub-mkconfig_lib;
common = util/grub-mkconfig_lib.in; common = util/grub-mkconfig_lib.in;
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 8ea2315ebc2..ba14cf6261c 100644 index 8ea2315ebc..ba14cf6261 100644
--- a/util/grub-mkconfig.in --- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in
@@ -276,6 +276,8 @@ for i in "${grub_mkconfig_dir}"/* ; do @@ -276,6 +276,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
@ -84,7 +84,7 @@ index 8ea2315ebc2..ba14cf6261c 100644
echo echo
diff --git a/util/grub-set-password.8 b/util/grub-set-password.8 diff --git a/util/grub-set-password.8 b/util/grub-set-password.8
new file mode 100644 new file mode 100644
index 00000000000..9646546e43d index 0000000000..9646546e43
--- /dev/null --- /dev/null
+++ b/util/grub-set-password.8 +++ b/util/grub-set-password.8
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
@ -118,7 +118,7 @@ index 00000000000..9646546e43d
+.BR "info grub2-mkpasswd-pbkdf2" +.BR "info grub2-mkpasswd-pbkdf2"
diff --git a/util/grub-set-password.in b/util/grub-set-password.in diff --git a/util/grub-set-password.in b/util/grub-set-password.in
new file mode 100644 new file mode 100644
index 00000000000..5ebf50576d6 index 0000000000..5ebf50576d
--- /dev/null --- /dev/null
+++ b/util/grub-set-password.in +++ b/util/grub-set-password.in
@@ -0,0 +1,128 @@ @@ -0,0 +1,128 @@
@ -252,7 +252,7 @@ index 00000000000..5ebf50576d6
+fi +fi
diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in
new file mode 100644 new file mode 100644
index 00000000000..db2f44bfb78 index 0000000000..db2f44bfb7
--- /dev/null --- /dev/null
+++ b/util/grub.d/01_users.in +++ b/util/grub.d/01_users.in
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@

2
SOURCES/0049-tcp-add-window-scaling-support.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Josef Bacik <jbacik@fb.com>
1 file changed, 29 insertions(+), 13 deletions(-) 1 file changed, 29 insertions(+), 13 deletions(-)
diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c
index e8ad34b84d4..7d4b822626d 100644 index e8ad34b84d..7d4b822626 100644
--- a/grub-core/net/tcp.c --- a/grub-core/net/tcp.c
+++ b/grub-core/net/tcp.c +++ b/grub-core/net/tcp.c
@@ -106,6 +106,18 @@ struct tcphdr @@ -106,6 +106,18 @@ struct tcphdr

12
SOURCES/0050-efinet-and-bootp-add-support-for-dhcpv6.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
6 files changed, 477 insertions(+), 14 deletions(-) 6 files changed, 477 insertions(+), 14 deletions(-)
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
index 6fb5627025d..e28fb6a09f9 100644 index 6fb5627025..e28fb6a09f 100644
--- a/grub-core/net/bootp.c --- a/grub-core/net/bootp.c
+++ b/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c
@@ -902,6 +902,179 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)), @@ -902,6 +902,179 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
@ -198,7 +198,7 @@ index 6fb5627025d..e28fb6a09f9 100644
grub_bootp_init (void) grub_bootp_init (void)
{ {
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
index 5388f952ba9..173fb63153c 100644 index 5388f952ba..173fb63153 100644
--- a/grub-core/net/drivers/efi/efinet.c --- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c
@@ -18,11 +18,14 @@ @@ -18,11 +18,14 @@
@ -307,7 +307,7 @@ index 5388f952ba9..173fb63153c 100644
} }
} }
diff --git a/grub-core/net/net.c b/grub-core/net/net.c diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index 0ef148f4adc..22f2689aaeb 100644 index 0ef148f4ad..22f2689aae 100644
--- a/grub-core/net/net.c --- a/grub-core/net/net.c
+++ b/grub-core/net/net.c +++ b/grub-core/net/net.c
@@ -960,6 +960,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa @@ -960,6 +960,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
@ -390,7 +390,7 @@ index 0ef148f4adc..22f2689aaeb 100644
grub_err_t grub_err_t
grub_net_add_ipv4_local (struct grub_net_network_level_interface *inter, 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 diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
index 7f44b30f521..4ab2f5c7357 100644 index 7f44b30f52..4ab2f5c735 100644
--- a/grub-core/net/tftp.c --- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c +++ b/grub-core/net/tftp.c
@@ -358,18 +358,22 @@ tftp_open (struct grub_file *file, const char *filename) @@ -358,18 +358,22 @@ tftp_open (struct grub_file *file, const char *filename)
@ -417,7 +417,7 @@ index 7f44b30f521..4ab2f5c7357 100644
return grub_errno; return grub_errno;
} }
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index f1a52210c0c..117469450d3 100644 index f1a52210c0..117469450d 100644
--- a/include/grub/efi/api.h --- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h +++ b/include/grub/efi/api.h
@@ -592,10 +592,16 @@ typedef void *grub_efi_handle_t; @@ -592,10 +592,16 @@ typedef void *grub_efi_handle_t;
@ -572,7 +572,7 @@ index f1a52210c0c..117469450d3 100644
typedef struct grub_efi_pxe typedef struct grub_efi_pxe
diff --git a/include/grub/net.h b/include/grub/net.h diff --git a/include/grub/net.h b/include/grub/net.h
index 7ae4b6bd805..8a05ec4fe7a 100644 index 7ae4b6bd80..8a05ec4fe7 100644
--- a/include/grub/net.h --- a/include/grub/net.h
+++ b/include/grub/net.h +++ b/include/grub/net.h
@@ -447,6 +447,51 @@ struct grub_net_bootp_packet @@ -447,6 +447,51 @@ struct grub_net_bootp_packet

14
SOURCES/0051-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
View File

@ -23,7 +23,7 @@ Resolves: rhbz#1226325
create mode 100644 util/grub-get-kernel-settings.in create mode 100644 util/grub-get-kernel-settings.in
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 30fd84d8067..ed31ea457d2 100644 index 30fd84d806..ed31ea457d 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -65,6 +65,7 @@ grub_TRANSFORM([grub-install]) @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-install])
@ -43,7 +43,7 @@ index 30fd84d8067..ed31ea457d2 100644
grub_TRANSFORM([grub-install.1]) grub_TRANSFORM([grub-install.1])
grub_TRANSFORM([grub-kbdcomp.3]) grub_TRANSFORM([grub-kbdcomp.3])
diff --git a/Makefile.util.def b/Makefile.util.def diff --git a/Makefile.util.def b/Makefile.util.def
index 1a7dd433e33..cdd2f51fe4b 100644 index 1a7dd433e3..cdd2f51fe4 100644
--- a/Makefile.util.def --- a/Makefile.util.def
+++ b/Makefile.util.def +++ b/Makefile.util.def
@@ -732,6 +732,13 @@ script = { @@ -732,6 +732,13 @@ script = {
@ -61,7 +61,7 @@ index 1a7dd433e33..cdd2f51fe4b 100644
name = grub-set-default; name = grub-set-default;
common = util/grub-set-default.in; common = util/grub-set-default.in;
diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in 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 44bf135b9f..5c4acd496d 100644
--- a/util/bash-completion.d/grub-completion.bash.in --- a/util/bash-completion.d/grub-completion.bash.in
+++ b/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} && \ @@ -264,6 +264,28 @@ have ${__grub_sparc64_setup_program} && \
@ -95,7 +95,7 @@ index 44bf135b9f8..5c4acd496d4 100644
# #
diff --git a/util/grub-get-kernel-settings.3 b/util/grub-get-kernel-settings.3 diff --git a/util/grub-get-kernel-settings.3 b/util/grub-get-kernel-settings.3
new file mode 100644 new file mode 100644
index 00000000000..ba33330e28d index 0000000000..ba33330e28
--- /dev/null --- /dev/null
+++ b/util/grub-get-kernel-settings.3 +++ b/util/grub-get-kernel-settings.3
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
@ -121,7 +121,7 @@ index 00000000000..ba33330e28d
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in
new file mode 100644 new file mode 100644
index 00000000000..7e87dfccc0e index 0000000000..7e87dfccc0
--- /dev/null --- /dev/null
+++ b/util/grub-get-kernel-settings.in +++ b/util/grub-get-kernel-settings.in
@@ -0,0 +1,88 @@ @@ -0,0 +1,88 @@
@ -214,7 +214,7 @@ index 00000000000..7e87dfccc0e
+ echo export GRUB_UPDATE_DEFAULT_KERNEL + echo export GRUB_UPDATE_DEFAULT_KERNEL
+fi +fi
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index ba14cf6261c..005f093809b 100644 index ba14cf6261..005f093809 100644
--- a/util/grub-mkconfig.in --- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in
@@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@" @@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@"
@ -235,7 +235,7 @@ index ba14cf6261c..005f093809b 100644
if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then
GRUB_DISABLE_LINUX_UUID="true" GRUB_DISABLE_LINUX_UUID="true"
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 2e59f3b4197..0f3c19e30cc 100644 index 2e59f3b419..0f3c19e30c 100644
--- a/util/grub.d/10_linux.in --- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in
@@ -111,7 +111,8 @@ linux_entry () @@ -111,7 +111,8 @@ linux_entry ()

2
SOURCES/0052-bz1374141-fix-incorrect-mask-for-ppc64.patch
View File

@ -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(-) 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 diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
index ac4e62a95c9..3860b6f78d8 100644 index ac4e62a95c..3860b6f78d 100644
--- a/grub-core/net/drivers/ieee1275/ofnet.c --- a/grub-core/net/drivers/ieee1275/ofnet.c
+++ b/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, @@ -220,8 +220,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,

10
SOURCES/0053-Make-grub_fatal-also-backtrace.patch
View File

@ -13,7 +13,7 @@ Subject: [PATCH] Make grub_fatal() also backtrace.
create mode 100644 grub-core/lib/arm64/backtrace.c create mode 100644 grub-core/lib/arm64/backtrace.c
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index c15e91943b9..058c88ac3af 100644 index c15e91943b..058c88ac3a 100644
--- a/grub-core/Makefile.core.def --- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def
@@ -188,6 +188,9 @@ kernel = { @@ -188,6 +188,9 @@ kernel = {
@ -27,7 +27,7 @@ index c15e91943b9..058c88ac3af 100644
i386_xen = kern/i386/dl.c; i386_xen = kern/i386/dl.c;
i386_xen_pvh = kern/i386/dl.c; i386_xen_pvh = kern/i386/dl.c;
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index 63b586d09cb..a3e215155bd 100644 index 63b586d09c..a3e215155b 100644
--- a/grub-core/kern/misc.c --- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
@ -55,7 +55,7 @@ index 63b586d09cb..a3e215155bd 100644
#endif #endif
diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c
new file mode 100644 new file mode 100644
index 00000000000..1079b5380e1 index 0000000000..1079b5380e
--- /dev/null --- /dev/null
+++ b/grub-core/lib/arm64/backtrace.c +++ b/grub-core/lib/arm64/backtrace.c
@@ -0,0 +1,62 @@ @@ -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 diff --git a/grub-core/lib/backtrace.c b/grub-core/lib/backtrace.c
index 825a8800e25..c0ad6ab8be1 100644 index 825a8800e2..c0ad6ab8be 100644
--- a/grub-core/lib/backtrace.c --- a/grub-core/lib/backtrace.c
+++ b/grub-core/lib/backtrace.c +++ b/grub-core/lib/backtrace.c
@@ -29,6 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -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 diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c
index c3e03c7275c..c67273db3ae 100644 index c3e03c7275..c67273db3a 100644
--- a/grub-core/lib/i386/backtrace.c --- a/grub-core/lib/i386/backtrace.c
+++ b/grub-core/lib/i386/backtrace.c +++ b/grub-core/lib/i386/backtrace.c
@@ -15,11 +15,23 @@ @@ -15,11 +15,23 @@

8
SOURCES/0054-Fix-up-some-man-pages-rpmdiff-noticed.patch
View File

@ -13,7 +13,7 @@ Subject: [PATCH] Fix up some man pages rpmdiff noticed.
create mode 100644 util/grub-syslinux2cfg.1 create mode 100644 util/grub-syslinux2cfg.1
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index ed31ea457d2..537ed411469 100644 index ed31ea457d..537ed41146 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -87,6 +87,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3]) @@ -87,6 +87,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
@ -34,7 +34,7 @@ index ed31ea457d2..537ed411469 100644
if test "x$TARGET_CFLAGS" = x; then if test "x$TARGET_CFLAGS" = x; then
diff --git a/util/grub-macbless.8 b/util/grub-macbless.8 diff --git a/util/grub-macbless.8 b/util/grub-macbless.8
new file mode 100644 new file mode 100644
index 00000000000..ae842f3a606 index 0000000000..ae842f3a60
--- /dev/null --- /dev/null
+++ b/util/grub-macbless.8 +++ b/util/grub-macbless.8
@@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
@ -65,7 +65,7 @@ index 00000000000..ae842f3a606
+.SH SEE ALSO +.SH SEE ALSO
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1 diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
index 4dea4f54597..0eaaafe505b 100644 index 4dea4f5459..0eaaafe505 100644
--- a/util/grub-mkimage.1 --- a/util/grub-mkimage.1
+++ b/util/grub-mkimage.1 +++ b/util/grub-mkimage.1
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
@ -79,7 +79,7 @@ index 4dea4f54597..0eaaafe505b 100644
.TP .TP
diff --git a/util/grub-syslinux2cfg.1 b/util/grub-syslinux2cfg.1 diff --git a/util/grub-syslinux2cfg.1 b/util/grub-syslinux2cfg.1
new file mode 100644 new file mode 100644
index 00000000000..85309482718 index 0000000000..8530948271
--- /dev/null --- /dev/null
+++ b/util/grub-syslinux2cfg.1 +++ b/util/grub-syslinux2cfg.1
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@

4
SOURCES/0055-Make-our-info-pages-say-grub2-where-appropriate.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 171 insertions(+), 154 deletions(-) 2 files changed, 171 insertions(+), 154 deletions(-)
diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
index 6c629a23e2d..19f708ee662 100644 index 6c629a23e2..19f708ee66 100644
--- a/docs/grub-dev.texi --- a/docs/grub-dev.texi
+++ b/docs/grub-dev.texi +++ b/docs/grub-dev.texi
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
@ -35,7 +35,7 @@ index 6c629a23e2d..19f708ee662 100644
@setchapternewpage odd @setchapternewpage odd
diff --git a/docs/grub.texi b/docs/grub.texi diff --git a/docs/grub.texi b/docs/grub.texi
index 69f08d289f9..0615d0ed97e 100644 index 69f08d289f..0615d0ed97 100644
--- a/docs/grub.texi --- a/docs/grub.texi
+++ b/docs/grub.texi +++ b/docs/grub.texi
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@

2
SOURCES/0056-macos-just-build-chainloader-entries-don-t-try-any-x.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 18 insertions(+), 60 deletions(-) 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 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 1b91c102f35..4b27bd20153 100644 index 1b91c102f3..4b27bd2015 100644
--- a/util/grub.d/30_os-prober.in --- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in
@@ -42,68 +42,25 @@ if [ -z "${OSPROBED}" ] ; then @@ -42,68 +42,25 @@ if [ -z "${OSPROBED}" ] ; then

4
SOURCES/0057-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
2 files changed, 533 insertions(+), 20 deletions(-) 2 files changed, 533 insertions(+), 20 deletions(-)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index 63203034dfc..f1fff7385b5 100644 index 63203034df..f1fff7385b 100644
--- a/grub-core/fs/btrfs.c --- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c
@@ -38,6 +38,9 @@ @@ -38,6 +38,9 @@
@ -690,7 +690,7 @@ index 63203034dfc..f1fff7385b5 100644
+ +
+// vim: si et sw=2: +// vim: si et sw=2:
diff --git a/include/grub/btrfs.h b/include/grub/btrfs.h diff --git a/include/grub/btrfs.h b/include/grub/btrfs.h
index 9d93fb6c182..234ad976771 100644 index 9d93fb6c18..234ad97677 100644
--- a/include/grub/btrfs.h --- a/include/grub/btrfs.h
+++ b/include/grub/btrfs.h +++ b/include/grub/btrfs.h
@@ -29,6 +29,7 @@ enum @@ -29,6 +29,7 @@ enum

2
SOURCES/0058-export-btrfs_subvol-and-btrfs_subvolid.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Michael Chang <mchang@suse.com>
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index f1fff7385b5..ad1b56b716d 100644 index f1fff7385b..ad1b56b716 100644
--- a/grub-core/fs/btrfs.c --- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c
@@ -2714,6 +2714,8 @@ GRUB_MOD_INIT (btrfs) @@ -2714,6 +2714,8 @@ GRUB_MOD_INIT (btrfs)

2
SOURCES/0059-grub2-btrfs-03-follow_default.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] grub2-btrfs-03-follow_default
1 file changed, 76 insertions(+), 31 deletions(-) 1 file changed, 76 insertions(+), 31 deletions(-)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index ad1b56b716d..113c1f746c9 100644 index ad1b56b716..113c1f746c 100644
--- a/grub-core/fs/btrfs.c --- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c
@@ -1256,6 +1256,7 @@ grub_btrfs_mount (grub_device_t dev) @@ -1256,6 +1256,7 @@ grub_btrfs_mount (grub_device_t dev)

12
SOURCES/0060-grub2-btrfs-04-grub2-install.patch
View File

@ -13,7 +13,7 @@ Subject: [PATCH] grub2-btrfs-04-grub2-install
6 files changed, 54 insertions(+), 2 deletions(-) 6 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
index 001b818fe58..caf9b1ccd3f 100644 index 001b818fe5..caf9b1ccd3 100644
--- a/grub-core/osdep/linux/getroot.c --- a/grub-core/osdep/linux/getroot.c
+++ b/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) @@ -376,6 +376,7 @@ get_btrfs_fs_prefix (const char *mount_path)
@ -38,7 +38,7 @@ index 001b818fe58..caf9b1ccd3f 100644
else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0) 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 diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
index 7d6325138ce..46a881530c0 100644 index 7d6325138c..46a881530c 100644
--- a/grub-core/osdep/unix/config.c --- a/grub-core/osdep/unix/config.c
+++ b/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) @@ -82,6 +82,19 @@ grub_util_load_config (struct grub_util_config *cfg)
@ -73,7 +73,7 @@ index 7d6325138ce..46a881530c0 100644
argv[2] = script; argv[2] = script;
argv[3] = '\0'; argv[3] = '\0';
diff --git a/util/config.c b/util/config.c diff --git a/util/config.c b/util/config.c
index ebcdd8f5e22..f044a880a76 100644 index ebcdd8f5e2..f044a880a7 100644
--- a/util/config.c --- a/util/config.c
+++ b/util/config.c +++ b/util/config.c
@@ -42,6 +42,16 @@ grub_util_parse_config (FILE *f, struct grub_util_config *cfg, int simple) @@ -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) sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0)
{ {
diff --git a/util/grub-install.c b/util/grub-install.c diff --git a/util/grub-install.c b/util/grub-install.c
index 0fbe7f78c6d..0f66f36d23a 100644 index 0fbe7f78c6..0f66f36d23 100644
--- a/util/grub-install.c --- a/util/grub-install.c
+++ b/util/grub-install.c +++ b/util/grub-install.c
@@ -827,6 +827,8 @@ fill_core_services (const char *core_services) @@ -827,6 +827,8 @@ fill_core_services (const char *core_services)
@ -134,7 +134,7 @@ index 0fbe7f78c6d..0f66f36d23a 100644
char *install_drive = NULL; char *install_drive = NULL;
diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
index 47a241a391b..5db7a9a7d97 100644 index 47a241a391..5db7a9a7d9 100644
--- a/util/grub-mkrelpath.c --- a/util/grub-mkrelpath.c
+++ b/util/grub-mkrelpath.c +++ b/util/grub-mkrelpath.c
@@ -40,9 +40,12 @@ struct arguments @@ -40,9 +40,12 @@ struct arguments
@ -161,7 +161,7 @@ index 47a241a391b..5db7a9a7d97 100644
if (state->arg_num == 0) if (state->arg_num == 0)
arguments->pathname = xstrdup (arg); arguments->pathname = xstrdup (arg);
diff --git a/include/grub/emu/config.h b/include/grub/emu/config.h diff --git a/include/grub/emu/config.h b/include/grub/emu/config.h
index 875d5896ce1..c9a7e5f4ade 100644 index 875d5896ce..c9a7e5f4ad 100644
--- a/include/grub/emu/config.h --- a/include/grub/emu/config.h
+++ b/include/grub/emu/config.h +++ b/include/grub/emu/config.h
@@ -37,6 +37,7 @@ struct grub_util_config @@ -37,6 +37,7 @@ struct grub_util_config

10
SOURCES/0061-grub2-btrfs-05-grub2-mkconfig.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Michael Chang <mchang@suse.com>
5 files changed, 38 insertions(+), 2 deletions(-) 5 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 005f093809b..535c0f02499 100644 index 005f093809..535c0f0249 100644
--- a/util/grub-mkconfig.in --- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in
@@ -252,7 +252,8 @@ export GRUB_DEFAULT \ @@ -252,7 +252,8 @@ export GRUB_DEFAULT \
@ -27,7 +27,7 @@ index 005f093809b..535c0f02499 100644
if test "x${grub_cfg}" != "x"; then if test "x${grub_cfg}" != "x"; then
rm -f "${grub_cfg}.new" rm -f "${grub_cfg}.new"
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 42c2ea9ba50..fafeac95061 100644 index 42c2ea9ba5..fafeac9506 100644
--- a/util/grub-mkconfig_lib.in --- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in
@@ -52,7 +52,11 @@ grub_warn () @@ -52,7 +52,11 @@ grub_warn ()
@ -43,7 +43,7 @@ index 42c2ea9ba50..fafeac95061 100644
is_path_readable_by_grub () is_path_readable_by_grub ()
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 858b526c925..de727e6ee6b 100644 index 858b526c92..de727e6ee6 100644
--- a/util/grub.d/00_header.in --- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in
@@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@" @@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@"
@ -90,7 +90,7 @@ index 858b526c925..de727e6ee6b 100644
+EOF +EOF
+fi +fi
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 0f3c19e30cc..cbfaca34cc7 100644 index 0f3c19e30c..cbfaca34cc 100644
--- a/util/grub.d/10_linux.in --- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in
@@ -66,10 +66,14 @@ fi @@ -66,10 +66,14 @@ fi
@ -109,7 +109,7 @@ index 0f3c19e30cc..cbfaca34cc7 100644
xzfs) xzfs)
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` 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 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index ada20775a14..e9e73b815fb 100644 index ada20775a1..e9e73b815f 100644
--- a/util/grub.d/20_linux_xen.in --- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in
@@ -73,10 +73,14 @@ fi @@ -73,10 +73,14 @@ fi

8
SOURCES/0062-grub2-btrfs-06-subvol-mount.patch
View File

@ -11,7 +11,7 @@ Subject: [PATCH] grub2-btrfs-06-subvol-mount
4 files changed, 392 insertions(+), 5 deletions(-) 4 files changed, 392 insertions(+), 5 deletions(-)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index 113c1f746c9..d323746ecfa 100644 index 113c1f746c..d323746ecf 100644
--- a/grub-core/fs/btrfs.c --- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
@ -277,7 +277,7 @@ index 113c1f746c9..d323746ecfa 100644
grub_cmd_btrfs_list_subvols, 0, grub_cmd_btrfs_list_subvols, 0,
"[-p|-n] [-o var] DEVICE", "[-p|-n] [-o var] DEVICE",
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
index caf9b1ccd3f..28790307e00 100644 index caf9b1ccd3..28790307e0 100644
--- a/grub-core/osdep/linux/getroot.c --- a/grub-core/osdep/linux/getroot.c
+++ b/grub-core/osdep/linux/getroot.c +++ b/grub-core/osdep/linux/getroot.c
@@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key @@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key
@ -460,7 +460,7 @@ index caf9b1ccd3f..28790307e00 100644
grub_make_system_path_relative_to_its_root_os (const char *path) grub_make_system_path_relative_to_its_root_os (const char *path)
{ {
diff --git a/util/grub-install.c b/util/grub-install.c diff --git a/util/grub-install.c b/util/grub-install.c
index 0f66f36d23a..84ed6e88ecb 100644 index 0f66f36d23..84ed6e88ec 100644
--- a/util/grub-install.c --- a/util/grub-install.c
+++ b/util/grub-install.c +++ b/util/grub-install.c
@@ -1569,6 +1569,55 @@ main (int argc, char *argv[]) @@ -1569,6 +1569,55 @@ main (int argc, char *argv[])
@ -520,7 +520,7 @@ index 0f66f36d23a..84ed6e88ecb 100644
const char *core_name = NULL; const char *core_name = NULL;
diff --git a/include/grub/emu/getroot.h b/include/grub/emu/getroot.h diff --git a/include/grub/emu/getroot.h b/include/grub/emu/getroot.h
index 73fa2d34abb..9c642ae3fe3 100644 index 73fa2d34ab..9c642ae3fe 100644
--- a/include/grub/emu/getroot.h --- a/include/grub/emu/getroot.h
+++ b/include/grub/emu/getroot.h +++ b/include/grub/emu/getroot.h
@@ -53,6 +53,11 @@ char ** @@ -53,6 +53,11 @@ char **

2
SOURCES/0063-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
View File

@ -10,7 +10,7 @@ Ref: bsc#953538
1 file changed, 31 insertions(+), 1 deletion(-) 1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index d323746ecfa..673ded03522 100644 index d323746ecf..673ded0352 100644
--- a/grub-core/fs/btrfs.c --- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c
@@ -1260,11 +1260,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path) @@ -1260,11 +1260,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)

2
SOURCES/0064-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] Grub not working correctly with btrfs snapshots (bsc#1026511)
1 file changed, 238 insertions(+) 1 file changed, 238 insertions(+)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index 673ded03522..2b21cbaa67e 100644 index 673ded0352..2b21cbaa67 100644
--- a/grub-core/fs/btrfs.c --- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c
@@ -2887,6 +2887,238 @@ out: @@ -2887,6 +2887,238 @@ out:

2
SOURCES/0065-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 32 insertions(+), 4 deletions(-) 1 file changed, 32 insertions(+), 4 deletions(-)
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
index 585fa6662b6..03f9a9d0118 100644 index 585fa6662b..03f9a9d011 100644
--- a/include/grub/efi/efi.h --- a/include/grub/efi/efi.h
+++ b/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h
@@ -24,6 +24,10 @@ @@ -24,6 +24,10 @@

2
SOURCES/0066-Use-grub_efi_.-memory-helpers-where-reasonable.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 9 insertions(+), 15 deletions(-) 1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
index 3ff305b1d32..ba3d2930197 100644 index 3ff305b1d3..ba3d293019 100644
--- a/grub-core/loader/efi/chainloader.c --- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c
@@ -65,7 +65,7 @@ grub_chainloader_unload (void) @@ -65,7 +65,7 @@ grub_chainloader_unload (void)

4
SOURCES/0067-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 11 insertions(+), 1 deletion(-) 2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
index ba3d2930197..47f5aa14817 100644 index ba3d293019..47f5aa1481 100644
--- a/grub-core/loader/efi/chainloader.c --- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c
@@ -806,7 +806,8 @@ handle_image (void *data, grub_efi_uint32_t datasize) @@ -806,7 +806,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
@ -26,7 +26,7 @@ index ba3d2930197..47f5aa14817 100644
efi_status = grub_efi_free_pool (buffer); efi_status = grub_efi_free_pool (buffer);
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index 117469450d3..99628801478 100644 index 117469450d..9962880147 100644
--- a/include/grub/efi/api.h --- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h +++ b/include/grub/efi/api.h
@@ -546,7 +546,16 @@ typedef grub_uint64_t grub_efi_uint64_t; @@ -546,7 +546,16 @@ typedef grub_uint64_t grub_efi_uint64_t;

2
SOURCES/0068-don-t-use-int-for-efi-status.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] don't use int for efi status
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
index 05d8237a9b2..ae9885edb84 100644 index 05d8237a9b..ae9885edb8 100644
--- a/grub-core/kern/efi/efi.c --- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c
@@ -167,7 +167,7 @@ grub_reboot (void) @@ -167,7 +167,7 @@ grub_reboot (void)

2
SOURCES/0069-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] make GRUB_MOD_INIT() declare its function prototypes.
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/include/grub/dl.h b/include/grub/dl.h diff --git a/include/grub/dl.h b/include/grub/dl.h
index b3753c9ca26..91933b85f2c 100644 index b3753c9ca2..91933b85f2 100644
--- a/include/grub/dl.h --- a/include/grub/dl.h
+++ b/include/grub/dl.h +++ b/include/grub/dl.h
@@ -54,6 +54,7 @@ grub_mod_fini (void) @@ -54,6 +54,7 @@ grub_mod_fini (void)

2
SOURCES/0070-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 1 insertion(+), 11 deletions(-) 1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/util/grub-install.c b/util/grub-install.c diff --git a/util/grub-install.c b/util/grub-install.c
index 84ed6e88ecb..a2bec7446cb 100644 index 84ed6e88ec..a2bec7446c 100644
--- a/util/grub-install.c --- a/util/grub-install.c
+++ b/util/grub-install.c +++ b/util/grub-install.c
@@ -1190,18 +1190,8 @@ main (int argc, char *argv[]) @@ -1190,18 +1190,8 @@ main (int argc, char *argv[])

2
SOURCES/0071-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 5 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index e9e73b815fb..c23b064be6c 100644 index e9e73b815f..c23b064be6 100644
--- a/util/grub.d/20_linux_xen.in --- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in
@@ -153,6 +153,7 @@ linux_entry_xsm () @@ -153,6 +153,7 @@ linux_entry_xsm ()

2
SOURCES/0072-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
View File

@ -63,7 +63,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 89 insertions(+), 20 deletions(-) 1 file changed, 89 insertions(+), 20 deletions(-)
diff --git a/grub-core/kern/i386/tsc_pmtimer.c b/grub-core/kern/i386/tsc_pmtimer.c diff --git a/grub-core/kern/i386/tsc_pmtimer.c b/grub-core/kern/i386/tsc_pmtimer.c
index c9c36169978..ca15c3aacd7 100644 index c9c3616997..ca15c3aacd 100644
--- a/grub-core/kern/i386/tsc_pmtimer.c --- a/grub-core/kern/i386/tsc_pmtimer.c
+++ b/grub-core/kern/i386/tsc_pmtimer.c +++ b/grub-core/kern/i386/tsc_pmtimer.c
@@ -28,40 +28,101 @@ @@ -28,40 +28,101 @@

4
SOURCES/0073-align-struct-efi_variable-better.patch
View File

@ -9,7 +9,7 @@ Subject: [PATCH] align struct efi_variable better...
2 files changed, 2 insertions(+), 1 deletion(-) 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h
index 36d2dedf47e..9d93ba88bac 100644 index 36d2dedf47..9d93ba88ba 100644
--- a/include/grub/efiemu/runtime.h --- a/include/grub/efiemu/runtime.h
+++ b/include/grub/efiemu/runtime.h +++ b/include/grub/efiemu/runtime.h
@@ -33,5 +33,5 @@ struct efi_variable @@ -33,5 +33,5 @@ struct efi_variable
@ -20,7 +20,7 @@ index 36d2dedf47e..9d93ba88bac 100644
+} GRUB_PACKED GRUB_ALIGNED(8); +} GRUB_PACKED GRUB_ALIGNED(8);
#endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */ #endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */
diff --git a/include/grub/types.h b/include/grub/types.h diff --git a/include/grub/types.h b/include/grub/types.h
index 0a3ff159136..ba446d99040 100644 index 0a3ff15913..ba446d9904 100644
--- a/include/grub/types.h --- a/include/grub/types.h
+++ b/include/grub/types.h +++ b/include/grub/types.h
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@

8
SOURCES/0074-Add-BLS-support-to-grub-mkconfig.patch
View File

@ -29,7 +29,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
4 files changed, 252 insertions(+), 6 deletions(-) 4 files changed, 252 insertions(+), 6 deletions(-)
diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8 diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8
index a2d1f577b9b..434fa4deda4 100644 index a2d1f577b9..434fa4deda 100644
--- a/util/grub-mkconfig.8 --- a/util/grub-mkconfig.8
+++ b/util/grub-mkconfig.8 +++ b/util/grub-mkconfig.8
@@ -13,5 +13,9 @@ @@ -13,5 +13,9 @@
@ -43,7 +43,7 @@ index a2d1f577b9b..434fa4deda4 100644
.SH SEE ALSO .SH SEE ALSO
.BR "info grub" .BR "info grub"
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 535c0f02499..f55339a3f64 100644 index 535c0f0249..f55339a3f6 100644
--- a/util/grub-mkconfig.in --- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in
@@ -50,6 +50,8 @@ grub_get_kernel_settings="${sbindir}/@grub_get_kernel_settings@" @@ -50,6 +50,8 @@ grub_get_kernel_settings="${sbindir}/@grub_get_kernel_settings@"
@ -84,7 +84,7 @@ index 535c0f02499..f55339a3f64 100644
if test "x${grub_cfg}" != "x"; then if test "x${grub_cfg}" != "x"; then
rm -f "${grub_cfg}.new" rm -f "${grub_cfg}.new"
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index fafeac95061..d8bb4069360 100644 index fafeac9506..d8bb406936 100644
--- a/util/grub-mkconfig_lib.in --- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in
@@ -30,6 +30,9 @@ fi @@ -30,6 +30,9 @@ fi
@ -141,7 +141,7 @@ index fafeac95061..d8bb4069360 100644
fi fi
IFS="$old_ifs" IFS="$old_ifs"
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index cbfaca34cc7..68adb55d893 100644 index cbfaca34cc..68adb55d89 100644
--- a/util/grub.d/10_linux.in --- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in
@@ -82,6 +82,223 @@ case x"$GRUB_FS" in @@ -82,6 +82,223 @@ case x"$GRUB_FS" in

2
SOURCES/0075-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index a3e215155bd..c60601b699d 100644 index a3e215155b..c60601b699 100644
--- a/grub-core/kern/misc.c --- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c
@@ -1201,7 +1201,7 @@ static void __attribute__ ((noreturn)) @@ -1201,7 +1201,7 @@ static void __attribute__ ((noreturn))

16
SOURCES/0076-Add-linux-and-initrd-commands-for-grub-emu.patch
View File

@ -18,7 +18,7 @@ to the kexec command line tool, to allow booting the selected menu entry.
create mode 100644 grub-core/loader/emu/linux.c create mode 100644 grub-core/loader/emu/linux.c
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 058c88ac3af..5354f9613d3 100644 index 058c88ac3a..5354f9613d 100644
--- a/grub-core/Makefile.core.def --- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def
@@ -1826,7 +1826,6 @@ module = { @@ -1826,7 +1826,6 @@ module = {
@ -30,7 +30,7 @@ index 058c88ac3af..5354f9613d3 100644
efi = loader/efi/linux.c; efi = loader/efi/linux.c;
}; };
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 55ea5a11ccd..846fe9715ec 100644 index 55ea5a11cc..846fe9715e 100644
--- a/grub-core/kern/emu/main.c --- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c
@@ -107,6 +107,7 @@ static struct argp_option options[] = { @@ -107,6 +107,7 @@ static struct argp_option options[] = {
@ -52,7 +52,7 @@ index 55ea5a11ccd..846fe9715ec 100644
case ARGP_KEY_ARG: case ARGP_KEY_ARG:
{ {
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
index 0ff13bcaf8c..eeea092752d 100644 index 0ff13bcaf8..eeea092752 100644
--- a/grub-core/kern/emu/misc.c --- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c +++ b/grub-core/kern/emu/misc.c
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
@ -100,7 +100,7 @@ index 0ff13bcaf8c..eeea092752d 100644
+} +}
diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c
new file mode 100644 new file mode 100644
index 00000000000..fda9e00d24c index 0000000000..fda9e00d24
--- /dev/null --- /dev/null
+++ b/grub-core/loader/emu/linux.c +++ b/grub-core/loader/emu/linux.c
@@ -0,0 +1,172 @@ @@ -0,0 +1,172 @@
@ -277,7 +277,7 @@ index 00000000000..fda9e00d24c
+ grub_unregister_command (cmd_initrd); + grub_unregister_command (cmd_initrd);
+} +}
diff --git a/include/grub/emu/exec.h b/include/grub/emu/exec.h diff --git a/include/grub/emu/exec.h b/include/grub/emu/exec.h
index d1073ef86af..1b61b4a2e5d 100644 index d1073ef86a..1b61b4a2e5 100644
--- a/include/grub/emu/exec.h --- a/include/grub/emu/exec.h
+++ b/include/grub/emu/exec.h +++ b/include/grub/emu/exec.h
@@ -23,6 +23,8 @@ @@ -23,6 +23,8 @@
@ -299,7 +299,7 @@ index d1073ef86af..1b61b4a2e5d 100644
grub_util_exec_redirect (const char *const *argv, const char *stdin_file, grub_util_exec_redirect (const char *const *argv, const char *stdin_file,
const char *stdout_file); const char *stdout_file);
diff --git a/include/grub/emu/hostfile.h b/include/grub/emu/hostfile.h diff --git a/include/grub/emu/hostfile.h b/include/grub/emu/hostfile.h
index cfb1e2b5661..a61568e36e9 100644 index cfb1e2b566..a61568e36e 100644
--- a/include/grub/emu/hostfile.h --- a/include/grub/emu/hostfile.h
+++ b/include/grub/emu/hostfile.h +++ b/include/grub/emu/hostfile.h
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
@ -320,7 +320,7 @@ index cfb1e2b5661..a61568e36e9 100644
char * char *
grub_util_path_concat (size_t n, ...); grub_util_path_concat (size_t n, ...);
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index ff9c48a6490..01056954b96 100644 index ff9c48a649..01056954b9 100644
--- a/include/grub/emu/misc.h --- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h +++ b/include/grub/emu/misc.h
@@ -57,6 +57,9 @@ void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format ( @@ -57,6 +57,9 @@ void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format (
@ -334,7 +334,7 @@ index ff9c48a6490..01056954b96 100644
#ifdef HAVE_DEVICE_MAPPER #ifdef HAVE_DEVICE_MAPPER
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index ee88e44e97a..80e7a83edf9 100644 index ee88e44e97..80e7a83edf 100644
--- a/grub-core/Makefile.am --- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am +++ b/grub-core/Makefile.am
@@ -307,6 +307,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/net.h @@ -307,6 +307,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/net.h

8
SOURCES/0077-Add-grub2-switch-to-blscfg.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Jan Hlavac <jhlavac@redhat.com>
create mode 100644 util/grub-switch-to-blscfg.in create mode 100644 util/grub-switch-to-blscfg.in
diff --git a/Makefile.util.def b/Makefile.util.def diff --git a/Makefile.util.def b/Makefile.util.def
index cdd2f51fe4b..afc4d7b0c3e 100644 index cdd2f51fe4..afc4d7b0c3 100644
--- a/Makefile.util.def --- a/Makefile.util.def
+++ b/Makefile.util.def +++ b/Makefile.util.def
@@ -1364,6 +1364,13 @@ program = { @@ -1364,6 +1364,13 @@ program = {
@ -35,7 +35,7 @@ index cdd2f51fe4b..afc4d7b0c3e 100644
name = grub-glue-efi; name = grub-glue-efi;
mansection = 1; mansection = 1;
diff --git a/util/grub-set-password.in b/util/grub-set-password.in diff --git a/util/grub-set-password.in b/util/grub-set-password.in
index 5ebf50576d6..c0b5ebbfdc5 100644 index 5ebf50576d..c0b5ebbfdc 100644
--- a/util/grub-set-password.in --- a/util/grub-set-password.in
+++ b/util/grub-set-password.in +++ b/util/grub-set-password.in
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
@ -48,7 +48,7 @@ index 5ebf50576d6..c0b5ebbfdc5 100644
else else
diff --git a/util/grub-switch-to-blscfg.8 b/util/grub-switch-to-blscfg.8 diff --git a/util/grub-switch-to-blscfg.8 b/util/grub-switch-to-blscfg.8
new file mode 100644 new file mode 100644
index 00000000000..9a886282976 index 0000000000..9a88628297
--- /dev/null --- /dev/null
+++ b/util/grub-switch-to-blscfg.8 +++ b/util/grub-switch-to-blscfg.8
@@ -0,0 +1,33 @@ @@ -0,0 +1,33 @@
@ -87,7 +87,7 @@ index 00000000000..9a886282976
+.BR "info grub" +.BR "info grub"
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
new file mode 100644 new file mode 100644
index 00000000000..a851424beb2 index 0000000000..a851424beb
--- /dev/null --- /dev/null
+++ b/util/grub-switch-to-blscfg.in +++ b/util/grub-switch-to-blscfg.in
@@ -0,0 +1,317 @@ @@ -0,0 +1,317 @@

48
SOURCES/0078-make-better-backtraces.patch
View File

@ -38,7 +38,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
delete mode 100644 grub-core/lib/i386/backtrace.c delete mode 100644 grub-core/lib/i386/backtrace.c
diff --git a/Makefile.util.def b/Makefile.util.def diff --git a/Makefile.util.def b/Makefile.util.def
index afc4d7b0c3e..41906486a71 100644 index afc4d7b0c3..41906486a7 100644
--- a/Makefile.util.def --- a/Makefile.util.def
+++ b/Makefile.util.def +++ b/Makefile.util.def
@@ -51,6 +51,12 @@ library = { @@ -51,6 +51,12 @@ library = {
@ -55,7 +55,7 @@ index afc4d7b0c3e..41906486a71 100644
library = { library = {
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 5354f9613d3..4b7c45a7b06 100644 index 5354f9613d..4b7c45a7b0 100644
--- a/grub-core/Makefile.core.def --- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def
@@ -142,6 +142,12 @@ kernel = { @@ -142,6 +142,12 @@ kernel = {
@ -103,7 +103,7 @@ diff --git a/grub-core/lib/backtrace.c b/grub-core/commands/backtrace.c
similarity index 98% similarity index 98%
rename from grub-core/lib/backtrace.c rename from grub-core/lib/backtrace.c
rename to grub-core/commands/backtrace.c rename to grub-core/commands/backtrace.c
index c0ad6ab8be1..8b5ec3913b5 100644 index c0ad6ab8be..8b5ec3913b 100644
--- a/grub-core/lib/backtrace.c --- a/grub-core/lib/backtrace.c
+++ b/grub-core/commands/backtrace.c +++ b/grub-core/commands/backtrace.c
@@ -54,7 +54,7 @@ grub_cmd_backtrace (grub_command_t cmd __attribute__ ((unused)), @@ -54,7 +54,7 @@ grub_cmd_backtrace (grub_command_t cmd __attribute__ ((unused)),
@ -116,7 +116,7 @@ index c0ad6ab8be1..8b5ec3913b5 100644
} }
diff --git a/grub-core/gdb/cstub.c b/grub-core/gdb/cstub.c diff --git a/grub-core/gdb/cstub.c b/grub-core/gdb/cstub.c
index b64acd70fee..99281472d36 100644 index b64acd70fe..99281472d3 100644
--- a/grub-core/gdb/cstub.c --- a/grub-core/gdb/cstub.c
+++ b/grub-core/gdb/cstub.c +++ b/grub-core/gdb/cstub.c
@@ -215,7 +215,6 @@ grub_gdb_trap (int trap_no) @@ -215,7 +215,6 @@ grub_gdb_trap (int trap_no)
@ -129,7 +129,7 @@ index b64acd70fee..99281472d36 100644
diff --git a/grub-core/kern/arm64/backtrace.c b/grub-core/kern/arm64/backtrace.c diff --git a/grub-core/kern/arm64/backtrace.c b/grub-core/kern/arm64/backtrace.c
new file mode 100644 new file mode 100644
index 00000000000..019c6fdfef2 index 0000000000..019c6fdfef
--- /dev/null --- /dev/null
+++ b/grub-core/kern/arm64/backtrace.c +++ b/grub-core/kern/arm64/backtrace.c
@@ -0,0 +1,94 @@ @@ -0,0 +1,94 @@
@ -229,7 +229,7 @@ index 00000000000..019c6fdfef2
+} +}
diff --git a/grub-core/kern/backtrace.c b/grub-core/kern/backtrace.c diff --git a/grub-core/kern/backtrace.c b/grub-core/kern/backtrace.c
new file mode 100644 new file mode 100644
index 00000000000..4a82e865cc6 index 0000000000..4a82e865cc
--- /dev/null --- /dev/null
+++ b/grub-core/kern/backtrace.c +++ b/grub-core/kern/backtrace.c
@@ -0,0 +1,97 @@ @@ -0,0 +1,97 @@
@ -331,7 +331,7 @@ index 00000000000..4a82e865cc6
+ grub_backtrace (skip + 1); + grub_backtrace (skip + 1);
+} +}
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
index 7afb9e6f724..88d2077709e 100644 index 7afb9e6f72..88d2077709 100644
--- a/grub-core/kern/dl.c --- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c
@@ -124,6 +124,50 @@ grub_dl_resolve_symbol (const char *name) @@ -124,6 +124,50 @@ grub_dl_resolve_symbol (const char *name)
@ -395,7 +395,7 @@ index 7afb9e6f724..88d2077709e 100644
i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize)) i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
diff --git a/grub-core/kern/i386/backtrace.c b/grub-core/kern/i386/backtrace.c diff --git a/grub-core/kern/i386/backtrace.c b/grub-core/kern/i386/backtrace.c
new file mode 100644 new file mode 100644
index 00000000000..2413f9a57db index 0000000000..2413f9a57d
--- /dev/null --- /dev/null
+++ b/grub-core/kern/i386/backtrace.c +++ b/grub-core/kern/i386/backtrace.c
@@ -0,0 +1,125 @@ @@ -0,0 +1,125 @@
@ -525,7 +525,7 @@ index 00000000000..2413f9a57db
+#endif +#endif
+} +}
diff --git a/grub-core/kern/i386/pc/init.c b/grub-core/kern/i386/pc/init.c diff --git a/grub-core/kern/i386/pc/init.c b/grub-core/kern/i386/pc/init.c
index 27bc68b8a53..b51d0abfa6e 100644 index 27bc68b8a5..b51d0abfa6 100644
--- a/grub-core/kern/i386/pc/init.c --- a/grub-core/kern/i386/pc/init.c
+++ b/grub-core/kern/i386/pc/init.c +++ b/grub-core/kern/i386/pc/init.c
@@ -153,7 +153,7 @@ compact_mem_regions (void) @@ -153,7 +153,7 @@ compact_mem_regions (void)
@ -547,7 +547,7 @@ index 27bc68b8a53..b51d0abfa6e 100644
/* Initialize the console as early as possible. */ /* Initialize the console as early as possible. */
grub_console_init (); grub_console_init ();
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
index 0cd2a627231..937c1bc44cb 100644 index 0cd2a62723..937c1bc44c 100644
--- a/grub-core/kern/ieee1275/init.c --- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c
@@ -63,7 +63,6 @@ @@ -63,7 +63,6 @@
@ -559,7 +559,7 @@ index 0cd2a627231..937c1bc44cb 100644
#ifdef __sparc__ #ifdef __sparc__
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index c60601b699d..a432a6be54a 100644 index c60601b699..a432a6be54 100644
--- a/grub-core/kern/misc.c --- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c
@@ -1197,15 +1197,15 @@ grub_printf_fmt_check (const char *fmt, const char *fmt_expected) @@ -1197,15 +1197,15 @@ grub_printf_fmt_check (const char *fmt, const char *fmt_expected)
@ -593,7 +593,7 @@ index c60601b699d..a432a6be54a 100644
grub_vprintf (_(fmt), ap); grub_vprintf (_(fmt), ap);
va_end (ap); va_end (ap);
diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
index c070afc621f..d8c8377578b 100644 index c070afc621..d8c8377578 100644
--- a/grub-core/kern/mm.c --- a/grub-core/kern/mm.c
+++ b/grub-core/kern/mm.c +++ b/grub-core/kern/mm.c
@@ -97,13 +97,13 @@ get_header_from_pointer (void *ptr, grub_mm_header_t *p, grub_mm_region_t *r) @@ -97,13 +97,13 @@ get_header_from_pointer (void *ptr, grub_mm_header_t *p, grub_mm_region_t *r)
@ -615,7 +615,7 @@ index c070afc621f..d8c8377578b 100644
diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c
deleted file mode 100644 deleted file mode 100644
index 1079b5380e1..00000000000 index 1079b5380e..0000000000
--- a/grub-core/lib/arm64/backtrace.c --- a/grub-core/lib/arm64/backtrace.c
+++ /dev/null +++ /dev/null
@@ -1,62 +0,0 @@ @@ -1,62 +0,0 @@
@ -683,7 +683,7 @@ index 1079b5380e1..00000000000
- -
diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c
deleted file mode 100644 deleted file mode 100644
index c67273db3ae..00000000000 index c67273db3a..0000000000
--- a/grub-core/lib/i386/backtrace.c --- a/grub-core/lib/i386/backtrace.c
+++ /dev/null +++ /dev/null
@@ -1,78 +0,0 @@ @@ -1,78 +0,0 @@
@ -766,7 +766,7 @@ index c67273db3ae..00000000000
-} -}
- -
diff --git a/include/grub/backtrace.h b/include/grub/backtrace.h diff --git a/include/grub/backtrace.h b/include/grub/backtrace.h
index 395519762f0..275cf85e2d3 100644 index 395519762f..275cf85e2d 100644
--- a/include/grub/backtrace.h --- a/include/grub/backtrace.h
+++ b/include/grub/backtrace.h +++ b/include/grub/backtrace.h
@@ -19,8 +19,14 @@ @@ -19,8 +19,14 @@
@ -787,7 +787,7 @@ index 395519762f0..275cf85e2d3 100644
#endif #endif
diff --git a/include/grub/dl.h b/include/grub/dl.h diff --git a/include/grub/dl.h b/include/grub/dl.h
index 91933b85f2c..2f76e6b0437 100644 index 91933b85f2..2f76e6b043 100644
--- a/include/grub/dl.h --- a/include/grub/dl.h
+++ b/include/grub/dl.h +++ b/include/grub/dl.h
@@ -259,6 +259,8 @@ grub_dl_is_persistent (grub_dl_t mod) @@ -259,6 +259,8 @@ grub_dl_is_persistent (grub_dl_t mod)
@ -800,7 +800,7 @@ index 91933b85f2c..2f76e6b0437 100644
int isfunc, grub_dl_t mod); int isfunc, grub_dl_t mod);
diff --git a/include/grub/kernel.h b/include/grub/kernel.h diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index abbca5ea335..300a9766cda 100644 index abbca5ea33..300a9766cd 100644
--- a/include/grub/kernel.h --- a/include/grub/kernel.h
+++ b/include/grub/kernel.h +++ b/include/grub/kernel.h
@@ -111,6 +111,9 @@ grub_addr_t grub_modules_get_end (void); @@ -111,6 +111,9 @@ grub_addr_t grub_modules_get_end (void);
@ -814,7 +814,7 @@ index abbca5ea335..300a9766cda 100644
void grub_main (void) __attribute__ ((noreturn)); void grub_main (void) __attribute__ ((noreturn));
diff --git a/grub-core/kern/arm/efi/startup.S b/grub-core/kern/arm/efi/startup.S diff --git a/grub-core/kern/arm/efi/startup.S b/grub-core/kern/arm/efi/startup.S
index 9f8265315a9..f3bc41f9d0f 100644 index 9f8265315a..f3bc41f9d0 100644
--- a/grub-core/kern/arm/efi/startup.S --- a/grub-core/kern/arm/efi/startup.S
+++ b/grub-core/kern/arm/efi/startup.S +++ b/grub-core/kern/arm/efi/startup.S
@@ -23,6 +23,8 @@ @@ -23,6 +23,8 @@
@ -827,7 +827,7 @@ index 9f8265315a9..f3bc41f9d0f 100644
/* /*
* EFI_SYSTEM_TABLE and EFI_HANDLE are passed in r1/r0. * EFI_SYSTEM_TABLE and EFI_HANDLE are passed in r1/r0.
diff --git a/grub-core/kern/arm/startup.S b/grub-core/kern/arm/startup.S diff --git a/grub-core/kern/arm/startup.S b/grub-core/kern/arm/startup.S
index 3946fe8e183..5679a1d00ad 100644 index 3946fe8e18..5679a1d00a 100644
--- a/grub-core/kern/arm/startup.S --- a/grub-core/kern/arm/startup.S
+++ b/grub-core/kern/arm/startup.S +++ b/grub-core/kern/arm/startup.S
@@ -48,6 +48,8 @@ @@ -48,6 +48,8 @@
@ -840,7 +840,7 @@ index 3946fe8e183..5679a1d00ad 100644
b codestart b codestart
diff --git a/grub-core/kern/arm64/efi/startup.S b/grub-core/kern/arm64/efi/startup.S diff --git a/grub-core/kern/arm64/efi/startup.S b/grub-core/kern/arm64/efi/startup.S
index 666a7ee3c92..41676bdb2b8 100644 index 666a7ee3c9..41676bdb2b 100644
--- a/grub-core/kern/arm64/efi/startup.S --- a/grub-core/kern/arm64/efi/startup.S
+++ b/grub-core/kern/arm64/efi/startup.S +++ b/grub-core/kern/arm64/efi/startup.S
@@ -19,7 +19,9 @@ @@ -19,7 +19,9 @@
@ -854,7 +854,7 @@ index 666a7ee3c92..41676bdb2b8 100644
/* /*
* EFI_SYSTEM_TABLE and EFI_HANDLE are passed in x1/x0. * EFI_SYSTEM_TABLE and EFI_HANDLE are passed in x1/x0.
diff --git a/grub-core/kern/i386/qemu/startup.S b/grub-core/kern/i386/qemu/startup.S diff --git a/grub-core/kern/i386/qemu/startup.S b/grub-core/kern/i386/qemu/startup.S
index 0d89858d9b3..939f182fc74 100644 index 0d89858d9b..939f182fc7 100644
--- a/grub-core/kern/i386/qemu/startup.S --- a/grub-core/kern/i386/qemu/startup.S
+++ b/grub-core/kern/i386/qemu/startup.S +++ b/grub-core/kern/i386/qemu/startup.S
@@ -24,7 +24,8 @@ @@ -24,7 +24,8 @@
@ -868,7 +868,7 @@ index 0d89858d9b3..939f182fc74 100644
jmp codestart jmp codestart
diff --git a/grub-core/kern/ia64/efi/startup.S b/grub-core/kern/ia64/efi/startup.S diff --git a/grub-core/kern/ia64/efi/startup.S b/grub-core/kern/ia64/efi/startup.S
index d75c6d7cc74..8f2a593e529 100644 index d75c6d7cc7..8f2a593e52 100644
--- a/grub-core/kern/ia64/efi/startup.S --- a/grub-core/kern/ia64/efi/startup.S
+++ b/grub-core/kern/ia64/efi/startup.S +++ b/grub-core/kern/ia64/efi/startup.S
@@ -24,8 +24,9 @@ @@ -24,8 +24,9 @@
@ -883,7 +883,7 @@ index d75c6d7cc74..8f2a593e529 100644
alloc loc0=ar.pfs,2,4,0,0 alloc loc0=ar.pfs,2,4,0,0
mov loc1=rp mov loc1=rp
diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S
index 03b916f0534..701bf63abcf 100644 index 03b916f053..701bf63abc 100644
--- a/grub-core/kern/sparc64/ieee1275/crt0.S --- a/grub-core/kern/sparc64/ieee1275/crt0.S
+++ b/grub-core/kern/sparc64/ieee1275/crt0.S +++ b/grub-core/kern/sparc64/ieee1275/crt0.S
@@ -22,7 +22,8 @@ @@ -22,7 +22,8 @@
@ -897,7 +897,7 @@ index 03b916f0534..701bf63abcf 100644
ba codestart ba codestart
mov %o4, %o0 mov %o4, %o0
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 80e7a83edf9..f512573c0da 100644 index 80e7a83edf..f512573c0d 100644
--- a/grub-core/Makefile.am --- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am +++ b/grub-core/Makefile.am
@@ -66,6 +66,7 @@ CLEANFILES += grub_script.yy.c grub_script.yy.h @@ -66,6 +66,7 @@ CLEANFILES += grub_script.yy.c grub_script.yy.h

2
SOURCES/0079-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] normal: don't draw our startup message if debug is set
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index d5968797f4f..e349303c29b 100644 index d5968797f4..e349303c29 100644
--- a/grub-core/normal/main.c --- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c +++ b/grub-core/normal/main.c
@@ -432,6 +432,9 @@ grub_normal_reader_init (int nested) @@ -432,6 +432,9 @@ grub_normal_reader_init (int nested)

8
SOURCES/0080-Work-around-some-minor-include-path-weirdnesses.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
diff --git a/include/grub/arm/efi/console.h b/include/grub/arm/efi/console.h diff --git a/include/grub/arm/efi/console.h b/include/grub/arm/efi/console.h
new file mode 100644 new file mode 100644
index 00000000000..1592f6f76b5 index 0000000000..1592f6f76b
--- /dev/null --- /dev/null
+++ b/include/grub/arm/efi/console.h +++ b/include/grub/arm/efi/console.h
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
@ -47,7 +47,7 @@ index 00000000000..1592f6f76b5
+#endif /* ! GRUB_ARM_EFI_CONSOLE_H */ +#endif /* ! GRUB_ARM_EFI_CONSOLE_H */
diff --git a/include/grub/arm64/efi/console.h b/include/grub/arm64/efi/console.h diff --git a/include/grub/arm64/efi/console.h b/include/grub/arm64/efi/console.h
new file mode 100644 new file mode 100644
index 00000000000..95689339384 index 0000000000..9568933938
--- /dev/null --- /dev/null
+++ b/include/grub/arm64/efi/console.h +++ b/include/grub/arm64/efi/console.h
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
@ -77,7 +77,7 @@ index 00000000000..95689339384
+#endif /* ! GRUB_ARM64_EFI_CONSOLE_H */ +#endif /* ! GRUB_ARM64_EFI_CONSOLE_H */
diff --git a/include/grub/i386/efi/console.h b/include/grub/i386/efi/console.h diff --git a/include/grub/i386/efi/console.h b/include/grub/i386/efi/console.h
new file mode 100644 new file mode 100644
index 00000000000..9231375cb07 index 0000000000..9231375cb0
--- /dev/null --- /dev/null
+++ b/include/grub/i386/efi/console.h +++ b/include/grub/i386/efi/console.h
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
@ -107,7 +107,7 @@ index 00000000000..9231375cb07
+#endif /* ! GRUB_I386_EFI_CONSOLE_H */ +#endif /* ! GRUB_I386_EFI_CONSOLE_H */
diff --git a/include/grub/x86_64/efi/console.h b/include/grub/x86_64/efi/console.h diff --git a/include/grub/x86_64/efi/console.h b/include/grub/x86_64/efi/console.h
new file mode 100644 new file mode 100644
index 00000000000..dba9d8678d0 index 0000000000..dba9d8678d
--- /dev/null --- /dev/null
+++ b/include/grub/x86_64/efi/console.h +++ b/include/grub/x86_64/efi/console.h
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@

4
SOURCES/0081-Make-it-possible-to-enabled-build-id-sha1.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 27 insertions(+) 2 files changed, 27 insertions(+)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 537ed411469..b4455e4732d 100644 index 537ed41146..b4455e4732 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1470,7 +1470,15 @@ grub_PROG_TARGET_CC @@ -1470,7 +1470,15 @@ grub_PROG_TARGET_CC
@ -30,7 +30,7 @@ index 537ed411469..b4455e4732d 100644
if test "$platform" != emu && test "x$TARGET_APPLE_LINKER" != x1 ; then if test "$platform" != emu && test "x$TARGET_APPLE_LINKER" != x1 ; then
if test ! -z "$TARGET_IMG_LDSCRIPT"; then if test ! -z "$TARGET_IMG_LDSCRIPT"; then
diff --git a/acinclude.m4 b/acinclude.m4 diff --git a/acinclude.m4 b/acinclude.m4
index 6e14bb553c6..21238fcfd03 100644 index 6e14bb553c..21238fcfd0 100644
--- a/acinclude.m4 --- a/acinclude.m4
+++ b/acinclude.m4 +++ b/acinclude.m4
@@ -136,6 +136,25 @@ if test "x$grub_cv_prog_ld_build_id_none" = xyes; then @@ -136,6 +136,25 @@ if test "x$grub_cv_prog_ld_build_id_none" = xyes; then

4
SOURCES/0082-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 20 insertions(+) 2 files changed, 20 insertions(+)
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index a432a6be54a..9a2fae6398e 100644 index a432a6be54..9a2fae6398 100644
--- a/grub-core/kern/misc.c --- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c
@@ -191,6 +191,24 @@ grub_real_dprintf (const char *file, const int line, const char *condition, @@ -191,6 +191,24 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
@ -42,7 +42,7 @@ index a432a6be54a..9a2fae6398e 100644
int int
diff --git a/include/grub/misc.h b/include/grub/misc.h diff --git a/include/grub/misc.h b/include/grub/misc.h
index fd18e6320b8..3adc4036e3b 100644 index fd18e6320b..3adc4036e3 100644
--- a/include/grub/misc.h --- a/include/grub/misc.h
+++ b/include/grub/misc.h +++ b/include/grub/misc.h
@@ -345,6 +345,8 @@ void EXPORT_FUNC(grub_real_dprintf) (const char *file, @@ -345,6 +345,8 @@ void EXPORT_FUNC(grub_real_dprintf) (const char *file,

8
SOURCES/0083-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
4 files changed, 78 insertions(+), 4 deletions(-) 4 files changed, 78 insertions(+), 4 deletions(-)
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
index 88d2077709e..9557254035e 100644 index 88d2077709..9557254035 100644
--- a/grub-core/kern/dl.c --- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c
@@ -501,6 +501,23 @@ grub_dl_find_section (Elf_Ehdr *e, const char *name) @@ -501,6 +501,23 @@ grub_dl_find_section (Elf_Ehdr *e, const char *name)
@ -95,7 +95,7 @@ index 88d2077709e..9557254035e 100644
{ {
grub_dl_unload (mod); grub_dl_unload (mod);
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
index ae9885edb84..d6a2fb57789 100644 index ae9885edb8..d6a2fb5778 100644
--- a/grub-core/kern/efi/efi.c --- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c
@@ -296,7 +296,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, @@ -296,7 +296,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@ -117,7 +117,7 @@ index ae9885edb84..d6a2fb57789 100644
} }
diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
index 6d39bd3ad29..2d12e6188fd 100644 index 6d39bd3ad2..2d12e6188f 100644
--- a/grub-core/kern/efi/init.c --- a/grub-core/kern/efi/init.c
+++ b/grub-core/kern/efi/init.c +++ b/grub-core/kern/efi/init.c
@@ -115,10 +115,33 @@ grub_efi_env_init (void) @@ -115,10 +115,33 @@ grub_efi_env_init (void)
@ -164,7 +164,7 @@ index 6d39bd3ad29..2d12e6188fd 100644
} }
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
index 03f9a9d0118..2e0691454b1 100644 index 03f9a9d011..2e0691454b 100644
--- a/include/grub/efi/efi.h --- a/include/grub/efi/efi.h
+++ b/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h
@@ -138,7 +138,7 @@ grub_err_t grub_arch_efi_linux_check_image(struct linux_arch_kernel_header *lh); @@ -138,7 +138,7 @@ grub_err_t grub_arch_efi_linux_check_image(struct linux_arch_kernel_header *lh);

4
SOURCES/0084-Fixup-for-newer-compiler.patch
View File

@ -9,7 +9,7 @@ Subject: [PATCH] Fixup for newer compiler
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index 2b21cbaa67e..4cc86e9b79e 100644 index 2b21cbaa67..4cc86e9b79 100644
--- a/grub-core/fs/btrfs.c --- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c
@@ -218,7 +218,7 @@ struct grub_btrfs_inode @@ -218,7 +218,7 @@ struct grub_btrfs_inode
@ -22,7 +22,7 @@ index 2b21cbaa67e..4cc86e9b79e 100644
struct grub_btrfs_extent_data struct grub_btrfs_extent_data
{ {
diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
index 7a93f43291c..8212697bf6b 100644 index 7a93f43291..8212697bf6 100644
--- a/include/grub/gpt_partition.h --- a/include/grub/gpt_partition.h
+++ b/include/grub/gpt_partition.h +++ b/include/grub/gpt_partition.h
@@ -76,7 +76,7 @@ struct grub_gpt_partentry @@ -76,7 +76,7 @@ struct grub_gpt_partentry

2
SOURCES/0085-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
View File

@ -26,7 +26,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/include/grub/kernel.h b/include/grub/kernel.h diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index 300a9766cda..55849777eaa 100644 index 300a9766cd..55849777ea 100644
--- a/include/grub/kernel.h --- a/include/grub/kernel.h
+++ b/include/grub/kernel.h +++ b/include/grub/kernel.h
@@ -111,8 +111,10 @@ grub_addr_t grub_modules_get_end (void); @@ -111,8 +111,10 @@ grub_addr_t grub_modules_get_end (void);

2
SOURCES/0086-Fixup-for-newer-compiler.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] Fixup for newer compiler
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/Makefile.common b/conf/Makefile.common diff --git a/conf/Makefile.common b/conf/Makefile.common
index 191b1a70c6b..5f0ef969857 100644 index 191b1a70c6..5f0ef96985 100644
--- a/conf/Makefile.common --- a/conf/Makefile.common
+++ b/conf/Makefile.common +++ b/conf/Makefile.common
@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding @@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding

24
SOURCES/0087-Add-support-for-non-Ethernet-network-cards.patch
View File

@ -38,7 +38,7 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
12 files changed, 219 insertions(+), 152 deletions(-) 12 files changed, 219 insertions(+), 152 deletions(-)
diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
index 54306e3b16d..67b409a8acc 100644 index 54306e3b16..67b409a8ac 100644
--- a/grub-core/net/arp.c --- a/grub-core/net/arp.c
+++ b/grub-core/net/arp.c +++ b/grub-core/net/arp.c
@@ -31,22 +31,12 @@ enum @@ -31,22 +31,12 @@ enum
@ -271,7 +271,7 @@ index 54306e3b16d..67b409a8acc 100644
/* Change operation to REPLY and send packet */ /* Change operation to REPLY and send packet */
send_ethernet_packet (inf, &nb_reply, target, GRUB_NET_ETHERTYPE_ARP); send_ethernet_packet (inf, &nb_reply, target, GRUB_NET_ETHERTYPE_ARP);
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
index e28fb6a09f9..08b6b2b5d6c 100644 index e28fb6a09f..08b6b2b5d6 100644
--- a/grub-core/net/bootp.c --- a/grub-core/net/bootp.c
+++ b/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c
@@ -233,7 +233,6 @@ grub_net_configure_by_dhcp_ack (const char *name, @@ -233,7 +233,6 @@ grub_net_configure_by_dhcp_ack (const char *name,
@ -318,7 +318,7 @@ index e28fb6a09f9..08b6b2b5d6c 100644
grub_netbuff_push (nb, sizeof (*udph)); grub_netbuff_push (nb, sizeof (*udph));
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
index 173fb63153c..a673bea807a 100644 index 173fb63153..a673bea807 100644
--- a/grub-core/net/drivers/efi/efinet.c --- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c
@@ -279,6 +279,9 @@ grub_efinet_findcards (void) @@ -279,6 +279,9 @@ grub_efinet_findcards (void)
@ -346,7 +346,7 @@ index 173fb63153c..a673bea807a 100644
card->efi_handle = *handle; card->efi_handle = *handle;
diff --git a/grub-core/net/drivers/emu/emunet.c b/grub-core/net/drivers/emu/emunet.c diff --git a/grub-core/net/drivers/emu/emunet.c b/grub-core/net/drivers/emu/emunet.c
index b194920861f..5b6c5e16a6d 100644 index b194920861..5b6c5e16a6 100644
--- a/grub-core/net/drivers/emu/emunet.c --- a/grub-core/net/drivers/emu/emunet.c
+++ b/grub-core/net/drivers/emu/emunet.c +++ b/grub-core/net/drivers/emu/emunet.c
@@ -46,6 +46,7 @@ static struct grub_net_card emucard = @@ -46,6 +46,7 @@ static struct grub_net_card emucard =
@ -358,7 +358,7 @@ index b194920861f..5b6c5e16a6d 100644
}, },
.flags = 0 .flags = 0
diff --git a/grub-core/net/drivers/i386/pc/pxe.c b/grub-core/net/drivers/i386/pc/pxe.c diff --git a/grub-core/net/drivers/i386/pc/pxe.c b/grub-core/net/drivers/i386/pc/pxe.c
index 3f4152d036c..9f8fb4b6d2b 100644 index 3f4152d036..9f8fb4b6d2 100644
--- a/grub-core/net/drivers/i386/pc/pxe.c --- a/grub-core/net/drivers/i386/pc/pxe.c
+++ b/grub-core/net/drivers/i386/pc/pxe.c +++ b/grub-core/net/drivers/i386/pc/pxe.c
@@ -386,20 +386,21 @@ GRUB_MOD_INIT(pxe) @@ -386,20 +386,21 @@ GRUB_MOD_INIT(pxe)
@ -390,7 +390,7 @@ index 3f4152d036c..9f8fb4b6d2b 100644
grub_pxe_card.default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET; grub_pxe_card.default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
index 3860b6f78d8..bcb3f9ea02d 100644 index 3860b6f78d..bcb3f9ea02 100644
--- a/grub-core/net/drivers/ieee1275/ofnet.c --- a/grub-core/net/drivers/ieee1275/ofnet.c
+++ b/grub-core/net/drivers/ieee1275/ofnet.c +++ b/grub-core/net/drivers/ieee1275/ofnet.c
@@ -160,6 +160,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath, @@ -160,6 +160,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
@ -410,7 +410,7 @@ index 3860b6f78d8..bcb3f9ea02d 100644
card->txbufsize = ALIGN_UP (card->mtu, 64) + 256; card->txbufsize = ALIGN_UP (card->mtu, 64) + 256;
diff --git a/grub-core/net/drivers/uboot/ubootnet.c b/grub-core/net/drivers/uboot/ubootnet.c diff --git a/grub-core/net/drivers/uboot/ubootnet.c b/grub-core/net/drivers/uboot/ubootnet.c
index 056052e40d5..22ebcbf211e 100644 index 056052e40d..22ebcbf211 100644
--- a/grub-core/net/drivers/uboot/ubootnet.c --- a/grub-core/net/drivers/uboot/ubootnet.c
+++ b/grub-core/net/drivers/uboot/ubootnet.c +++ b/grub-core/net/drivers/uboot/ubootnet.c
@@ -131,6 +131,7 @@ GRUB_MOD_INIT (ubootnet) @@ -131,6 +131,7 @@ GRUB_MOD_INIT (ubootnet)
@ -422,7 +422,7 @@ index 056052e40d5..22ebcbf211e 100644
card->txbufsize = ALIGN_UP (card->mtu, 64) + 256; card->txbufsize = ALIGN_UP (card->mtu, 64) + 256;
card->txbuf = grub_zalloc (card->txbufsize); card->txbuf = grub_zalloc (card->txbufsize);
diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c
index 4d7ceed6f93..9aae83a5eb4 100644 index 4d7ceed6f9..9aae83a5eb 100644
--- a/grub-core/net/ethernet.c --- a/grub-core/net/ethernet.c
+++ b/grub-core/net/ethernet.c +++ b/grub-core/net/ethernet.c
@@ -29,13 +29,6 @@ @@ -29,13 +29,6 @@
@ -572,7 +572,7 @@ index 4d7ceed6f93..9aae83a5eb4 100644
{ {
/* ARP packet. */ /* ARP packet. */
diff --git a/grub-core/net/icmp6.c b/grub-core/net/icmp6.c diff --git a/grub-core/net/icmp6.c b/grub-core/net/icmp6.c
index 2cbd95dce25..56a3ec5c8e8 100644 index 2cbd95dce2..56a3ec5c8e 100644
--- a/grub-core/net/icmp6.c --- a/grub-core/net/icmp6.c
+++ b/grub-core/net/icmp6.c +++ b/grub-core/net/icmp6.c
@@ -231,8 +231,9 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb, @@ -231,8 +231,9 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
@ -612,7 +612,7 @@ index 2cbd95dce25..56a3ec5c8e8 100644
} }
if (ohdr->type == OPTION_PREFIX && ohdr->len == 4) if (ohdr->type == OPTION_PREFIX && ohdr->len == 4)
diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
index ea5edf8f1f6..a5896f6dc26 100644 index ea5edf8f1f..a5896f6dc2 100644
--- a/grub-core/net/ip.c --- a/grub-core/net/ip.c
+++ b/grub-core/net/ip.c +++ b/grub-core/net/ip.c
@@ -276,8 +276,8 @@ handle_dgram (struct grub_net_buff *nb, @@ -276,8 +276,8 @@ handle_dgram (struct grub_net_buff *nb,
@ -627,7 +627,7 @@ index ea5edf8f1f6..a5896f6dc26 100644
grub_net_process_dhcp (nb, inf); grub_net_process_dhcp (nb, inf);
grub_netbuff_free (nb); grub_netbuff_free (nb);
diff --git a/grub-core/net/net.c b/grub-core/net/net.c diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index 22f2689aaeb..a46f82362ed 100644 index 22f2689aae..a46f82362e 100644
--- a/grub-core/net/net.c --- a/grub-core/net/net.c
+++ b/grub-core/net/net.c +++ b/grub-core/net/net.c
@@ -133,8 +133,9 @@ grub_net_link_layer_resolve (struct grub_net_network_level_interface *inf, @@ -133,8 +133,9 @@ grub_net_link_layer_resolve (struct grub_net_network_level_interface *inf,
@ -713,7 +713,7 @@ index 22f2689aaeb..a46f82362ed 100644
int int
diff --git a/include/grub/net.h b/include/grub/net.h diff --git a/include/grub/net.h b/include/grub/net.h
index 8a05ec4fe7a..af0404db7e3 100644 index 8a05ec4fe7..af0404db7e 100644
--- a/include/grub/net.h --- a/include/grub/net.h
+++ b/include/grub/net.h +++ b/include/grub/net.h
@@ -29,7 +29,8 @@ @@ -29,7 +29,8 @@

8
SOURCES/0088-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
4 files changed, 109 insertions(+), 12 deletions(-) 4 files changed, 109 insertions(+), 12 deletions(-)
diff --git a/grub-core/net/http.c b/grub-core/net/http.c diff --git a/grub-core/net/http.c b/grub-core/net/http.c
index b616cf40b1e..12a2632ea55 100644 index b616cf40b1..12a2632ea5 100644
--- a/grub-core/net/http.c --- a/grub-core/net/http.c
+++ b/grub-core/net/http.c +++ b/grub-core/net/http.c
@@ -289,7 +289,9 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)), @@ -289,7 +289,9 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)),
@ -87,7 +87,7 @@ index b616cf40b1e..12a2632ea55 100644
file); file);
if (!data->sock) if (!data->sock)
diff --git a/grub-core/net/net.c b/grub-core/net/net.c diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index a46f82362ed..0ce5e675ed7 100644 index a46f82362e..0ce5e675ed 100644
--- a/grub-core/net/net.c --- a/grub-core/net/net.c
+++ b/grub-core/net/net.c +++ b/grub-core/net/net.c
@@ -444,6 +444,13 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest) @@ -444,6 +444,13 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
@ -225,7 +225,7 @@ index a46f82362ed..0ce5e675ed7 100644
} }
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
index 4ab2f5c7357..d54b13f09ff 100644 index 4ab2f5c735..d54b13f09f 100644
--- a/grub-core/net/tftp.c --- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c +++ b/grub-core/net/tftp.c
@@ -295,6 +295,7 @@ tftp_open (struct grub_file *file, const char *filename) @@ -295,6 +295,7 @@ tftp_open (struct grub_file *file, const char *filename)
@ -257,7 +257,7 @@ index 4ab2f5c7357..d54b13f09ff 100644
if (!data->sock) if (!data->sock)
{ {
diff --git a/include/grub/net.h b/include/grub/net.h diff --git a/include/grub/net.h b/include/grub/net.h
index af0404db7e3..d55d505a03a 100644 index af0404db7e..d55d505a03 100644
--- a/include/grub/net.h --- a/include/grub/net.h
+++ b/include/grub/net.h +++ b/include/grub/net.h
@@ -273,6 +273,7 @@ typedef struct grub_net @@ -273,6 +273,7 @@ typedef struct grub_net

10
SOURCES/0089-bootp-New-net_bootp6-command.patch
View File

@ -19,7 +19,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
5 files changed, 1002 insertions(+), 209 deletions(-) 5 files changed, 1002 insertions(+), 209 deletions(-)
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
index 08b6b2b5d6c..fe93b80f1cf 100644 index 08b6b2b5d6..fe93b80f1c 100644
--- a/grub-core/net/bootp.c --- a/grub-core/net/bootp.c
+++ b/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c
@@ -24,6 +24,98 @@ @@ -24,6 +24,98 @@
@ -1136,7 +1136,7 @@ index 08b6b2b5d6c..fe93b80f1cf 100644
grub_unregister_command (cmd_bootp); grub_unregister_command (cmd_bootp);
grub_unregister_command (cmd_dhcp); grub_unregister_command (cmd_dhcp);
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
index a673bea807a..8e25680db0c 100644 index a673bea807..8e25680db0 100644
--- a/grub-core/net/drivers/efi/efinet.c --- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c
@@ -393,9 +393,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, @@ -393,9 +393,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
@ -1174,7 +1174,7 @@ index a673bea807a..8e25680db0c 100644
} }
else else
diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
index a5896f6dc26..ce6bdc75c6d 100644 index a5896f6dc2..ce6bdc75c6 100644
--- a/grub-core/net/ip.c --- a/grub-core/net/ip.c
+++ b/grub-core/net/ip.c +++ b/grub-core/net/ip.c
@@ -239,6 +239,45 @@ handle_dgram (struct grub_net_buff *nb, @@ -239,6 +239,45 @@ handle_dgram (struct grub_net_buff *nb,
@ -1224,7 +1224,7 @@ index a5896f6dc26..ce6bdc75c6d 100644
{ {
const struct grub_net_bootp_packet *bootp; const struct grub_net_bootp_packet *bootp;
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index 99628801478..7614b58dca8 100644 index 9962880147..7614b58dca 100644
--- a/include/grub/efi/api.h --- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h +++ b/include/grub/efi/api.h
@@ -1532,7 +1532,7 @@ typedef struct grub_efi_pxe_ip_filter @@ -1532,7 +1532,7 @@ typedef struct grub_efi_pxe_ip_filter
@ -1237,7 +1237,7 @@ index 99628801478..7614b58dca8 100644
} grub_efi_pxe_ip_filter_t; } grub_efi_pxe_ip_filter_t;
diff --git a/include/grub/net.h b/include/grub/net.h diff --git a/include/grub/net.h b/include/grub/net.h
index d55d505a03a..543251f7273 100644 index d55d505a03..543251f727 100644
--- a/include/grub/net.h --- a/include/grub/net.h
+++ b/include/grub/net.h +++ b/include/grub/net.h
@@ -451,50 +451,65 @@ struct grub_net_bootp_packet @@ -451,50 +451,65 @@ struct grub_net_bootp_packet

4
SOURCES/0090-efinet-UEFI-IPv6-PXE-support.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
2 files changed, 46 insertions(+), 27 deletions(-) 2 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
index 8e25680db0c..014e5bf9802 100644 index 8e25680db0..014e5bf980 100644
--- a/grub-core/net/drivers/efi/efinet.c --- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c
@@ -409,6 +409,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, @@ -409,6 +409,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
@ -28,7 +28,7 @@ index 8e25680db0c..014e5bf9802 100644
else else
{ {
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index 7614b58dca8..91ab528e4d0 100644 index 7614b58dca..91ab528e4d 100644
--- a/include/grub/efi/api.h --- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h +++ b/include/grub/efi/api.h
@@ -1524,31 +1524,6 @@ typedef union @@ -1524,31 +1524,6 @@ typedef union

2
SOURCES/0091-grub.texi-Add-net_bootp6-doument.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
1 file changed, 17 insertions(+) 1 file changed, 17 insertions(+)
diff --git a/docs/grub.texi b/docs/grub.texi diff --git a/docs/grub.texi b/docs/grub.texi
index 0615d0ed97e..04ed6ac1f07 100644 index 0615d0ed97..04ed6ac1f0 100644
--- a/docs/grub.texi --- a/docs/grub.texi
+++ b/docs/grub.texi +++ b/docs/grub.texi
@@ -5487,6 +5487,7 @@ This command is only available on AArch64 systems. @@ -5487,6 +5487,7 @@ This command is only available on AArch64 systems.

4
SOURCES/0092-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
2 files changed, 56 insertions(+) 2 files changed, 56 insertions(+)
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
index fe93b80f1cf..8fb8918ae7e 100644 index fe93b80f1c..8fb8918ae7 100644
--- a/grub-core/net/bootp.c --- a/grub-core/net/bootp.c
+++ b/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
@ -95,7 +95,7 @@ index fe93b80f1cf..8fb8918ae7e 100644
if (opt && opt_len) if (opt && opt_len)
grub_env_set_net_property (name, "extensionspath", (const char *) opt, opt_len); grub_env_set_net_property (name, "extensionspath", (const char *) opt, opt_len);
diff --git a/include/grub/net.h b/include/grub/net.h diff --git a/include/grub/net.h b/include/grub/net.h
index 543251f7273..42af7de250a 100644 index 543251f727..42af7de250 100644
--- a/include/grub/net.h --- a/include/grub/net.h
+++ b/include/grub/net.h +++ b/include/grub/net.h
@@ -531,6 +531,7 @@ enum @@ -531,6 +531,7 @@ enum

4
SOURCES/0093-efinet-Setting-network-from-UEFI-device-path.patch
View File

@ -32,7 +32,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
2 files changed, 280 insertions(+), 15 deletions(-) 2 files changed, 280 insertions(+), 15 deletions(-)
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
index 014e5bf9802..8171ecaa5e4 100644 index 014e5bf980..8171ecaa5e 100644
--- a/grub-core/net/drivers/efi/efinet.c --- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
@ -375,7 +375,7 @@ index 014e5bf9802..8171ecaa5e4 100644
} }
} }
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index 91ab528e4d0..4a51667adb1 100644 index 91ab528e4d..4a51667adb 100644
--- a/include/grub/efi/api.h --- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h +++ b/include/grub/efi/api.h
@@ -864,6 +864,8 @@ struct grub_efi_ipv4_device_path @@ -864,6 +864,8 @@ struct grub_efi_ipv4_device_path

4
SOURCES/0094-efinet-Setting-DNS-server-from-UEFI-protocol.patch
View File

@ -33,7 +33,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
2 files changed, 238 insertions(+) 2 files changed, 238 insertions(+)
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
index 8171ecaa5e4..715a6168d77 100644 index 8171ecaa5e..715a6168d7 100644
--- a/grub-core/net/drivers/efi/efinet.c --- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c
@@ -33,6 +33,8 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -33,6 +33,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
@ -242,7 +242,7 @@ index 8171ecaa5e4..715a6168d77 100644
} }
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index 4a51667adb1..0b490195ad9 100644 index 4a51667adb..0b490195ad 100644
--- a/include/grub/efi/api.h --- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h +++ b/include/grub/efi/api.h
@@ -352,6 +352,15 @@ @@ -352,6 +352,15 @@

34
SOURCES/0095-Support-UEFI-networking-protocols.patch
View File

@ -57,7 +57,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
create mode 100644 include/grub/net/efi.h create mode 100644 include/grub/net/efi.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 4b7c45a7b06..c40170f2dd2 100644 index 4b7c45a7b0..c40170f2dd 100644
--- a/grub-core/Makefile.core.def --- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def
@@ -2299,6 +2299,12 @@ module = { @@ -2299,6 +2299,12 @@ module = {
@ -87,7 +87,7 @@ index 4b7c45a7b06..c40170f2dd2 100644
module = { module = {
diff --git a/grub-core/io/bufio.c b/grub-core/io/bufio.c diff --git a/grub-core/io/bufio.c b/grub-core/io/bufio.c
index a458c3aca78..1637731535e 100644 index a458c3aca7..1637731535 100644
--- a/grub-core/io/bufio.c --- a/grub-core/io/bufio.c
+++ b/grub-core/io/bufio.c +++ b/grub-core/io/bufio.c
@@ -139,7 +139,7 @@ grub_bufio_read (grub_file_t file, char *buf, grub_size_t len) @@ -139,7 +139,7 @@ grub_bufio_read (grub_file_t file, char *buf, grub_size_t len)
@ -100,7 +100,7 @@ index a458c3aca78..1637731535e 100644
if (file->offset + res < next_buf) if (file->offset + res < next_buf)
{ {
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
index d6a2fb57789..2a446f5031b 100644 index d6a2fb5778..2a446f5031 100644
--- a/grub-core/kern/efi/efi.c --- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c
@@ -755,7 +755,7 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp) @@ -755,7 +755,7 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp)
@ -231,7 +231,7 @@ index d6a2fb57789..2a446f5031b 100644
grub_printf ("/UnknownMessaging(%x)", (unsigned) subtype); grub_printf ("/UnknownMessaging(%x)", (unsigned) subtype);
break; break;
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
index 715a6168d77..e11d759f19a 100644 index 715a6168d7..e11d759f19 100644
--- a/grub-core/net/drivers/efi/efinet.c --- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
@ -304,7 +304,7 @@ index 715a6168d77..e11d759f19a 100644
diff --git a/grub-core/net/efi/dhcp.c b/grub-core/net/efi/dhcp.c diff --git a/grub-core/net/efi/dhcp.c b/grub-core/net/efi/dhcp.c
new file mode 100644 new file mode 100644
index 00000000000..dbef63d8c08 index 0000000000..dbef63d8c0
--- /dev/null --- /dev/null
+++ b/grub-core/net/efi/dhcp.c +++ b/grub-core/net/efi/dhcp.c
@@ -0,0 +1,397 @@ @@ -0,0 +1,397 @@
@ -707,7 +707,7 @@ index 00000000000..dbef63d8c08
+grub_command_func_t grub_efi_net_bootp6 = grub_cmd_efi_bootp6; +grub_command_func_t grub_efi_net_bootp6 = grub_cmd_efi_bootp6;
diff --git a/grub-core/net/efi/efi_netfs.c b/grub-core/net/efi/efi_netfs.c diff --git a/grub-core/net/efi/efi_netfs.c b/grub-core/net/efi/efi_netfs.c
new file mode 100644 new file mode 100644
index 00000000000..ef371d885ea index 0000000000..ef371d885e
--- /dev/null --- /dev/null
+++ b/grub-core/net/efi/efi_netfs.c +++ b/grub-core/net/efi/efi_netfs.c
@@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
@ -770,7 +770,7 @@ index 00000000000..ef371d885ea
+} +}
diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
new file mode 100644 new file mode 100644
index 00000000000..3f61fd2fa5b index 0000000000..3f61fd2fa5
--- /dev/null --- /dev/null
+++ b/grub-core/net/efi/http.c +++ b/grub-core/net/efi/http.c
@@ -0,0 +1,419 @@ @@ -0,0 +1,419 @@
@ -1195,7 +1195,7 @@ index 00000000000..3f61fd2fa5b
+ }; + };
diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c
new file mode 100644 new file mode 100644
index 00000000000..b711a5d9457 index 0000000000..b711a5d945
--- /dev/null --- /dev/null
+++ b/grub-core/net/efi/ip4_config.c +++ b/grub-core/net/efi/ip4_config.c
@@ -0,0 +1,398 @@ @@ -0,0 +1,398 @@
@ -1599,7 +1599,7 @@ index 00000000000..b711a5d9457
+ }; + };
diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c
new file mode 100644 new file mode 100644
index 00000000000..017c4d05bc7 index 0000000000..017c4d05bc
--- /dev/null --- /dev/null
+++ b/grub-core/net/efi/ip6_config.c +++ b/grub-core/net/efi/ip6_config.c
@@ -0,0 +1,422 @@ @@ -0,0 +1,422 @@
@ -2027,7 +2027,7 @@ index 00000000000..017c4d05bc7
+ }; + };
diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
new file mode 100644 new file mode 100644
index 00000000000..86bce6535d3 index 0000000000..86bce6535d
--- /dev/null --- /dev/null
+++ b/grub-core/net/efi/net.c +++ b/grub-core/net/efi/net.c
@@ -0,0 +1,1428 @@ @@ -0,0 +1,1428 @@
@ -3461,7 +3461,7 @@ index 00000000000..86bce6535d3
+} +}
diff --git a/grub-core/net/efi/pxe.c b/grub-core/net/efi/pxe.c diff --git a/grub-core/net/efi/pxe.c b/grub-core/net/efi/pxe.c
new file mode 100644 new file mode 100644
index 00000000000..531949cba5c index 0000000000..531949cba5
--- /dev/null --- /dev/null
+++ b/grub-core/net/efi/pxe.c +++ b/grub-core/net/efi/pxe.c
@@ -0,0 +1,424 @@ @@ -0,0 +1,424 @@
@ -3890,7 +3890,7 @@ index 00000000000..531949cba5c
+ }; + };
+ +
diff --git a/grub-core/net/net.c b/grub-core/net/net.c diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index 0ce5e675ed7..55aed92722c 100644 index 0ce5e675ed..55aed92722 100644
--- a/grub-core/net/net.c --- a/grub-core/net/net.c
+++ b/grub-core/net/net.c +++ b/grub-core/net/net.c
@@ -32,6 +32,9 @@ @@ -32,6 +32,9 @@
@ -4000,7 +4000,7 @@ index 0ce5e675ed7..55aed92722c 100644
+#endif +#endif
} }
diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c
index a2461cda1c4..77958dd9dd5 100644 index a2461cda1c..77958dd9dd 100644
--- a/util/grub-mknetdir.c --- a/util/grub-mknetdir.c
+++ b/util/grub-mknetdir.c +++ b/util/grub-mknetdir.c
@@ -32,13 +32,15 @@ @@ -32,13 +32,15 @@
@ -4082,7 +4082,7 @@ index a2461cda1c4..77958dd9dd5 100644
if (!grub_install_source_directory) if (!grub_install_source_directory)
{ {
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index 0b490195ad9..f431f49973e 100644 index 0b490195ad..f431f49973 100644
--- a/include/grub/efi/api.h --- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h +++ b/include/grub/efi/api.h
@@ -622,6 +622,23 @@ typedef union @@ -622,6 +622,23 @@ typedef union
@ -4333,7 +4333,7 @@ index 0b490195ad9..f431f49973e 100644
|| defined(__riscv) || defined(__riscv)
diff --git a/include/grub/efi/dhcp.h b/include/grub/efi/dhcp.h diff --git a/include/grub/efi/dhcp.h b/include/grub/efi/dhcp.h
new file mode 100644 new file mode 100644
index 00000000000..fdb88eb810e index 0000000000..fdb88eb810
--- /dev/null --- /dev/null
+++ b/include/grub/efi/dhcp.h +++ b/include/grub/efi/dhcp.h
@@ -0,0 +1,343 @@ @@ -0,0 +1,343 @@
@ -4682,7 +4682,7 @@ index 00000000000..fdb88eb810e
+#endif /* ! GRUB_EFI_DHCP_HEADER */ +#endif /* ! GRUB_EFI_DHCP_HEADER */
diff --git a/include/grub/efi/http.h b/include/grub/efi/http.h diff --git a/include/grub/efi/http.h b/include/grub/efi/http.h
new file mode 100644 new file mode 100644
index 00000000000..c5e9a89f505 index 0000000000..c5e9a89f50
--- /dev/null --- /dev/null
+++ b/include/grub/efi/http.h +++ b/include/grub/efi/http.h
@@ -0,0 +1,215 @@ @@ -0,0 +1,215 @@
@ -4903,7 +4903,7 @@ index 00000000000..c5e9a89f505
+#endif /* !GRUB_EFI_HTTP_HEADER */ +#endif /* !GRUB_EFI_HTTP_HEADER */
diff --git a/include/grub/net/efi.h b/include/grub/net/efi.h diff --git a/include/grub/net/efi.h b/include/grub/net/efi.h
new file mode 100644 new file mode 100644
index 00000000000..de90d223e8e index 0000000000..de90d223e8
--- /dev/null --- /dev/null
+++ b/include/grub/net/efi.h +++ b/include/grub/net/efi.h
@@ -0,0 +1,144 @@ @@ -0,0 +1,144 @@

4
SOURCES/0096-AUDIT-0-http-boot-tracker-bug.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: Michael Chang <mchang@suse.com>
2 files changed, 7 insertions(+), 2 deletions(-) 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
index 86bce6535d3..4bb308026ce 100644 index 86bce6535d..4bb308026c 100644
--- a/grub-core/net/efi/net.c --- a/grub-core/net/efi/net.c
+++ b/grub-core/net/efi/net.c +++ b/grub-core/net/efi/net.c
@@ -645,8 +645,10 @@ grub_efihttp_chunk_read (grub_file_t file, char *buf, @@ -645,8 +645,10 @@ grub_efihttp_chunk_read (grub_file_t file, char *buf,
@ -38,7 +38,7 @@ index 86bce6535d3..4bb308026ce 100644
if (buf) if (buf)
{ {
diff --git a/grub-core/net/http.c b/grub-core/net/http.c diff --git a/grub-core/net/http.c b/grub-core/net/http.c
index 12a2632ea55..b52b558d631 100644 index 12a2632ea5..b52b558d63 100644
--- a/grub-core/net/http.c --- a/grub-core/net/http.c
+++ b/grub-core/net/http.c +++ b/grub-core/net/http.c
@@ -31,7 +31,8 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -31,7 +31,8 @@ GRUB_MOD_LICENSE ("GPLv3+");

2
SOURCES/0097-grub-editenv-Add-incr-command-to-increment-integer-v.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 file changed, 50 insertions(+) 1 file changed, 50 insertions(+)
diff --git a/util/grub-editenv.c b/util/grub-editenv.c diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index db6f187cc63..948eec8a114 100644 index db6f187cc6..948eec8a11 100644
--- a/util/grub-editenv.c --- a/util/grub-editenv.c
+++ b/util/grub-editenv.c +++ b/util/grub-editenv.c
@@ -53,6 +53,9 @@ static struct argp_option options[] = { @@ -53,6 +53,9 @@ static struct argp_option options[] = {

6
SOURCES/0098-Add-auto-hide-menu-support.patch
View File

@ -49,7 +49,7 @@ Changes in v2:
create mode 100644 util/grub.d/01_menu_auto_hide.in create mode 100644 util/grub.d/01_menu_auto_hide.in
diff --git a/Makefile.util.def b/Makefile.util.def diff --git a/Makefile.util.def b/Makefile.util.def
index 41906486a71..04551e095bd 100644 index 41906486a7..04551e095b 100644
--- a/Makefile.util.def --- a/Makefile.util.def
+++ b/Makefile.util.def +++ b/Makefile.util.def
@@ -458,6 +458,12 @@ script = { @@ -458,6 +458,12 @@ script = {
@ -67,7 +67,7 @@ index 41906486a71..04551e095bd 100644
common = util/grub.d/01_users.in; common = util/grub.d/01_users.in;
diff --git a/util/grub.d/01_menu_auto_hide.in b/util/grub.d/01_menu_auto_hide.in diff --git a/util/grub.d/01_menu_auto_hide.in b/util/grub.d/01_menu_auto_hide.in
new file mode 100644 new file mode 100644
index 00000000000..ad175870a54 index 0000000000..ad175870a5
--- /dev/null --- /dev/null
+++ b/util/grub.d/01_menu_auto_hide.in +++ b/util/grub.d/01_menu_auto_hide.in
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
@ -120,7 +120,7 @@ index 00000000000..ad175870a54
+fi +fi
+EOF +EOF
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 4b27bd20153..3c9431cfcfb 100644 index 4b27bd2015..3c9431cfcf 100644
--- a/util/grub.d/30_os-prober.in --- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in
@@ -42,6 +42,7 @@ if [ -z "${OSPROBED}" ] ; then @@ -42,6 +42,7 @@ if [ -z "${OSPROBED}" ] ; then

12
SOURCES/0099-Add-grub-set-bootflag-utility.patch
View File

@ -45,7 +45,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
create mode 100644 util/grub-set-bootflag.1 create mode 100644 util/grub-set-bootflag.1
diff --git a/Makefile.util.def b/Makefile.util.def diff --git a/Makefile.util.def b/Makefile.util.def
index 04551e095bd..c6375933faa 100644 index 04551e095b..c6375933fa 100644
--- a/Makefile.util.def --- a/Makefile.util.def
+++ b/Makefile.util.def +++ b/Makefile.util.def
@@ -1445,3 +1445,10 @@ program = { @@ -1445,3 +1445,10 @@ program = {
@ -61,7 +61,7 @@ index 04551e095bd..c6375933faa 100644
+}; +};
diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c
new file mode 100644 new file mode 100644
index 00000000000..bb198f02351 index 0000000000..bb198f0235
--- /dev/null --- /dev/null
+++ b/util/grub-set-bootflag.c +++ b/util/grub-set-bootflag.c
@@ -0,0 +1,160 @@ @@ -0,0 +1,160 @@
@ -226,7 +226,7 @@ index 00000000000..bb198f02351
+ return 0; + return 0;
+} +}
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index b909f2c073a..ea58362b555 100644 index b909f2c073..ea58362b55 100644
--- a/conf/Makefile.extra-dist --- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist +++ b/conf/Makefile.extra-dist
@@ -14,6 +14,9 @@ EXTRA_DIST += util/import_unicode.py @@ -14,6 +14,9 @@ EXTRA_DIST += util/import_unicode.py
@ -241,7 +241,7 @@ index b909f2c073a..ea58362b555 100644
diff --git a/docs/grub-boot-success.service b/docs/grub-boot-success.service diff --git a/docs/grub-boot-success.service b/docs/grub-boot-success.service
new file mode 100644 new file mode 100644
index 00000000000..80e79584c91 index 0000000000..80e79584c9
--- /dev/null --- /dev/null
+++ b/docs/grub-boot-success.service +++ b/docs/grub-boot-success.service
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
@ -253,7 +253,7 @@ index 00000000000..80e79584c91
+ExecStart=/usr/sbin/grub2-set-bootflag boot_success +ExecStart=/usr/sbin/grub2-set-bootflag boot_success
diff --git a/docs/grub-boot-success.timer b/docs/grub-boot-success.timer diff --git a/docs/grub-boot-success.timer b/docs/grub-boot-success.timer
new file mode 100644 new file mode 100644
index 00000000000..5d8fcba21aa index 0000000000..5d8fcba21a
--- /dev/null --- /dev/null
+++ b/docs/grub-boot-success.timer +++ b/docs/grub-boot-success.timer
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
@ -265,7 +265,7 @@ index 00000000000..5d8fcba21aa
+OnActiveSec=2min +OnActiveSec=2min
diff --git a/util/grub-set-bootflag.1 b/util/grub-set-bootflag.1 diff --git a/util/grub-set-bootflag.1 b/util/grub-set-bootflag.1
new file mode 100644 new file mode 100644
index 00000000000..57801da22a0 index 0000000000..57801da22a
--- /dev/null --- /dev/null
+++ b/util/grub-set-bootflag.1 +++ b/util/grub-set-bootflag.1
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@

2
SOURCES/0100-docs-Add-grub-boot-indeterminate.service-example.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
diff --git a/docs/grub-boot-indeterminate.service b/docs/grub-boot-indeterminate.service diff --git a/docs/grub-boot-indeterminate.service b/docs/grub-boot-indeterminate.service
new file mode 100644 new file mode 100644
index 00000000000..6c8dcb186b6 index 0000000000..6c8dcb186b
--- /dev/null --- /dev/null
+++ b/docs/grub-boot-indeterminate.service +++ b/docs/grub-boot-indeterminate.service
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@

Some files were not shown because too many files have changed in this diff Show More