diff --git a/0153-grub-setup-Debug-message-cleanup.patch b/0153-grub-setup-Debug-message-cleanup.patch new file mode 100644 index 0000000..7a58522 --- /dev/null +++ b/0153-grub-setup-Debug-message-cleanup.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cao jin +Date: Tue, 3 Jul 2018 18:51:13 +0800 +Subject: [PATCH] grub-setup: Debug message cleanup + +Variable "root" is initialized after root device probing and is null in +current place, so, drop it. + +Signed-off-by: Cao jin +Reviewed-by: Daniel Kiper +--- + util/setup.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/util/setup.c b/util/setup.c +index 80363075d34..9c1e1b7da6a 100644 +--- a/util/setup.c ++++ b/util/setup.c +@@ -305,9 +305,8 @@ SETUP (const char *dir, + bl.first_block = (struct grub_boot_blocklist *) (core_img + + GRUB_DISK_SECTOR_SIZE + - sizeof (*bl.block)); +- grub_util_info ("root is `%s', dest is `%s'", root, dest); + +- grub_util_info ("Opening dest"); ++ grub_util_info ("Opening dest `%s'", dest); + dest_dev = grub_device_open (dest); + if (! dest_dev) + grub_util_error ("%s", grub_errmsg); diff --git a/0369-EFI-console-Fix-the-enter-key-not-working-on-X86-tab.patch b/0154-efi-console-Fix-the-enter-key-not-working-on-x86-tab.patch similarity index 83% rename from 0369-EFI-console-Fix-the-enter-key-not-working-on-X86-tab.patch rename to 0154-efi-console-Fix-the-enter-key-not-working-on-x86-tab.patch index d434d3c..222f403 100644 --- a/0369-EFI-console-Fix-the-enter-key-not-working-on-X86-tab.patch +++ b/0154-efi-console-Fix-the-enter-key-not-working-on-x86-tab.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Hans de Goede -Date: Tue, 26 Jun 2018 20:05:32 +0200 -Subject: [PATCH] EFI: console: Fix the "enter" key not working on X86 tablets +Date: Tue, 26 Jun 2018 20:15:01 +0200 +Subject: [PATCH] efi/console: Fix the "enter" key not working on x86 tablets Most 8" or 7" x86 Windows 10 tablets come with volume up/down buttons and a power-button. In their UEFI these are almost always mapped to arrow @@ -22,19 +22,20 @@ This fixes things getting stuck at the grub-menu and allows the user to choice a grub-menu entry using the buttons on the tablet. Signed-off-by: Hans de Goede +Reviewed-by: Daniel Kiper --- grub-core/term/efi/console.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c -index a5abaf8e722..59786e30d66 100644 +index 02f64ea7441..4840cc59d3f 100644 --- a/grub-core/term/efi/console.c +++ b/grub-core/term/efi/console.c -@@ -127,6 +127,9 @@ grub_efi_translate_key (grub_efi_input_key_t key) +@@ -122,6 +122,9 @@ grub_efi_translate_key (grub_efi_input_key_t key) else return key.unicode_char; } -+ /* Some devices send enter with scan_code 0x0d (F3) and unicode_char 0x0d */ ++ /* Some devices send enter with scan_code 0x0d (F3) and unicode_char 0x0d. */ + else if (key.scan_code == '\r' && key.unicode_char == '\r') + return key.unicode_char; else if (key.scan_code < ARRAY_SIZE (efi_codes)) diff --git a/0155-commands-file-Use-definitions-from-arm-linux.h.patch b/0155-commands-file-Use-definitions-from-arm-linux.h.patch new file mode 100644 index 0000000..8350f24 --- /dev/null +++ b/0155-commands-file-Use-definitions-from-arm-linux.h.patch @@ -0,0 +1,55 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Leif Lindholm +Date: Mon, 25 Jun 2018 18:01:28 +0100 +Subject: [PATCH] commands/file: Use definitions from arm/linux.h + +Clean up code for matching IS_ARM slightly by making use of struct +linux_arm_kernel_header and GRUB_LINUX_ARM_MAGIC_SIGNATURE. + +Signed-off-by: Leif Lindholm +Reviewed-by: Daniel Kiper +--- + grub-core/commands/file.c | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +diff --git a/grub-core/commands/file.c b/grub-core/commands/file.c +index 63c84499bab..ab0c9fb9694 100644 +--- a/grub-core/commands/file.c ++++ b/grub-core/commands/file.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -383,21 +384,19 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args) + } + case IS_ARM_LINUX: + { +- grub_uint32_t sig, sig_pi; +- if (grub_file_read (file, &sig_pi, 4) != 4) ++ struct linux_arm_kernel_header lh; ++ ++ if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh)) + break; +- /* Raspberry pi. */ +- if (sig_pi == grub_cpu_to_le32_compile_time (0xea000006)) ++ /* Short forward branch in A32 state (for Raspberry pi kernels). */ ++ if (lh.code0 == grub_cpu_to_le32_compile_time (0xea000006)) + { + ret = 1; + break; + } + +- if (grub_file_seek (file, 0x24) == (grub_size_t) -1) +- break; +- if (grub_file_read (file, &sig, 4) != 4) +- break; +- if (sig == grub_cpu_to_le32_compile_time (0x016f2818)) ++ if (lh.magic == ++ grub_cpu_to_le32_compile_time (GRUB_LINUX_ARM_MAGIC_SIGNATURE)) + { + ret = 1; + break; diff --git a/0156-commands-file-Use-definitions-from-arm64-linux.h.patch b/0156-commands-file-Use-definitions-from-arm64-linux.h.patch new file mode 100644 index 0000000..5ee71bc --- /dev/null +++ b/0156-commands-file-Use-definitions-from-arm64-linux.h.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Leif Lindholm +Date: Mon, 25 Jun 2018 18:01:29 +0100 +Subject: [PATCH] commands/file: Use definitions from arm64/linux.h + +Clean up code for matching IS_ARM64 slightly by making use of struct +linux_arm64_kernel_header and GRUB_LINUX_ARM64_MAGIC_SIGNATURE. + +Signed-off-by: Leif Lindholm +Reviewed-by: Daniel Kiper +--- + grub-core/commands/file.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/grub-core/commands/file.c b/grub-core/commands/file.c +index ab0c9fb9694..3ff6d5522d2 100644 +--- a/grub-core/commands/file.c ++++ b/grub-core/commands/file.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -405,13 +406,13 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args) + } + case IS_ARM64_LINUX: + { +- grub_uint32_t sig; ++ struct linux_arm64_kernel_header lh; + +- if (grub_file_seek (file, 0x38) == (grub_size_t) -1) ++ if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh)) + break; +- if (grub_file_read (file, &sig, 4) != 4) +- break; +- if (sig == grub_cpu_to_le32_compile_time (0x644d5241)) ++ ++ if (lh.magic == ++ grub_cpu_to_le32_compile_time (GRUB_LINUX_ARM64_MAGIC_SIGNATURE)) + { + ret = 1; + break; diff --git a/0153-re-write-.gitignore.patch b/0157-re-write-.gitignore.patch similarity index 100% rename from 0153-re-write-.gitignore.patch rename to 0157-re-write-.gitignore.patch diff --git a/0154-IBM-client-architecture-CAS-reboot-support.patch b/0158-IBM-client-architecture-CAS-reboot-support.patch similarity index 100% rename from 0154-IBM-client-architecture-CAS-reboot-support.patch rename to 0158-IBM-client-architecture-CAS-reboot-support.patch diff --git a/0155-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0159-for-ppc-reset-console-display-attr-when-clear-screen.patch similarity index 100% rename from 0155-for-ppc-reset-console-display-attr-when-clear-screen.patch rename to 0159-for-ppc-reset-console-display-attr-when-clear-screen.patch diff --git a/0156-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0160-Disable-GRUB-video-support-for-IBM-power-machines.patch similarity index 100% rename from 0156-Disable-GRUB-video-support-for-IBM-power-machines.patch rename to 0160-Disable-GRUB-video-support-for-IBM-power-machines.patch diff --git a/0157-Honor-a-symlink-when-generating-configuration-by-gru.patch b/0161-Honor-a-symlink-when-generating-configuration-by-gru.patch similarity index 100% rename from 0157-Honor-a-symlink-when-generating-configuration-by-gru.patch rename to 0161-Honor-a-symlink-when-generating-configuration-by-gru.patch diff --git a/0158-Move-bash-completion-script-922997.patch b/0162-Move-bash-completion-script-922997.patch similarity index 100% rename from 0158-Move-bash-completion-script-922997.patch rename to 0162-Move-bash-completion-script-922997.patch diff --git a/0159-Update-to-minilzo-2.08.patch b/0163-Update-to-minilzo-2.08.patch similarity index 100% rename from 0159-Update-to-minilzo-2.08.patch rename to 0163-Update-to-minilzo-2.08.patch diff --git a/0160-Allow-fallback-to-include-entries-by-title-not-just-.patch b/0164-Allow-fallback-to-include-entries-by-title-not-just-.patch similarity index 100% rename from 0160-Allow-fallback-to-include-entries-by-title-not-just-.patch rename to 0164-Allow-fallback-to-include-entries-by-title-not-just-.patch diff --git a/0161-Add-GRUB_DISABLE_UUID.patch b/0165-Add-GRUB_DISABLE_UUID.patch similarity index 100% rename from 0161-Add-GRUB_DISABLE_UUID.patch rename to 0165-Add-GRUB_DISABLE_UUID.patch diff --git a/0162-Make-exit-take-a-return-code.patch b/0166-Make-exit-take-a-return-code.patch similarity index 100% rename from 0162-Make-exit-take-a-return-code.patch rename to 0166-Make-exit-take-a-return-code.patch diff --git a/0163-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch b/0167-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch similarity index 100% rename from 0163-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch rename to 0167-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch diff --git a/0164-Make-efi-machines-load-an-env-block-from-a-variable.patch b/0168-Make-efi-machines-load-an-env-block-from-a-variable.patch similarity index 100% rename from 0164-Make-efi-machines-load-an-env-block-from-a-variable.patch rename to 0168-Make-efi-machines-load-an-env-block-from-a-variable.patch diff --git a/0165-DHCP-client-ID-and-UUID-options-added.patch b/0169-DHCP-client-ID-and-UUID-options-added.patch similarity index 100% rename from 0165-DHCP-client-ID-and-UUID-options-added.patch rename to 0169-DHCP-client-ID-and-UUID-options-added.patch diff --git a/0166-trim-arp-packets-with-abnormal-size.patch b/0170-trim-arp-packets-with-abnormal-size.patch similarity index 100% rename from 0166-trim-arp-packets-with-abnormal-size.patch rename to 0170-trim-arp-packets-with-abnormal-size.patch diff --git a/0167-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch b/0171-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch similarity index 100% rename from 0167-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch rename to 0171-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch diff --git a/0168-Add-support-for-UEFI-operating-systems-returned-by-o.patch b/0172-Add-support-for-UEFI-operating-systems-returned-by-o.patch similarity index 100% rename from 0168-Add-support-for-UEFI-operating-systems-returned-by-o.patch rename to 0172-Add-support-for-UEFI-operating-systems-returned-by-o.patch diff --git a/0169-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0173-Migrate-PPC-from-Yaboot-to-Grub2.patch similarity index 100% rename from 0169-Migrate-PPC-from-Yaboot-to-Grub2.patch rename to 0173-Migrate-PPC-from-Yaboot-to-Grub2.patch diff --git a/0170-Add-fw_path-variable-revised.patch b/0174-Add-fw_path-variable-revised.patch similarity index 100% rename from 0170-Add-fw_path-variable-revised.patch rename to 0174-Add-fw_path-variable-revised.patch diff --git a/0171-Add-support-for-linuxefi.patch b/0175-Add-support-for-linuxefi.patch similarity index 100% rename from 0171-Add-support-for-linuxefi.patch rename to 0175-Add-support-for-linuxefi.patch diff --git a/0172-Use-linuxefi-and-initrdefi-where-appropriate.patch b/0176-Use-linuxefi-and-initrdefi-where-appropriate.patch similarity index 100% rename from 0172-Use-linuxefi-and-initrdefi-where-appropriate.patch rename to 0176-Use-linuxefi-and-initrdefi-where-appropriate.patch diff --git a/0173-Don-t-allow-insmod-when-secure-boot-is-enabled.patch b/0177-Don-t-allow-insmod-when-secure-boot-is-enabled.patch similarity index 100% rename from 0173-Don-t-allow-insmod-when-secure-boot-is-enabled.patch rename to 0177-Don-t-allow-insmod-when-secure-boot-is-enabled.patch diff --git a/0174-Pass-x-hex-hex-straight-through-unmolested.patch b/0178-Pass-x-hex-hex-straight-through-unmolested.patch similarity index 100% rename from 0174-Pass-x-hex-hex-straight-through-unmolested.patch rename to 0178-Pass-x-hex-hex-straight-through-unmolested.patch diff --git a/0175-Add-X-option-to-printf-functions.patch b/0179-Add-X-option-to-printf-functions.patch similarity index 100% rename from 0175-Add-X-option-to-printf-functions.patch rename to 0179-Add-X-option-to-printf-functions.patch diff --git a/0176-Search-for-specific-config-file-for-netboot.patch b/0180-Search-for-specific-config-file-for-netboot.patch similarity index 100% rename from 0176-Search-for-specific-config-file-for-netboot.patch rename to 0180-Search-for-specific-config-file-for-netboot.patch diff --git a/0177-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0181-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch similarity index 100% rename from 0177-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch rename to 0181-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch diff --git a/0178-Don-t-write-messages-to-the-screen.patch b/0182-Don-t-write-messages-to-the-screen.patch similarity index 100% rename from 0178-Don-t-write-messages-to-the-screen.patch rename to 0182-Don-t-write-messages-to-the-screen.patch diff --git a/0179-Don-t-print-GNU-GRUB-header.patch b/0183-Don-t-print-GNU-GRUB-header.patch similarity index 100% rename from 0179-Don-t-print-GNU-GRUB-header.patch rename to 0183-Don-t-print-GNU-GRUB-header.patch diff --git a/0180-Don-t-add-to-highlighted-row.patch b/0184-Don-t-add-to-highlighted-row.patch similarity index 100% rename from 0180-Don-t-add-to-highlighted-row.patch rename to 0184-Don-t-add-to-highlighted-row.patch diff --git a/0181-Message-string-cleanups.patch b/0185-Message-string-cleanups.patch similarity index 100% rename from 0181-Message-string-cleanups.patch rename to 0185-Message-string-cleanups.patch diff --git a/0182-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch b/0186-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch similarity index 100% rename from 0182-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch rename to 0186-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch diff --git a/0183-Use-the-correct-indentation-for-the-term-help-text.patch b/0187-Use-the-correct-indentation-for-the-term-help-text.patch similarity index 100% rename from 0183-Use-the-correct-indentation-for-the-term-help-text.patch rename to 0187-Use-the-correct-indentation-for-the-term-help-text.patch diff --git a/0184-Indent-menu-entries.patch b/0188-Indent-menu-entries.patch similarity index 100% rename from 0184-Indent-menu-entries.patch rename to 0188-Indent-menu-entries.patch diff --git a/0185-Fix-margins.patch b/0189-Fix-margins.patch similarity index 100% rename from 0185-Fix-margins.patch rename to 0189-Fix-margins.patch diff --git a/0186-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch b/0190-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch similarity index 100% rename from 0186-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch rename to 0190-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch diff --git a/0187-Use-linux16-when-appropriate-880840.patch b/0191-Use-linux16-when-appropriate-880840.patch similarity index 100% rename from 0187-Use-linux16-when-appropriate-880840.patch rename to 0191-Use-linux16-when-appropriate-880840.patch diff --git a/0188-Enable-pager-by-default.-985860.patch b/0192-Enable-pager-by-default.-985860.patch similarity index 100% rename from 0188-Enable-pager-by-default.-985860.patch rename to 0192-Enable-pager-by-default.-985860.patch diff --git a/0189-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch b/0193-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch similarity index 100% rename from 0189-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch rename to 0193-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch diff --git a/0190-Don-t-say-GNU-Linux-in-generated-menus.patch b/0194-Don-t-say-GNU-Linux-in-generated-menus.patch similarity index 100% rename from 0190-Don-t-say-GNU-Linux-in-generated-menus.patch rename to 0194-Don-t-say-GNU-Linux-in-generated-menus.patch diff --git a/0191-Don-t-draw-a-border-around-the-menu.patch b/0195-Don-t-draw-a-border-around-the-menu.patch similarity index 100% rename from 0191-Don-t-draw-a-border-around-the-menu.patch rename to 0195-Don-t-draw-a-border-around-the-menu.patch diff --git a/0192-Use-the-standard-margin-for-the-timeout-string.patch b/0196-Use-the-standard-margin-for-the-timeout-string.patch similarity index 100% rename from 0192-Use-the-standard-margin-for-the-timeout-string.patch rename to 0196-Use-the-standard-margin-for-the-timeout-string.patch diff --git a/0193-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0197-Add-.eh_frame-to-list-of-relocations-stripped.patch similarity index 100% rename from 0193-Add-.eh_frame-to-list-of-relocations-stripped.patch rename to 0197-Add-.eh_frame-to-list-of-relocations-stripped.patch diff --git a/0194-Make-10_linux-work-with-our-changes-for-linux16-and-.patch b/0198-Make-10_linux-work-with-our-changes-for-linux16-and-.patch similarity index 100% rename from 0194-Make-10_linux-work-with-our-changes-for-linux16-and-.patch rename to 0198-Make-10_linux-work-with-our-changes-for-linux16-and-.patch diff --git a/0195-Don-t-print-during-fdt-loading-method.patch b/0199-Don-t-print-during-fdt-loading-method.patch similarity index 100% rename from 0195-Don-t-print-during-fdt-loading-method.patch rename to 0199-Don-t-print-during-fdt-loading-method.patch diff --git a/0196-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch b/0200-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch similarity index 100% rename from 0196-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch rename to 0200-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch diff --git a/0197-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0201-Don-t-require-a-password-to-boot-entries-generated-b.patch similarity index 100% rename from 0197-Don-t-require-a-password-to-boot-entries-generated-b.patch rename to 0201-Don-t-require-a-password-to-boot-entries-generated-b.patch diff --git a/0198-Don-t-emit-Booting-.-message.patch b/0202-Don-t-emit-Booting-.-message.patch similarity index 100% rename from 0198-Don-t-emit-Booting-.-message.patch rename to 0202-Don-t-emit-Booting-.-message.patch diff --git a/0199-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch b/0203-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch similarity index 100% rename from 0199-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch rename to 0203-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch diff --git a/0200-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0204-use-fw_path-prefix-when-fallback-searching-for-grub-.patch similarity index 100% rename from 0200-use-fw_path-prefix-when-fallback-searching-for-grub-.patch rename to 0204-use-fw_path-prefix-when-fallback-searching-for-grub-.patch diff --git a/0201-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0205-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch similarity index 100% rename from 0201-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch rename to 0205-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch diff --git a/0202-Fix-convert-function-to-support-NVMe-devices.patch b/0206-Fix-convert-function-to-support-NVMe-devices.patch similarity index 100% rename from 0202-Fix-convert-function-to-support-NVMe-devices.patch rename to 0206-Fix-convert-function-to-support-NVMe-devices.patch diff --git a/0203-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch b/0207-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch similarity index 100% rename from 0203-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch rename to 0207-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch diff --git a/0204-Use-the-default-device-tree-from-the-grub-default-fi.patch b/0208-Use-the-default-device-tree-from-the-grub-default-fi.patch similarity index 100% rename from 0204-Use-the-default-device-tree-from-the-grub-default-fi.patch rename to 0208-Use-the-default-device-tree-from-the-grub-default-fi.patch diff --git a/0205-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0209-reopen-SNP-protocol-for-exclusive-use-by-grub.patch similarity index 100% rename from 0205-reopen-SNP-protocol-for-exclusive-use-by-grub.patch rename to 0209-reopen-SNP-protocol-for-exclusive-use-by-grub.patch diff --git a/0206-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0210-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch similarity index 100% rename from 0206-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch rename to 0210-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch diff --git a/0207-Add-grub_util_readlink.patch b/0211-Add-grub_util_readlink.patch similarity index 100% rename from 0207-Add-grub_util_readlink.patch rename to 0211-Add-grub_util_readlink.patch diff --git a/0208-Make-editenv-chase-symlinks-including-those-across-d.patch b/0212-Make-editenv-chase-symlinks-including-those-across-d.patch similarity index 100% rename from 0208-Make-editenv-chase-symlinks-including-those-across-d.patch rename to 0212-Make-editenv-chase-symlinks-including-those-across-d.patch diff --git a/0209-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0213-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch similarity index 100% rename from 0209-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch rename to 0213-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch diff --git a/0210-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0214-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch similarity index 100% rename from 0210-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch rename to 0214-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch diff --git a/0211-Load-arm-with-SB-enabled.patch b/0215-Load-arm-with-SB-enabled.patch similarity index 100% rename from 0211-Load-arm-with-SB-enabled.patch rename to 0215-Load-arm-with-SB-enabled.patch diff --git a/0212-Try-prefix-if-fw_path-doesn-t-work.patch b/0216-Try-prefix-if-fw_path-doesn-t-work.patch similarity index 100% rename from 0212-Try-prefix-if-fw_path-doesn-t-work.patch rename to 0216-Try-prefix-if-fw_path-doesn-t-work.patch diff --git a/0213-Update-info-with-grub.cfg-netboot-selection-order-11.patch b/0217-Update-info-with-grub.cfg-netboot-selection-order-11.patch similarity index 100% rename from 0213-Update-info-with-grub.cfg-netboot-selection-order-11.patch rename to 0217-Update-info-with-grub.cfg-netboot-selection-order-11.patch diff --git a/0214-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch b/0218-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch similarity index 100% rename from 0214-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch rename to 0218-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch diff --git a/0215-Handle-rssd-storage-devices.patch b/0219-Handle-rssd-storage-devices.patch similarity index 100% rename from 0215-Handle-rssd-storage-devices.patch rename to 0219-Handle-rssd-storage-devices.patch diff --git a/0219-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0219-Make-grub2-mkconfig-construct-titles-that-look-like-.patch deleted file mode 100644 index c9b0c21..0000000 --- a/0219-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Tue, 28 Apr 2015 11:15:03 -0400 -Subject: [PATCH] Make grub2-mkconfig construct titles that look like the ones - we want elsewhere. - -Resolves: rhbz#1215839 - -Signed-off-by: Peter Jones ---- - util/grub.d/10_linux.in | 32 ++++++++++++++++++++++---------- - 1 file changed, 22 insertions(+), 10 deletions(-) - -diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index a05be9d3047..4ad98fbd767 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -80,11 +80,28 @@ esac - - mktitle () - { -- local OS_NAME="$(eval $(grep ^NAME= /etc/os-release) ; echo ${NAME})" -- local OS_VERS="$(eval $(grep ^VERSION= /etc/os-release) ; echo ${VERSION})" -+ local title_type -+ local version -+ local OS_NAME -+ local OS_VERS - -- local titlestr="${OS_NAME} (%s) ${OS_VERS}" -- echo -n ${titlestr} -+ title_type=$1 && shift -+ version=$1 && shift -+ -+ OS_NAME="$(eval $(grep ^NAME= /etc/os-release) ; echo ${NAME})" -+ OS_VERS="$(eval $(grep ^VERSION= /etc/os-release) ; echo ${VERSION})" -+ -+ case $title_type in -+ recovery) -+ title=$(printf '%s (%s) %s (recovery mode)' \ -+ "${OS_NAME}" "${version}" "${OS_VERS}") -+ ;; -+ *) -+ title=$(printf '%s (%s) %s' \ -+ "${OS_NAME}" "${version}" "${OS_VERS}") -+ ;; -+ esac -+ echo -n ${title} - } - - title_correction_code= -@@ -114,12 +131,7 @@ linux_entry () - boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" - fi - if [ x$type != xsimple ] ; then -- case $type in -- recovery) -- title="$(printf "$(mktitle) (recovery mode)" "${version}")" ;; -- *) -- title="$(printf "$(mktitle)" "${version}")" ;; -- esac -+ title=$(mktitle "$type" "$version") - if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then - replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" - quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)" diff --git a/0216-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch b/0220-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch similarity index 100% rename from 0216-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch rename to 0220-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch diff --git a/0217-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0221-Make-grub2-mkconfig-construct-titles-that-look-like-.patch similarity index 62% rename from 0217-Make-grub2-mkconfig-construct-titles-that-look-like-.patch rename to 0221-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index 9beba4e..5b2a251 100644 --- a/0217-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0221-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -8,39 +8,57 @@ Resolves: rhbz#1215839 Signed-off-by: Peter Jones --- - util/grub.d/10_linux.in | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) + util/grub.d/10_linux.in | 34 +++++++++++++++++++++++++++------- + 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 03ea8460bfd..a05be9d3047 100644 +index 03ea8460bfd..4ad98fbd767 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in -@@ -78,6 +78,15 @@ case x"$GRUB_FS" in +@@ -78,6 +78,32 @@ case x"$GRUB_FS" in ;; esac +mktitle () +{ -+ local OS_NAME="$(eval $(grep ^NAME= /etc/os-release) ; echo ${NAME})" -+ local OS_VERS="$(eval $(grep ^VERSION= /etc/os-release) ; echo ${VERSION})" ++ local title_type ++ local version ++ local OS_NAME ++ local OS_VERS + -+ local titlestr="${OS_NAME} (%s) ${OS_VERS}" -+ echo -n ${titlestr} ++ title_type=$1 && shift ++ version=$1 && shift ++ ++ OS_NAME="$(eval $(grep ^NAME= /etc/os-release) ; echo ${NAME})" ++ OS_VERS="$(eval $(grep ^VERSION= /etc/os-release) ; echo ${VERSION})" ++ ++ case $title_type in ++ recovery) ++ title=$(printf '%s (%s) %s (recovery mode)' \ ++ "${OS_NAME}" "${version}" "${OS_VERS}") ++ ;; ++ *) ++ title=$(printf '%s (%s) %s' \ ++ "${OS_NAME}" "${version}" "${OS_VERS}") ++ ;; ++ esac ++ echo -n ${title} +} + title_correction_code= linux_entry () -@@ -107,15 +116,14 @@ linux_entry () +@@ -105,17 +131,11 @@ linux_entry () + boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" + fi if [ x$type != xsimple ] ; then - case $type in - recovery) +- case $type in +- recovery) - title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; -+ title="$(printf "$(mktitle) (recovery mode)" "${version}")" ;; - *) +- *) - title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; -+ title="$(printf "$(mktitle)" "${version}")" ;; - esac +- esac ++ title=$(mktitle "$type" "$version") if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)" diff --git a/0218-Add-friendly-grub2-password-config-tool-985962.patch b/0222-Add-friendly-grub2-password-config-tool-985962.patch similarity index 100% rename from 0218-Add-friendly-grub2-password-config-tool-985962.patch rename to 0222-Add-friendly-grub2-password-config-tool-985962.patch diff --git a/0220-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch b/0223-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch similarity index 100% rename from 0220-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch rename to 0223-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch diff --git a/0221-tcp-add-window-scaling-support.patch b/0224-tcp-add-window-scaling-support.patch similarity index 100% rename from 0221-tcp-add-window-scaling-support.patch rename to 0224-tcp-add-window-scaling-support.patch diff --git a/0222-efinet-retransmit-if-our-device-is-busy.patch b/0225-efinet-retransmit-if-our-device-is-busy.patch similarity index 100% rename from 0222-efinet-retransmit-if-our-device-is-busy.patch rename to 0225-efinet-retransmit-if-our-device-is-busy.patch diff --git a/0223-Be-more-aggro-about-actually-using-the-configured-ne.patch b/0226-Be-more-aggro-about-actually-using-the-configured-ne.patch similarity index 100% rename from 0223-Be-more-aggro-about-actually-using-the-configured-ne.patch rename to 0226-Be-more-aggro-about-actually-using-the-configured-ne.patch diff --git a/0224-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch b/0227-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch similarity index 100% rename from 0224-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch rename to 0227-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch diff --git a/0225-Fix-security-issue-when-reading-username-and-passwor.patch b/0228-Fix-security-issue-when-reading-username-and-passwor.patch similarity index 100% rename from 0225-Fix-security-issue-when-reading-username-and-passwor.patch rename to 0228-Fix-security-issue-when-reading-username-and-passwor.patch diff --git a/0226-Warn-if-grub-password-will-not-be-read-1290803.patch b/0229-Warn-if-grub-password-will-not-be-read-1290803.patch similarity index 100% rename from 0226-Warn-if-grub-password-will-not-be-read-1290803.patch rename to 0229-Warn-if-grub-password-will-not-be-read-1290803.patch diff --git a/0227-Clean-up-grub-setpassword-documentation-1290799.patch b/0230-Clean-up-grub-setpassword-documentation-1290799.patch similarity index 100% rename from 0227-Clean-up-grub-setpassword-documentation-1290799.patch rename to 0230-Clean-up-grub-setpassword-documentation-1290799.patch diff --git a/0228-Fix-locale-issue-in-grub-setpassword-1294243.patch b/0231-Fix-locale-issue-in-grub-setpassword-1294243.patch similarity index 100% rename from 0228-Fix-locale-issue-in-grub-setpassword-1294243.patch rename to 0231-Fix-locale-issue-in-grub-setpassword-1294243.patch diff --git a/0229-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch b/0232-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch similarity index 100% rename from 0229-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch rename to 0232-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch diff --git a/0230-efiemu-Fix-compilation-failure.patch b/0233-efiemu-Fix-compilation-failure.patch similarity index 100% rename from 0230-efiemu-Fix-compilation-failure.patch rename to 0233-efiemu-Fix-compilation-failure.patch diff --git a/0231-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0234-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch similarity index 100% rename from 0231-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch rename to 0234-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch diff --git a/0232-Add-a-url-parser.patch b/0235-Add-a-url-parser.patch similarity index 100% rename from 0232-Add-a-url-parser.patch rename to 0235-Add-a-url-parser.patch diff --git a/0233-efinet-and-bootp-add-support-for-dhcpv6.patch b/0236-efinet-and-bootp-add-support-for-dhcpv6.patch similarity index 100% rename from 0233-efinet-and-bootp-add-support-for-dhcpv6.patch rename to 0236-efinet-and-bootp-add-support-for-dhcpv6.patch diff --git a/0234-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0237-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch similarity index 100% rename from 0234-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch rename to 0237-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch diff --git a/0235-Normalize-slashes-in-tftp-paths.patch b/0238-Normalize-slashes-in-tftp-paths.patch similarity index 100% rename from 0235-Normalize-slashes-in-tftp-paths.patch rename to 0238-Normalize-slashes-in-tftp-paths.patch diff --git a/0236-Fix-malformed-tftp-packets.patch b/0239-Fix-malformed-tftp-packets.patch similarity index 100% rename from 0236-Fix-malformed-tftp-packets.patch rename to 0239-Fix-malformed-tftp-packets.patch diff --git a/0237-Fix-race-in-EFI-validation.patch b/0240-Fix-race-in-EFI-validation.patch similarity index 100% rename from 0237-Fix-race-in-EFI-validation.patch rename to 0240-Fix-race-in-EFI-validation.patch diff --git a/0238-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0241-bz1374141-fix-incorrect-mask-for-ppc64.patch similarity index 100% rename from 0238-bz1374141-fix-incorrect-mask-for-ppc64.patch rename to 0241-bz1374141-fix-incorrect-mask-for-ppc64.patch diff --git a/0239-Use-device-part-of-chainloader-target-if-present.patch b/0242-Use-device-part-of-chainloader-target-if-present.patch similarity index 100% rename from 0239-Use-device-part-of-chainloader-target-if-present.patch rename to 0242-Use-device-part-of-chainloader-target-if-present.patch diff --git a/0240-Add-secureboot-support-on-efi-chainloader.patch b/0243-Add-secureboot-support-on-efi-chainloader.patch similarity index 100% rename from 0240-Add-secureboot-support-on-efi-chainloader.patch rename to 0243-Add-secureboot-support-on-efi-chainloader.patch diff --git a/0241-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0244-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch similarity index 100% rename from 0241-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch rename to 0244-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch diff --git a/0242-Make-grub_fatal-also-backtrace.patch b/0245-Make-grub_fatal-also-backtrace.patch similarity index 100% rename from 0242-Make-grub_fatal-also-backtrace.patch rename to 0245-Make-grub_fatal-also-backtrace.patch diff --git a/0243-Rework-linux-command.patch b/0246-Rework-linux-command.patch similarity index 100% rename from 0243-Rework-linux-command.patch rename to 0246-Rework-linux-command.patch diff --git a/0244-Rework-linux16-command.patch b/0247-Rework-linux16-command.patch similarity index 100% rename from 0244-Rework-linux16-command.patch rename to 0247-Rework-linux16-command.patch diff --git a/0245-Make-grub-editenv-build-again.patch b/0248-Make-grub-editenv-build-again.patch similarity index 100% rename from 0245-Make-grub-editenv-build-again.patch rename to 0248-Make-grub-editenv-build-again.patch diff --git a/0246-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0249-Fix-up-some-man-pages-rpmdiff-noticed.patch similarity index 100% rename from 0246-Fix-up-some-man-pages-rpmdiff-noticed.patch rename to 0249-Fix-up-some-man-pages-rpmdiff-noticed.patch diff --git a/0247-Re-work-some-intricacies-of-PE-loading.patch b/0250-Re-work-some-intricacies-of-PE-loading.patch similarity index 100% rename from 0247-Re-work-some-intricacies-of-PE-loading.patch rename to 0250-Re-work-some-intricacies-of-PE-loading.patch diff --git a/0248-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch b/0251-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch similarity index 100% rename from 0248-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch rename to 0251-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch diff --git a/0249-linuxefi-fix-double-free-on-verification-failure.patch b/0252-linuxefi-fix-double-free-on-verification-failure.patch similarity index 100% rename from 0249-linuxefi-fix-double-free-on-verification-failure.patch rename to 0252-linuxefi-fix-double-free-on-verification-failure.patch diff --git a/0250-fix-machine-type-test-in-30_os-prober.in.patch b/0253-fix-machine-type-test-in-30_os-prober.in.patch similarity index 100% rename from 0250-fix-machine-type-test-in-30_os-prober.in.patch rename to 0253-fix-machine-type-test-in-30_os-prober.in.patch diff --git a/0251-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch b/0254-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch similarity index 100% rename from 0251-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch rename to 0254-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch diff --git a/0252-efi-chainloader-truncate-overlong-relocation-section.patch b/0255-efi-chainloader-truncate-overlong-relocation-section.patch similarity index 100% rename from 0252-efi-chainloader-truncate-overlong-relocation-section.patch rename to 0255-efi-chainloader-truncate-overlong-relocation-section.patch diff --git a/0253-linuxefi-minor-cleanups.patch b/0256-linuxefi-minor-cleanups.patch similarity index 100% rename from 0253-linuxefi-minor-cleanups.patch rename to 0256-linuxefi-minor-cleanups.patch diff --git a/0254-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/0257-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch similarity index 100% rename from 0254-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch rename to 0257-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch diff --git a/0255-Fix-up-linux-params-usage.patch b/0258-Fix-up-linux-params-usage.patch similarity index 100% rename from 0255-Fix-up-linux-params-usage.patch rename to 0258-Fix-up-linux-params-usage.patch diff --git a/0256-Make-exit-take-a-return-code.patch b/0259-Make-exit-take-a-return-code.patch similarity index 100% rename from 0256-Make-exit-take-a-return-code.patch rename to 0259-Make-exit-take-a-return-code.patch diff --git a/0257-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch b/0260-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch similarity index 100% rename from 0257-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch rename to 0260-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch diff --git a/0258-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch b/0261-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch similarity index 100% rename from 0258-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch rename to 0261-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch diff --git a/0259-Make-our-info-pages-say-grub2-where-appropriate.patch b/0262-Make-our-info-pages-say-grub2-where-appropriate.patch similarity index 100% rename from 0259-Make-our-info-pages-say-grub2-where-appropriate.patch rename to 0262-Make-our-info-pages-say-grub2-where-appropriate.patch diff --git a/0260-print-more-debug-info-in-our-module-loader.patch b/0263-print-more-debug-info-in-our-module-loader.patch similarity index 100% rename from 0260-print-more-debug-info-in-our-module-loader.patch rename to 0263-print-more-debug-info-in-our-module-loader.patch diff --git a/0261-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0264-macos-just-build-chainloader-entries-don-t-try-any-x.patch similarity index 100% rename from 0261-macos-just-build-chainloader-entries-don-t-try-any-x.patch rename to 0264-macos-just-build-chainloader-entries-don-t-try-any-x.patch diff --git a/0262-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0265-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch similarity index 100% rename from 0262-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch rename to 0265-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch diff --git a/0263-export-btrfs_subvol-and-btrfs_subvolid.patch b/0266-export-btrfs_subvol-and-btrfs_subvolid.patch similarity index 100% rename from 0263-export-btrfs_subvol-and-btrfs_subvolid.patch rename to 0266-export-btrfs_subvol-and-btrfs_subvolid.patch diff --git a/0264-grub2-btrfs-03-follow_default.patch b/0267-grub2-btrfs-03-follow_default.patch similarity index 100% rename from 0264-grub2-btrfs-03-follow_default.patch rename to 0267-grub2-btrfs-03-follow_default.patch diff --git a/0265-grub2-btrfs-04-grub2-install.patch b/0268-grub2-btrfs-04-grub2-install.patch similarity index 100% rename from 0265-grub2-btrfs-04-grub2-install.patch rename to 0268-grub2-btrfs-04-grub2-install.patch diff --git a/0266-grub2-btrfs-05-grub2-mkconfig.patch b/0269-grub2-btrfs-05-grub2-mkconfig.patch similarity index 100% rename from 0266-grub2-btrfs-05-grub2-mkconfig.patch rename to 0269-grub2-btrfs-05-grub2-mkconfig.patch diff --git a/0267-grub2-btrfs-06-subvol-mount.patch b/0270-grub2-btrfs-06-subvol-mount.patch similarity index 100% rename from 0267-grub2-btrfs-06-subvol-mount.patch rename to 0270-grub2-btrfs-06-subvol-mount.patch diff --git a/0268-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch b/0271-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch similarity index 100% rename from 0268-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch rename to 0271-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch diff --git a/0269-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0272-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch similarity index 100% rename from 0269-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch rename to 0272-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch diff --git a/0270-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0273-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch similarity index 100% rename from 0270-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch rename to 0273-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch diff --git a/0271-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0274-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch similarity index 100% rename from 0271-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch rename to 0274-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch diff --git a/0272-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0275-Use-grub_efi_.-memory-helpers-where-reasonable.patch similarity index 100% rename from 0272-Use-grub_efi_.-memory-helpers-where-reasonable.patch rename to 0275-Use-grub_efi_.-memory-helpers-where-reasonable.patch diff --git a/0273-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0276-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch similarity index 100% rename from 0273-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch rename to 0276-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch diff --git a/0274-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch b/0277-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch similarity index 100% rename from 0274-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch rename to 0277-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch diff --git a/0275-don-t-ignore-const.patch b/0278-don-t-ignore-const.patch similarity index 100% rename from 0275-don-t-ignore-const.patch rename to 0278-don-t-ignore-const.patch diff --git a/0276-don-t-use-int-for-efi-status.patch b/0279-don-t-use-int-for-efi-status.patch similarity index 100% rename from 0276-don-t-use-int-for-efi-status.patch rename to 0279-don-t-use-int-for-efi-status.patch diff --git a/0277-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0280-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch similarity index 100% rename from 0277-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch rename to 0280-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch diff --git a/0278-Clean-up-some-errors-in-the-linuxefi-loader.patch b/0281-Clean-up-some-errors-in-the-linuxefi-loader.patch similarity index 100% rename from 0278-Clean-up-some-errors-in-the-linuxefi-loader.patch rename to 0281-Clean-up-some-errors-in-the-linuxefi-loader.patch diff --git a/0279-editenv-handle-relative-symlinks.patch b/0282-editenv-handle-relative-symlinks.patch similarity index 100% rename from 0279-editenv-handle-relative-symlinks.patch rename to 0282-editenv-handle-relative-symlinks.patch diff --git a/0280-Make-libgrub.pp-depend-on-config-util.h.patch b/0283-Make-libgrub.pp-depend-on-config-util.h.patch similarity index 100% rename from 0280-Make-libgrub.pp-depend-on-config-util.h.patch rename to 0283-Make-libgrub.pp-depend-on-config-util.h.patch diff --git a/0281-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0284-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch similarity index 100% rename from 0281-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch rename to 0284-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch diff --git a/0282-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/0285-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch similarity index 100% rename from 0282-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch rename to 0285-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch diff --git a/0283-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch b/0286-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch similarity index 100% rename from 0283-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch rename to 0286-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch diff --git a/0284-align-struct-efi_variable-better.patch b/0287-align-struct-efi_variable-better.patch similarity index 100% rename from 0284-align-struct-efi_variable-better.patch rename to 0287-align-struct-efi_variable-better.patch diff --git a/0285-Add-quicksort-implementation.patch b/0288-Add-quicksort-implementation.patch similarity index 100% rename from 0285-Add-quicksort-implementation.patch rename to 0288-Add-quicksort-implementation.patch diff --git a/0286-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch b/0289-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch similarity index 100% rename from 0286-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch rename to 0289-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch diff --git a/0287-Add-BLS-support-to-grub-mkconfig.patch b/0290-Add-BLS-support-to-grub-mkconfig.patch similarity index 100% rename from 0287-Add-BLS-support-to-grub-mkconfig.patch rename to 0290-Add-BLS-support-to-grub-mkconfig.patch diff --git a/0288-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch b/0291-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch similarity index 100% rename from 0288-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch rename to 0291-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch diff --git a/0289-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch b/0292-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch similarity index 100% rename from 0289-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch rename to 0292-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch diff --git a/0290-Enable-blscfg-command-for-the-emu-platform.patch b/0293-Enable-blscfg-command-for-the-emu-platform.patch similarity index 100% rename from 0290-Enable-blscfg-command-for-the-emu-platform.patch rename to 0293-Enable-blscfg-command-for-the-emu-platform.patch diff --git a/0291-Add-linux-and-initrd-commands-for-grub-emu.patch b/0294-Add-linux-and-initrd-commands-for-grub-emu.patch similarity index 100% rename from 0291-Add-linux-and-initrd-commands-for-grub-emu.patch rename to 0294-Add-linux-and-initrd-commands-for-grub-emu.patch diff --git a/0292-Fix-the-efidir-in-grub-setpassword.patch b/0295-Fix-the-efidir-in-grub-setpassword.patch similarity index 100% rename from 0292-Fix-the-efidir-in-grub-setpassword.patch rename to 0295-Fix-the-efidir-in-grub-setpassword.patch diff --git a/0293-Add-grub2-switch-to-blscfg.patch b/0296-Add-grub2-switch-to-blscfg.patch similarity index 100% rename from 0293-Add-grub2-switch-to-blscfg.patch rename to 0296-Add-grub2-switch-to-blscfg.patch diff --git a/0294-Add-grub_debug_enabled.patch b/0297-Add-grub_debug_enabled.patch similarity index 100% rename from 0294-Add-grub_debug_enabled.patch rename to 0297-Add-grub_debug_enabled.patch diff --git a/0295-make-better-backtraces.patch b/0298-make-better-backtraces.patch similarity index 100% rename from 0295-make-better-backtraces.patch rename to 0298-make-better-backtraces.patch diff --git a/0296-normal-don-t-draw-our-startup-message-if-debug-is-se.patch b/0299-normal-don-t-draw-our-startup-message-if-debug-is-se.patch similarity index 100% rename from 0296-normal-don-t-draw-our-startup-message-if-debug-is-se.patch rename to 0299-normal-don-t-draw-our-startup-message-if-debug-is-se.patch diff --git a/0297-Work-around-some-minor-include-path-weirdnesses.patch b/0300-Work-around-some-minor-include-path-weirdnesses.patch similarity index 100% rename from 0297-Work-around-some-minor-include-path-weirdnesses.patch rename to 0300-Work-around-some-minor-include-path-weirdnesses.patch diff --git a/0298-Make-it-possible-to-enabled-build-id-sha1.patch b/0301-Make-it-possible-to-enabled-build-id-sha1.patch similarity index 100% rename from 0298-Make-it-possible-to-enabled-build-id-sha1.patch rename to 0301-Make-it-possible-to-enabled-build-id-sha1.patch diff --git a/0299-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch b/0302-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch similarity index 100% rename from 0299-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch rename to 0302-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch diff --git a/0300-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/0303-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch similarity index 100% rename from 0300-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch rename to 0303-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch diff --git a/0301-Only-attempt-to-scan-different-BLS-directories-on-EF.patch b/0304-Only-attempt-to-scan-different-BLS-directories-on-EF.patch similarity index 100% rename from 0301-Only-attempt-to-scan-different-BLS-directories-on-EF.patch rename to 0304-Only-attempt-to-scan-different-BLS-directories-on-EF.patch diff --git a/0302-Core-TPM-support.patch b/0305-Core-TPM-support.patch similarity index 100% rename from 0302-Core-TPM-support.patch rename to 0305-Core-TPM-support.patch diff --git a/0303-Measure-kernel-initrd.patch b/0306-Measure-kernel-initrd.patch similarity index 100% rename from 0303-Measure-kernel-initrd.patch rename to 0306-Measure-kernel-initrd.patch diff --git a/0304-Add-BIOS-boot-measurement.patch b/0307-Add-BIOS-boot-measurement.patch similarity index 100% rename from 0304-Add-BIOS-boot-measurement.patch rename to 0307-Add-BIOS-boot-measurement.patch diff --git a/0305-Measure-kernel-and-initrd-on-BIOS-systems.patch b/0308-Measure-kernel-and-initrd-on-BIOS-systems.patch similarity index 100% rename from 0305-Measure-kernel-and-initrd-on-BIOS-systems.patch rename to 0308-Measure-kernel-and-initrd-on-BIOS-systems.patch diff --git a/0306-Measure-the-kernel-commandline.patch b/0309-Measure-the-kernel-commandline.patch similarity index 100% rename from 0306-Measure-the-kernel-commandline.patch rename to 0309-Measure-the-kernel-commandline.patch diff --git a/0307-Measure-commands.patch b/0310-Measure-commands.patch similarity index 100% rename from 0307-Measure-commands.patch rename to 0310-Measure-commands.patch diff --git a/0308-Measure-multiboot-images-and-modules.patch b/0311-Measure-multiboot-images-and-modules.patch similarity index 100% rename from 0308-Measure-multiboot-images-and-modules.patch rename to 0311-Measure-multiboot-images-and-modules.patch diff --git a/0309-Fix-boot-when-there-s-no-TPM.patch b/0312-Fix-boot-when-there-s-no-TPM.patch similarity index 100% rename from 0309-Fix-boot-when-there-s-no-TPM.patch rename to 0312-Fix-boot-when-there-s-no-TPM.patch diff --git a/0310-Rework-TPM-measurements.patch b/0313-Rework-TPM-measurements.patch similarity index 100% rename from 0310-Rework-TPM-measurements.patch rename to 0313-Rework-TPM-measurements.patch diff --git a/0311-Fix-event-log-prefix.patch b/0314-Fix-event-log-prefix.patch similarity index 100% rename from 0311-Fix-event-log-prefix.patch rename to 0314-Fix-event-log-prefix.patch diff --git a/0312-Set-the-first-boot-menu-entry-as-default-when-using-.patch b/0315-Set-the-first-boot-menu-entry-as-default-when-using-.patch similarity index 100% rename from 0312-Set-the-first-boot-menu-entry-as-default-when-using-.patch rename to 0315-Set-the-first-boot-menu-entry-as-default-when-using-.patch diff --git a/0313-tpm-fix-warnings-when-compiling-for-platforms-other-.patch b/0316-tpm-fix-warnings-when-compiling-for-platforms-other-.patch similarity index 100% rename from 0313-tpm-fix-warnings-when-compiling-for-platforms-other-.patch rename to 0316-tpm-fix-warnings-when-compiling-for-platforms-other-.patch diff --git a/0314-Make-TPM-errors-less-fatal.patch b/0317-Make-TPM-errors-less-fatal.patch similarity index 100% rename from 0314-Make-TPM-errors-less-fatal.patch rename to 0317-Make-TPM-errors-less-fatal.patch diff --git a/0315-blscfg-handle-multiple-initramfs-images.patch b/0318-blscfg-handle-multiple-initramfs-images.patch similarity index 100% rename from 0315-blscfg-handle-multiple-initramfs-images.patch rename to 0318-blscfg-handle-multiple-initramfs-images.patch diff --git a/0316-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch b/0319-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch similarity index 100% rename from 0316-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch rename to 0319-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch diff --git a/0317-BLS-Use-etcdefaultgrub-instead-of-etc.patch b/0320-BLS-Use-etcdefaultgrub-instead-of-etc.patch similarity index 100% rename from 0317-BLS-Use-etcdefaultgrub-instead-of-etc.patch rename to 0320-BLS-Use-etcdefaultgrub-instead-of-etc.patch diff --git a/0318-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch b/0321-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch similarity index 100% rename from 0318-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch rename to 0321-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch diff --git a/0319-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch b/0322-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch similarity index 100% rename from 0319-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch rename to 0322-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch diff --git a/0320-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch b/0323-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch similarity index 100% rename from 0320-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch rename to 0323-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch diff --git a/0321-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch b/0324-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch similarity index 100% rename from 0321-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch rename to 0324-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch diff --git a/0322-Include-OSTree-path-when-searching-kernels-images-if.patch b/0325-Include-OSTree-path-when-searching-kernels-images-if.patch similarity index 100% rename from 0322-Include-OSTree-path-when-searching-kernels-images-if.patch rename to 0325-Include-OSTree-path-when-searching-kernels-images-if.patch diff --git a/0323-Use-BLS-version-field-to-compare-entries-if-id-field.patch b/0326-Use-BLS-version-field-to-compare-entries-if-id-field.patch similarity index 100% rename from 0323-Use-BLS-version-field-to-compare-entries-if-id-field.patch rename to 0326-Use-BLS-version-field-to-compare-entries-if-id-field.patch diff --git a/0324-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch b/0327-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch similarity index 100% rename from 0324-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch rename to 0327-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch diff --git a/0325-Fixup-for-newer-compiler.patch b/0328-Fixup-for-newer-compiler.patch similarity index 100% rename from 0325-Fixup-for-newer-compiler.patch rename to 0328-Fixup-for-newer-compiler.patch diff --git a/0326-Don-t-attempt-to-export-the-start-and-_start-symbols.patch b/0329-Don-t-attempt-to-export-the-start-and-_start-symbols.patch similarity index 100% rename from 0326-Don-t-attempt-to-export-the-start-and-_start-symbols.patch rename to 0329-Don-t-attempt-to-export-the-start-and-_start-symbols.patch diff --git a/0327-Simplify-BLS-entry-key-val-pairs-lookup.patch b/0330-Simplify-BLS-entry-key-val-pairs-lookup.patch similarity index 100% rename from 0327-Simplify-BLS-entry-key-val-pairs-lookup.patch rename to 0330-Simplify-BLS-entry-key-val-pairs-lookup.patch diff --git a/0328-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch b/0331-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch similarity index 100% rename from 0328-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch rename to 0331-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch diff --git a/0329-Skip-leading-spaces-on-BLS-field-values.patch b/0332-Skip-leading-spaces-on-BLS-field-values.patch similarity index 100% rename from 0329-Skip-leading-spaces-on-BLS-field-values.patch rename to 0332-Skip-leading-spaces-on-BLS-field-values.patch diff --git a/0330-Fixup-for-newer-compiler.patch b/0333-Fixup-for-newer-compiler.patch similarity index 100% rename from 0330-Fixup-for-newer-compiler.patch rename to 0333-Fixup-for-newer-compiler.patch diff --git a/0331-TPM-Fix-hash_log_extend_event-function-prototype.patch b/0334-TPM-Fix-hash_log_extend_event-function-prototype.patch similarity index 100% rename from 0331-TPM-Fix-hash_log_extend_event-function-prototype.patch rename to 0334-TPM-Fix-hash_log_extend_event-function-prototype.patch diff --git a/0332-TPM-Fix-compiler-warnings.patch b/0335-TPM-Fix-compiler-warnings.patch similarity index 100% rename from 0332-TPM-Fix-compiler-warnings.patch rename to 0335-TPM-Fix-compiler-warnings.patch diff --git a/0333-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch b/0336-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch similarity index 100% rename from 0333-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch rename to 0336-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch diff --git a/0334-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch b/0337-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch similarity index 100% rename from 0334-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch rename to 0337-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch diff --git a/0335-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch b/0338-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch similarity index 100% rename from 0335-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch rename to 0338-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch diff --git a/0336-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch b/0339-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch similarity index 100% rename from 0336-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch rename to 0339-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch diff --git a/0337-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch b/0340-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch similarity index 100% rename from 0337-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch rename to 0340-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch diff --git a/0338-Revert-trim-arp-packets-with-abnormal-size.patch b/0341-Revert-trim-arp-packets-with-abnormal-size.patch similarity index 100% rename from 0338-Revert-trim-arp-packets-with-abnormal-size.patch rename to 0341-Revert-trim-arp-packets-with-abnormal-size.patch diff --git a/0339-Use-xid-to-match-DHCP-replies.patch b/0342-Use-xid-to-match-DHCP-replies.patch similarity index 100% rename from 0339-Use-xid-to-match-DHCP-replies.patch rename to 0342-Use-xid-to-match-DHCP-replies.patch diff --git a/0340-Add-support-for-non-Ethernet-network-cards.patch b/0343-Add-support-for-non-Ethernet-network-cards.patch similarity index 100% rename from 0340-Add-support-for-non-Ethernet-network-cards.patch rename to 0343-Add-support-for-non-Ethernet-network-cards.patch diff --git a/0341-misc-fix-invalid-character-recongition-in-strto-l.patch b/0344-misc-fix-invalid-character-recongition-in-strto-l.patch similarity index 100% rename from 0341-misc-fix-invalid-character-recongition-in-strto-l.patch rename to 0344-misc-fix-invalid-character-recongition-in-strto-l.patch diff --git a/0342-net-read-bracketed-ipv6-addrs-and-port-numbers.patch b/0345-net-read-bracketed-ipv6-addrs-and-port-numbers.patch similarity index 100% rename from 0342-net-read-bracketed-ipv6-addrs-and-port-numbers.patch rename to 0345-net-read-bracketed-ipv6-addrs-and-port-numbers.patch diff --git a/0343-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch b/0346-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch similarity index 100% rename from 0343-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch rename to 0346-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch diff --git a/0344-bootp-New-net_bootp6-command.patch b/0347-bootp-New-net_bootp6-command.patch similarity index 100% rename from 0344-bootp-New-net_bootp6-command.patch rename to 0347-bootp-New-net_bootp6-command.patch diff --git a/0345-Put-back-our-code-to-add-a-local-route.patch b/0348-Put-back-our-code-to-add-a-local-route.patch similarity index 100% rename from 0345-Put-back-our-code-to-add-a-local-route.patch rename to 0348-Put-back-our-code-to-add-a-local-route.patch diff --git a/0346-efinet-UEFI-IPv6-PXE-support.patch b/0349-efinet-UEFI-IPv6-PXE-support.patch similarity index 100% rename from 0346-efinet-UEFI-IPv6-PXE-support.patch rename to 0349-efinet-UEFI-IPv6-PXE-support.patch diff --git a/0347-grub.texi-Add-net_bootp6-doument.patch b/0350-grub.texi-Add-net_bootp6-doument.patch similarity index 100% rename from 0347-grub.texi-Add-net_bootp6-doument.patch rename to 0350-grub.texi-Add-net_bootp6-doument.patch diff --git a/0348-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch b/0351-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch similarity index 100% rename from 0348-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch rename to 0351-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch diff --git a/0349-efinet-Setting-network-from-UEFI-device-path.patch b/0352-efinet-Setting-network-from-UEFI-device-path.patch similarity index 100% rename from 0349-efinet-Setting-network-from-UEFI-device-path.patch rename to 0352-efinet-Setting-network-from-UEFI-device-path.patch diff --git a/0350-efinet-Setting-DNS-server-from-UEFI-protocol.patch b/0353-efinet-Setting-DNS-server-from-UEFI-protocol.patch similarity index 100% rename from 0350-efinet-Setting-DNS-server-from-UEFI-protocol.patch rename to 0353-efinet-Setting-DNS-server-from-UEFI-protocol.patch diff --git a/0351-Fix-one-more-coverity-complaint.patch b/0354-Fix-one-more-coverity-complaint.patch similarity index 100% rename from 0351-Fix-one-more-coverity-complaint.patch rename to 0354-Fix-one-more-coverity-complaint.patch diff --git a/0352-Fix-grub_net_hwaddr_to_str.patch b/0355-Fix-grub_net_hwaddr_to_str.patch similarity index 100% rename from 0352-Fix-grub_net_hwaddr_to_str.patch rename to 0355-Fix-grub_net_hwaddr_to_str.patch diff --git a/0353-Support-UEFI-networking-protocols.patch b/0356-Support-UEFI-networking-protocols.patch similarity index 100% rename from 0353-Support-UEFI-networking-protocols.patch rename to 0356-Support-UEFI-networking-protocols.patch diff --git a/0354-AUDIT-0-http-boot-tracker-bug.patch b/0357-AUDIT-0-http-boot-tracker-bug.patch similarity index 100% rename from 0354-AUDIT-0-http-boot-tracker-bug.patch rename to 0357-AUDIT-0-http-boot-tracker-bug.patch diff --git a/0355-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch b/0358-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch similarity index 100% rename from 0355-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch rename to 0358-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch diff --git a/0356-efi-uga-use-64-bit-for-fb_base.patch b/0359-efi-uga-use-64-bit-for-fb_base.patch similarity index 100% rename from 0356-efi-uga-use-64-bit-for-fb_base.patch rename to 0359-efi-uga-use-64-bit-for-fb_base.patch diff --git a/0357-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch b/0360-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch similarity index 89% rename from 0357-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch rename to 0360-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch index fd46dd6..20aadf6 100644 --- a/0357-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch +++ b/0360-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch @@ -12,7 +12,7 @@ Signed-off-by: Hans de Goede 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c -index 02f64ea7441..6772feaa2f9 100644 +index 4840cc59d3f..051633d71e9 100644 --- a/grub-core/term/efi/console.c +++ b/grub-core/term/efi/console.c @@ -24,6 +24,11 @@ @@ -44,7 +44,7 @@ index 02f64ea7441..6772feaa2f9 100644 return; o = grub_efi_system_table->con_out; -@@ -220,14 +225,15 @@ grub_console_getkey (struct grub_term_input *term) +@@ -223,14 +228,15 @@ grub_console_getkey (struct grub_term_input *term) } static struct grub_term_coordinate @@ -63,7 +63,7 @@ index 02f64ea7441..6772feaa2f9 100644 { /* Why does this fail? */ columns = 80; -@@ -242,7 +248,7 @@ grub_console_getxy (struct grub_term_output *term __attribute__ ((unused))) +@@ -245,7 +251,7 @@ grub_console_getxy (struct grub_term_output *term __attribute__ ((unused))) { grub_efi_simple_text_output_interface_t *o; @@ -72,7 +72,7 @@ index 02f64ea7441..6772feaa2f9 100644 return (struct grub_term_coordinate) { 0, 0 }; o = grub_efi_system_table->con_out; -@@ -250,12 +256,12 @@ grub_console_getxy (struct grub_term_output *term __attribute__ ((unused))) +@@ -253,12 +259,12 @@ grub_console_getxy (struct grub_term_output *term __attribute__ ((unused))) } static void @@ -87,7 +87,7 @@ index 02f64ea7441..6772feaa2f9 100644 return; o = grub_efi_system_table->con_out; -@@ -268,7 +274,7 @@ grub_console_cls (struct grub_term_output *term __attribute__ ((unused))) +@@ -271,7 +277,7 @@ grub_console_cls (struct grub_term_output *term __attribute__ ((unused))) grub_efi_simple_text_output_interface_t *o; grub_efi_int32_t orig_attr; @@ -96,7 +96,7 @@ index 02f64ea7441..6772feaa2f9 100644 return; o = grub_efi_system_table->con_out; -@@ -288,6 +294,12 @@ grub_console_setcolorstate (struct grub_term_output *term +@@ -291,6 +297,12 @@ grub_console_setcolorstate (struct grub_term_output *term if (grub_efi_is_finished) return; @@ -109,7 +109,7 @@ index 02f64ea7441..6772feaa2f9 100644 o = grub_efi_system_table->con_out; switch (state) { -@@ -312,7 +324,7 @@ grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)), +@@ -315,7 +327,7 @@ grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)), { grub_efi_simple_text_output_interface_t *o; @@ -118,7 +118,7 @@ index 02f64ea7441..6772feaa2f9 100644 return; o = grub_efi_system_table->con_out; -@@ -320,18 +332,38 @@ grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)), +@@ -323,18 +335,38 @@ grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)), } static grub_err_t @@ -159,7 +159,7 @@ index 02f64ea7441..6772feaa2f9 100644 return 0; } -@@ -345,7 +377,6 @@ static struct grub_term_input grub_console_term_input = +@@ -348,7 +380,6 @@ static struct grub_term_input grub_console_term_input = static struct grub_term_output grub_console_term_output = { .name = "console", @@ -167,7 +167,7 @@ index 02f64ea7441..6772feaa2f9 100644 .fini = grub_efi_console_output_fini, .putchar = grub_console_putchar, .getwh = grub_console_getwh, -@@ -361,14 +392,6 @@ static struct grub_term_output grub_console_term_output = +@@ -364,14 +395,6 @@ static struct grub_term_output grub_console_term_output = void grub_console_init (void) { diff --git a/0358-EFI-console-Add-grub_console_read_key_stroke-helper-.patch b/0361-EFI-console-Add-grub_console_read_key_stroke-helper-.patch similarity index 97% rename from 0358-EFI-console-Add-grub_console_read_key_stroke-helper-.patch rename to 0361-EFI-console-Add-grub_console_read_key_stroke-helper-.patch index 42f0405..6da36b2 100644 --- a/0358-EFI-console-Add-grub_console_read_key_stroke-helper-.patch +++ b/0361-EFI-console-Add-grub_console_read_key_stroke-helper-.patch @@ -29,10 +29,10 @@ Signed-off-by: Hans de Goede 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c -index 6772feaa2f9..bc74b04a368 100644 +index 051633d71e9..3d36c5c701b 100644 --- a/grub-core/term/efi/console.c +++ b/grub-core/term/efi/console.c -@@ -154,27 +154,56 @@ grub_console_getkey_con (struct grub_term_input *term __attribute__ ((unused))) +@@ -157,27 +157,56 @@ grub_console_getkey_con (struct grub_term_input *term __attribute__ ((unused))) return grub_efi_translate_key(key); } diff --git a/0359-EFI-console-Implement-getkeystatus-support.patch b/0362-EFI-console-Implement-getkeystatus-support.patch similarity index 92% rename from 0359-EFI-console-Implement-getkeystatus-support.patch rename to 0362-EFI-console-Implement-getkeystatus-support.patch index 26d657a..74fa253 100644 --- a/0359-EFI-console-Implement-getkeystatus-support.patch +++ b/0362-EFI-console-Implement-getkeystatus-support.patch @@ -19,10 +19,10 @@ Signed-off-by: Hans de Goede 1 file changed, 34 insertions(+) diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c -index bc74b04a368..a5abaf8e722 100644 +index 3d36c5c701b..92dd4996bb7 100644 --- a/grub-core/term/efi/console.c +++ b/grub-core/term/efi/console.c -@@ -220,6 +220,39 @@ grub_console_getkey_ex(struct grub_term_input *term) +@@ -223,6 +223,39 @@ grub_console_getkey_ex(struct grub_term_input *term) return key; } @@ -62,7 +62,7 @@ index bc74b04a368..a5abaf8e722 100644 static grub_err_t grub_efi_console_input_init (struct grub_term_input *term) { -@@ -400,6 +433,7 @@ static struct grub_term_input grub_console_term_input = +@@ -403,6 +436,7 @@ static struct grub_term_input grub_console_term_input = { .name = "console", .getkey = grub_console_getkey, diff --git a/0360-Make-grub_getkeystatus-helper-funtion-available-ever.patch b/0363-Make-grub_getkeystatus-helper-funtion-available-ever.patch similarity index 100% rename from 0360-Make-grub_getkeystatus-helper-funtion-available-ever.patch rename to 0363-Make-grub_getkeystatus-helper-funtion-available-ever.patch diff --git a/0361-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch b/0364-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch similarity index 100% rename from 0361-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch rename to 0364-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch diff --git a/0362-grub-editenv-Add-incr-command-to-increment-integer-v.patch b/0365-grub-editenv-Add-incr-command-to-increment-integer-v.patch similarity index 100% rename from 0362-grub-editenv-Add-incr-command-to-increment-integer-v.patch rename to 0365-grub-editenv-Add-incr-command-to-increment-integer-v.patch diff --git a/0363-Add-auto-hide-menu-support.patch b/0366-Add-auto-hide-menu-support.patch similarity index 100% rename from 0363-Add-auto-hide-menu-support.patch rename to 0366-Add-auto-hide-menu-support.patch diff --git a/0364-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch b/0367-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch similarity index 100% rename from 0364-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch rename to 0367-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch diff --git a/0365-Add-grub-set-bootflag-utility.patch b/0368-Add-grub-set-bootflag-utility.patch similarity index 100% rename from 0365-Add-grub-set-bootflag-utility.patch rename to 0368-Add-grub-set-bootflag-utility.patch diff --git a/0366-Fix-grub-setpassword-o-s-output-path.patch b/0369-Fix-grub-setpassword-o-s-output-path.patch similarity index 100% rename from 0366-Fix-grub-setpassword-o-s-output-path.patch rename to 0369-Fix-grub-setpassword-o-s-output-path.patch diff --git a/0367-Make-grub-set-password-be-named-like-all-the-other-g.patch b/0370-Make-grub-set-password-be-named-like-all-the-other-g.patch similarity index 100% rename from 0367-Make-grub-set-password-be-named-like-all-the-other-g.patch rename to 0370-Make-grub-set-password-be-named-like-all-the-other-g.patch diff --git a/0368-docs-Add-grub-boot-indeterminate.service-example.patch b/0371-docs-Add-grub-boot-indeterminate.service-example.patch similarity index 100% rename from 0368-docs-Add-grub-boot-indeterminate.service-example.patch rename to 0371-docs-Add-grub-boot-indeterminate.service-example.patch diff --git a/0370-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch b/0372-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch similarity index 100% rename from 0370-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch rename to 0372-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch diff --git a/0371-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch b/0373-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch similarity index 100% rename from 0371-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch rename to 0373-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch diff --git a/0372-Minor-fixes-to-make-armv7hl-build-as-arm-efi.patch b/0374-Minor-fixes-to-make-armv7hl-build-as-arm-efi.patch similarity index 100% rename from 0372-Minor-fixes-to-make-armv7hl-build-as-arm-efi.patch rename to 0374-Minor-fixes-to-make-armv7hl-build-as-arm-efi.patch diff --git a/0373-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch b/0375-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch similarity index 100% rename from 0373-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch rename to 0375-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch diff --git a/0374-gentpl-add-disable-support.patch b/0376-gentpl-add-disable-support.patch similarity index 100% rename from 0374-gentpl-add-disable-support.patch rename to 0376-gentpl-add-disable-support.patch diff --git a/0375-gentpl-add-pc-firmware-type.patch b/0377-gentpl-add-pc-firmware-type.patch similarity index 100% rename from 0375-gentpl-add-pc-firmware-type.patch rename to 0377-gentpl-add-pc-firmware-type.patch diff --git a/0376-Disable-the-reboot-module-on-EFI-builds-it-is-in-ker.patch b/0378-Disable-the-reboot-module-on-EFI-builds-it-is-in-ker.patch similarity index 100% rename from 0376-Disable-the-reboot-module-on-EFI-builds-it-is-in-ker.patch rename to 0378-Disable-the-reboot-module-on-EFI-builds-it-is-in-ker.patch diff --git a/0377-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch b/0379-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch similarity index 100% rename from 0377-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch rename to 0379-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch diff --git a/0378-Make-the-linuxefi-module-just-be-the-x86-efi-version.patch b/0380-Make-the-linuxefi-module-just-be-the-x86-efi-version.patch similarity index 100% rename from 0378-Make-the-linuxefi-module-just-be-the-x86-efi-version.patch rename to 0380-Make-the-linuxefi-module-just-be-the-x86-efi-version.patch diff --git a/0379-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch b/0381-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch similarity index 100% rename from 0379-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch rename to 0381-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch diff --git a/0380-Don-t-build-the-fdt-command.patch b/0382-Don-t-build-the-fdt-command.patch similarity index 100% rename from 0380-Don-t-build-the-fdt-command.patch rename to 0382-Don-t-build-the-fdt-command.patch diff --git a/0381-blscfg-remove-unused-typedef.patch b/0383-blscfg-remove-unused-typedef.patch similarity index 100% rename from 0381-blscfg-remove-unused-typedef.patch rename to 0383-blscfg-remove-unused-typedef.patch diff --git a/0382-blscfg-don-t-dynamically-allocate-default_blsdir.patch b/0384-blscfg-don-t-dynamically-allocate-default_blsdir.patch similarity index 100% rename from 0382-blscfg-don-t-dynamically-allocate-default_blsdir.patch rename to 0384-blscfg-don-t-dynamically-allocate-default_blsdir.patch diff --git a/0383-blscfg-sort-BLS-entries-by-version-field.patch b/0385-blscfg-sort-BLS-entries-by-version-field.patch similarity index 100% rename from 0383-blscfg-sort-BLS-entries-by-version-field.patch rename to 0385-blscfg-sort-BLS-entries-by-version-field.patch diff --git a/0384-blscfg-remove-NULL-guards-around-grub_free.patch b/0386-blscfg-remove-NULL-guards-around-grub_free.patch similarity index 100% rename from 0384-blscfg-remove-NULL-guards-around-grub_free.patch rename to 0386-blscfg-remove-NULL-guards-around-grub_free.patch diff --git a/0385-blscfg-fix-filename-in-no-linux-key-error.patch b/0387-blscfg-fix-filename-in-no-linux-key-error.patch similarity index 100% rename from 0385-blscfg-fix-filename-in-no-linux-key-error.patch rename to 0387-blscfg-fix-filename-in-no-linux-key-error.patch diff --git a/0386-blscfg-don-t-leak-bls_entry.filename.patch b/0388-blscfg-don-t-leak-bls_entry.filename.patch similarity index 100% rename from 0386-blscfg-don-t-leak-bls_entry.filename.patch rename to 0388-blscfg-don-t-leak-bls_entry.filename.patch diff --git a/0387-blscfg-fix-compilation-on-EFI-and-EMU.patch b/0389-blscfg-fix-compilation-on-EFI-and-EMU.patch similarity index 100% rename from 0387-blscfg-fix-compilation-on-EFI-and-EMU.patch rename to 0389-blscfg-fix-compilation-on-EFI-and-EMU.patch diff --git a/0388-Fix-our-linuxefi-linux-command-reunion.patch b/0390-Fix-our-linuxefi-linux-command-reunion.patch similarity index 100% rename from 0388-Fix-our-linuxefi-linux-command-reunion.patch rename to 0390-Fix-our-linuxefi-linux-command-reunion.patch diff --git a/0391-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch b/0391-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch new file mode 100644 index 0000000..a9e8151 --- /dev/null +++ b/0391-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Will Thompson +Date: Fri, 13 Jul 2018 05:51:54 +0100 +Subject: [PATCH] Add loadenv to blscfg and loadenv source file list +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without this, `make distcheck` fails because loadenv.h is not included +in the source tarball. + +This broke in ‘Add blscfg command support to parse BootLoaderSpec config +fragments’. + +Signed-off-by: Will Thompson +--- + grub-core/Makefile.core.def | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def +index 46ebe210263..4168097732b 100644 +--- a/grub-core/Makefile.core.def ++++ b/grub-core/Makefile.core.def +@@ -781,6 +781,7 @@ module = { + module = { + name = blscfg; + common = commands/blscfg.c; ++ common = commands/loadenv.h; + enable = efi; + enable = i386_pc; + enable = emu; +@@ -949,6 +950,7 @@ module = { + module = { + name = loadenv; + common = commands/loadenv.c; ++ common = commands/loadenv.h; + common = lib/envblk.c; + }; + diff --git a/0392-Jettison-the-non-linux16-linux-loader-make-linux16-p.patch b/0392-Jettison-the-non-linux16-linux-loader-make-linux16-p.patch new file mode 100644 index 0000000..3f3b26e --- /dev/null +++ b/0392-Jettison-the-non-linux16-linux-loader-make-linux16-p.patch @@ -0,0 +1,75 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Fri, 13 Jul 2018 16:15:27 -0400 +Subject: [PATCH] Jettison the non-linux16 "linux" loader; make linux16 provide + the command. + +--- + grub-core/Makefile.core.def | 9 +-------- + grub-core/loader/i386/pc/linux.c | 10 +++++++++- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def +index 4168097732b..f96b1933eea 100644 +--- a/grub-core/Makefile.core.def ++++ b/grub-core/Makefile.core.def +@@ -1650,13 +1650,6 @@ module = { + enable = i386_pc; + }; + +- +-module = { +- name = linux16; +- common = loader/i386/pc/linux.c; +- enable = i386_pc; +-}; +- + module = { + name = ntldr; + i386_pc = loader/i386/pc/ntldr.c; +@@ -1715,7 +1708,7 @@ module = { + + module = { + name = linux; +- i386_pc = loader/i386/linux.c; ++ i386_pc = loader/i386/pc/linux.c; + x86_64_efi = loader/i386/efi/linux.c; + i386_efi = loader/i386/efi/linux.c; + xen = loader/i386/xen.c; +diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c +index 1e369afcbad..cfff25c21b5 100644 +--- a/grub-core/loader/i386/pc/linux.c ++++ b/grub-core/loader/i386/pc/linux.c +@@ -481,7 +481,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + return grub_errno; + } + +-static grub_command_t cmd_linux, cmd_initrd; ++static grub_command_t cmd_linux, cmd_linux16, cmd_initrd, cmd_initrd16; + + GRUB_MOD_INIT(linux16) + { +@@ -489,9 +489,15 @@ GRUB_MOD_INIT(linux16) + return; + + cmd_linux = ++ grub_register_command ("linux", grub_cmd_linux, ++ 0, N_("Load Linux.")); ++ cmd_linux16 = + grub_register_command ("linux16", grub_cmd_linux, + 0, N_("Load Linux.")); + cmd_initrd = ++ grub_register_command ("initrd", grub_cmd_initrd, ++ 0, N_("Load initrd.")); ++ cmd_initrd16 = + grub_register_command ("initrd16", grub_cmd_initrd, + 0, N_("Load initrd.")); + my_mod = mod; +@@ -503,5 +509,7 @@ GRUB_MOD_FINI(linux16) + return; + + grub_unregister_command (cmd_linux); ++ grub_unregister_command (cmd_linux16); + grub_unregister_command (cmd_initrd); ++ grub_unregister_command (cmd_initrd16); + } diff --git a/grub.patches b/grub.patches index 83f4ea0..1cade54 100644 --- a/grub.patches +++ b/grub.patches @@ -150,239 +150,243 @@ Patch0149: 0149-grub-fs-tester-Fix-losetup-race.patch Patch0150: 0150-fdt-Move-prop_entry_size-to-fdt.h.patch Patch0151: 0151-efi-fdt-Set-address-size-cells-to-2-for-empty-tree.patch Patch0152: 0152-multiboot_elfxx.c-Fix-compilation-by-fixing-undeclar.patch -Patch0153: 0153-re-write-.gitignore.patch -Patch0154: 0154-IBM-client-architecture-CAS-reboot-support.patch -Patch0155: 0155-for-ppc-reset-console-display-attr-when-clear-screen.patch -Patch0156: 0156-Disable-GRUB-video-support-for-IBM-power-machines.patch -Patch0157: 0157-Honor-a-symlink-when-generating-configuration-by-gru.patch -Patch0158: 0158-Move-bash-completion-script-922997.patch -Patch0159: 0159-Update-to-minilzo-2.08.patch -Patch0160: 0160-Allow-fallback-to-include-entries-by-title-not-just-.patch -Patch0161: 0161-Add-GRUB_DISABLE_UUID.patch -Patch0162: 0162-Make-exit-take-a-return-code.patch -Patch0163: 0163-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch -Patch0164: 0164-Make-efi-machines-load-an-env-block-from-a-variable.patch -Patch0165: 0165-DHCP-client-ID-and-UUID-options-added.patch -Patch0166: 0166-trim-arp-packets-with-abnormal-size.patch -Patch0167: 0167-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch -Patch0168: 0168-Add-support-for-UEFI-operating-systems-returned-by-o.patch -Patch0169: 0169-Migrate-PPC-from-Yaboot-to-Grub2.patch -Patch0170: 0170-Add-fw_path-variable-revised.patch -Patch0171: 0171-Add-support-for-linuxefi.patch -Patch0172: 0172-Use-linuxefi-and-initrdefi-where-appropriate.patch -Patch0173: 0173-Don-t-allow-insmod-when-secure-boot-is-enabled.patch -Patch0174: 0174-Pass-x-hex-hex-straight-through-unmolested.patch -Patch0175: 0175-Add-X-option-to-printf-functions.patch -Patch0176: 0176-Search-for-specific-config-file-for-netboot.patch -Patch0177: 0177-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch -Patch0178: 0178-Don-t-write-messages-to-the-screen.patch -Patch0179: 0179-Don-t-print-GNU-GRUB-header.patch -Patch0180: 0180-Don-t-add-to-highlighted-row.patch -Patch0181: 0181-Message-string-cleanups.patch -Patch0182: 0182-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch -Patch0183: 0183-Use-the-correct-indentation-for-the-term-help-text.patch -Patch0184: 0184-Indent-menu-entries.patch -Patch0185: 0185-Fix-margins.patch -Patch0186: 0186-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch -Patch0187: 0187-Use-linux16-when-appropriate-880840.patch -Patch0188: 0188-Enable-pager-by-default.-985860.patch -Patch0189: 0189-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch -Patch0190: 0190-Don-t-say-GNU-Linux-in-generated-menus.patch -Patch0191: 0191-Don-t-draw-a-border-around-the-menu.patch -Patch0192: 0192-Use-the-standard-margin-for-the-timeout-string.patch -Patch0193: 0193-Add-.eh_frame-to-list-of-relocations-stripped.patch -Patch0194: 0194-Make-10_linux-work-with-our-changes-for-linux16-and-.patch -Patch0195: 0195-Don-t-print-during-fdt-loading-method.patch -Patch0196: 0196-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch -Patch0197: 0197-Don-t-require-a-password-to-boot-entries-generated-b.patch -Patch0198: 0198-Don-t-emit-Booting-.-message.patch -Patch0199: 0199-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch -Patch0200: 0200-use-fw_path-prefix-when-fallback-searching-for-grub-.patch -Patch0201: 0201-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch -Patch0202: 0202-Fix-convert-function-to-support-NVMe-devices.patch -Patch0203: 0203-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch -Patch0204: 0204-Use-the-default-device-tree-from-the-grub-default-fi.patch -Patch0205: 0205-reopen-SNP-protocol-for-exclusive-use-by-grub.patch -Patch0206: 0206-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch -Patch0207: 0207-Add-grub_util_readlink.patch -Patch0208: 0208-Make-editenv-chase-symlinks-including-those-across-d.patch -Patch0209: 0209-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch -Patch0210: 0210-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch -Patch0211: 0211-Load-arm-with-SB-enabled.patch -Patch0212: 0212-Try-prefix-if-fw_path-doesn-t-work.patch -Patch0213: 0213-Update-info-with-grub.cfg-netboot-selection-order-11.patch -Patch0214: 0214-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch -Patch0215: 0215-Handle-rssd-storage-devices.patch -Patch0216: 0216-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch -Patch0217: 0217-Make-grub2-mkconfig-construct-titles-that-look-like-.patch -Patch0218: 0218-Add-friendly-grub2-password-config-tool-985962.patch -Patch0219: 0219-Make-grub2-mkconfig-construct-titles-that-look-like-.patch -Patch0220: 0220-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch -Patch0221: 0221-tcp-add-window-scaling-support.patch -Patch0222: 0222-efinet-retransmit-if-our-device-is-busy.patch -Patch0223: 0223-Be-more-aggro-about-actually-using-the-configured-ne.patch -Patch0224: 0224-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch -Patch0225: 0225-Fix-security-issue-when-reading-username-and-passwor.patch -Patch0226: 0226-Warn-if-grub-password-will-not-be-read-1290803.patch -Patch0227: 0227-Clean-up-grub-setpassword-documentation-1290799.patch -Patch0228: 0228-Fix-locale-issue-in-grub-setpassword-1294243.patch -Patch0229: 0229-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch -Patch0230: 0230-efiemu-Fix-compilation-failure.patch -Patch0231: 0231-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch -Patch0232: 0232-Add-a-url-parser.patch -Patch0233: 0233-efinet-and-bootp-add-support-for-dhcpv6.patch -Patch0234: 0234-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch -Patch0235: 0235-Normalize-slashes-in-tftp-paths.patch -Patch0236: 0236-Fix-malformed-tftp-packets.patch -Patch0237: 0237-Fix-race-in-EFI-validation.patch -Patch0238: 0238-bz1374141-fix-incorrect-mask-for-ppc64.patch -Patch0239: 0239-Use-device-part-of-chainloader-target-if-present.patch -Patch0240: 0240-Add-secureboot-support-on-efi-chainloader.patch -Patch0241: 0241-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch -Patch0242: 0242-Make-grub_fatal-also-backtrace.patch -Patch0243: 0243-Rework-linux-command.patch -Patch0244: 0244-Rework-linux16-command.patch -Patch0245: 0245-Make-grub-editenv-build-again.patch -Patch0246: 0246-Fix-up-some-man-pages-rpmdiff-noticed.patch -Patch0247: 0247-Re-work-some-intricacies-of-PE-loading.patch -Patch0248: 0248-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch -Patch0249: 0249-linuxefi-fix-double-free-on-verification-failure.patch -Patch0250: 0250-fix-machine-type-test-in-30_os-prober.in.patch -Patch0251: 0251-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch -Patch0252: 0252-efi-chainloader-truncate-overlong-relocation-section.patch -Patch0253: 0253-linuxefi-minor-cleanups.patch -Patch0254: 0254-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch -Patch0255: 0255-Fix-up-linux-params-usage.patch -Patch0256: 0256-Make-exit-take-a-return-code.patch -Patch0257: 0257-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch -Patch0258: 0258-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch -Patch0259: 0259-Make-our-info-pages-say-grub2-where-appropriate.patch -Patch0260: 0260-print-more-debug-info-in-our-module-loader.patch -Patch0261: 0261-macos-just-build-chainloader-entries-don-t-try-any-x.patch -Patch0262: 0262-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch -Patch0263: 0263-export-btrfs_subvol-and-btrfs_subvolid.patch -Patch0264: 0264-grub2-btrfs-03-follow_default.patch -Patch0265: 0265-grub2-btrfs-04-grub2-install.patch -Patch0266: 0266-grub2-btrfs-05-grub2-mkconfig.patch -Patch0267: 0267-grub2-btrfs-06-subvol-mount.patch -Patch0268: 0268-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch -Patch0269: 0269-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch -Patch0270: 0270-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch -Patch0271: 0271-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch -Patch0272: 0272-Use-grub_efi_.-memory-helpers-where-reasonable.patch -Patch0273: 0273-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch -Patch0274: 0274-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch -Patch0275: 0275-don-t-ignore-const.patch -Patch0276: 0276-don-t-use-int-for-efi-status.patch -Patch0277: 0277-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch -Patch0278: 0278-Clean-up-some-errors-in-the-linuxefi-loader.patch -Patch0279: 0279-editenv-handle-relative-symlinks.patch -Patch0280: 0280-Make-libgrub.pp-depend-on-config-util.h.patch -Patch0281: 0281-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch -Patch0282: 0282-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch -Patch0283: 0283-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch -Patch0284: 0284-align-struct-efi_variable-better.patch -Patch0285: 0285-Add-quicksort-implementation.patch -Patch0286: 0286-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch -Patch0287: 0287-Add-BLS-support-to-grub-mkconfig.patch -Patch0288: 0288-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch -Patch0289: 0289-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch -Patch0290: 0290-Enable-blscfg-command-for-the-emu-platform.patch -Patch0291: 0291-Add-linux-and-initrd-commands-for-grub-emu.patch -Patch0292: 0292-Fix-the-efidir-in-grub-setpassword.patch -Patch0293: 0293-Add-grub2-switch-to-blscfg.patch -Patch0294: 0294-Add-grub_debug_enabled.patch -Patch0295: 0295-make-better-backtraces.patch -Patch0296: 0296-normal-don-t-draw-our-startup-message-if-debug-is-se.patch -Patch0297: 0297-Work-around-some-minor-include-path-weirdnesses.patch -Patch0298: 0298-Make-it-possible-to-enabled-build-id-sha1.patch -Patch0299: 0299-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch -Patch0300: 0300-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch -Patch0301: 0301-Only-attempt-to-scan-different-BLS-directories-on-EF.patch -Patch0302: 0302-Core-TPM-support.patch -Patch0303: 0303-Measure-kernel-initrd.patch -Patch0304: 0304-Add-BIOS-boot-measurement.patch -Patch0305: 0305-Measure-kernel-and-initrd-on-BIOS-systems.patch -Patch0306: 0306-Measure-the-kernel-commandline.patch -Patch0307: 0307-Measure-commands.patch -Patch0308: 0308-Measure-multiboot-images-and-modules.patch -Patch0309: 0309-Fix-boot-when-there-s-no-TPM.patch -Patch0310: 0310-Rework-TPM-measurements.patch -Patch0311: 0311-Fix-event-log-prefix.patch -Patch0312: 0312-Set-the-first-boot-menu-entry-as-default-when-using-.patch -Patch0313: 0313-tpm-fix-warnings-when-compiling-for-platforms-other-.patch -Patch0314: 0314-Make-TPM-errors-less-fatal.patch -Patch0315: 0315-blscfg-handle-multiple-initramfs-images.patch -Patch0316: 0316-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch -Patch0317: 0317-BLS-Use-etcdefaultgrub-instead-of-etc.patch -Patch0318: 0318-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch -Patch0319: 0319-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch -Patch0320: 0320-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch -Patch0321: 0321-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch -Patch0322: 0322-Include-OSTree-path-when-searching-kernels-images-if.patch -Patch0323: 0323-Use-BLS-version-field-to-compare-entries-if-id-field.patch -Patch0324: 0324-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch -Patch0325: 0325-Fixup-for-newer-compiler.patch -Patch0326: 0326-Don-t-attempt-to-export-the-start-and-_start-symbols.patch -Patch0327: 0327-Simplify-BLS-entry-key-val-pairs-lookup.patch -Patch0328: 0328-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch -Patch0329: 0329-Skip-leading-spaces-on-BLS-field-values.patch -Patch0330: 0330-Fixup-for-newer-compiler.patch -Patch0331: 0331-TPM-Fix-hash_log_extend_event-function-prototype.patch -Patch0332: 0332-TPM-Fix-compiler-warnings.patch -Patch0333: 0333-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch -Patch0334: 0334-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch -Patch0335: 0335-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch -Patch0336: 0336-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch -Patch0337: 0337-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch -Patch0338: 0338-Revert-trim-arp-packets-with-abnormal-size.patch -Patch0339: 0339-Use-xid-to-match-DHCP-replies.patch -Patch0340: 0340-Add-support-for-non-Ethernet-network-cards.patch -Patch0341: 0341-misc-fix-invalid-character-recongition-in-strto-l.patch -Patch0342: 0342-net-read-bracketed-ipv6-addrs-and-port-numbers.patch -Patch0343: 0343-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch -Patch0344: 0344-bootp-New-net_bootp6-command.patch -Patch0345: 0345-Put-back-our-code-to-add-a-local-route.patch -Patch0346: 0346-efinet-UEFI-IPv6-PXE-support.patch -Patch0347: 0347-grub.texi-Add-net_bootp6-doument.patch -Patch0348: 0348-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch -Patch0349: 0349-efinet-Setting-network-from-UEFI-device-path.patch -Patch0350: 0350-efinet-Setting-DNS-server-from-UEFI-protocol.patch -Patch0351: 0351-Fix-one-more-coverity-complaint.patch -Patch0352: 0352-Fix-grub_net_hwaddr_to_str.patch -Patch0353: 0353-Support-UEFI-networking-protocols.patch -Patch0354: 0354-AUDIT-0-http-boot-tracker-bug.patch -Patch0355: 0355-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch -Patch0356: 0356-efi-uga-use-64-bit-for-fb_base.patch -Patch0357: 0357-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch -Patch0358: 0358-EFI-console-Add-grub_console_read_key_stroke-helper-.patch -Patch0359: 0359-EFI-console-Implement-getkeystatus-support.patch -Patch0360: 0360-Make-grub_getkeystatus-helper-funtion-available-ever.patch -Patch0361: 0361-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch -Patch0362: 0362-grub-editenv-Add-incr-command-to-increment-integer-v.patch -Patch0363: 0363-Add-auto-hide-menu-support.patch -Patch0364: 0364-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch -Patch0365: 0365-Add-grub-set-bootflag-utility.patch -Patch0366: 0366-Fix-grub-setpassword-o-s-output-path.patch -Patch0367: 0367-Make-grub-set-password-be-named-like-all-the-other-g.patch -Patch0368: 0368-docs-Add-grub-boot-indeterminate.service-example.patch -Patch0369: 0369-EFI-console-Fix-the-enter-key-not-working-on-X86-tab.patch -Patch0370: 0370-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch -Patch0371: 0371-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch -Patch0372: 0372-Minor-fixes-to-make-armv7hl-build-as-arm-efi.patch -Patch0373: 0373-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch -Patch0374: 0374-gentpl-add-disable-support.patch -Patch0375: 0375-gentpl-add-pc-firmware-type.patch -Patch0376: 0376-Disable-the-reboot-module-on-EFI-builds-it-is-in-ker.patch -Patch0377: 0377-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch -Patch0378: 0378-Make-the-linuxefi-module-just-be-the-x86-efi-version.patch -Patch0379: 0379-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch -Patch0380: 0380-Don-t-build-the-fdt-command.patch -Patch0381: 0381-blscfg-remove-unused-typedef.patch -Patch0382: 0382-blscfg-don-t-dynamically-allocate-default_blsdir.patch -Patch0383: 0383-blscfg-sort-BLS-entries-by-version-field.patch -Patch0384: 0384-blscfg-remove-NULL-guards-around-grub_free.patch -Patch0385: 0385-blscfg-fix-filename-in-no-linux-key-error.patch -Patch0386: 0386-blscfg-don-t-leak-bls_entry.filename.patch -Patch0387: 0387-blscfg-fix-compilation-on-EFI-and-EMU.patch -Patch0388: 0388-Fix-our-linuxefi-linux-command-reunion.patch +Patch0153: 0153-grub-setup-Debug-message-cleanup.patch +Patch0154: 0154-efi-console-Fix-the-enter-key-not-working-on-x86-tab.patch +Patch0155: 0155-commands-file-Use-definitions-from-arm-linux.h.patch +Patch0156: 0156-commands-file-Use-definitions-from-arm64-linux.h.patch +Patch0157: 0157-re-write-.gitignore.patch +Patch0158: 0158-IBM-client-architecture-CAS-reboot-support.patch +Patch0159: 0159-for-ppc-reset-console-display-attr-when-clear-screen.patch +Patch0160: 0160-Disable-GRUB-video-support-for-IBM-power-machines.patch +Patch0161: 0161-Honor-a-symlink-when-generating-configuration-by-gru.patch +Patch0162: 0162-Move-bash-completion-script-922997.patch +Patch0163: 0163-Update-to-minilzo-2.08.patch +Patch0164: 0164-Allow-fallback-to-include-entries-by-title-not-just-.patch +Patch0165: 0165-Add-GRUB_DISABLE_UUID.patch +Patch0166: 0166-Make-exit-take-a-return-code.patch +Patch0167: 0167-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch +Patch0168: 0168-Make-efi-machines-load-an-env-block-from-a-variable.patch +Patch0169: 0169-DHCP-client-ID-and-UUID-options-added.patch +Patch0170: 0170-trim-arp-packets-with-abnormal-size.patch +Patch0171: 0171-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch +Patch0172: 0172-Add-support-for-UEFI-operating-systems-returned-by-o.patch +Patch0173: 0173-Migrate-PPC-from-Yaboot-to-Grub2.patch +Patch0174: 0174-Add-fw_path-variable-revised.patch +Patch0175: 0175-Add-support-for-linuxefi.patch +Patch0176: 0176-Use-linuxefi-and-initrdefi-where-appropriate.patch +Patch0177: 0177-Don-t-allow-insmod-when-secure-boot-is-enabled.patch +Patch0178: 0178-Pass-x-hex-hex-straight-through-unmolested.patch +Patch0179: 0179-Add-X-option-to-printf-functions.patch +Patch0180: 0180-Search-for-specific-config-file-for-netboot.patch +Patch0181: 0181-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch +Patch0182: 0182-Don-t-write-messages-to-the-screen.patch +Patch0183: 0183-Don-t-print-GNU-GRUB-header.patch +Patch0184: 0184-Don-t-add-to-highlighted-row.patch +Patch0185: 0185-Message-string-cleanups.patch +Patch0186: 0186-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch +Patch0187: 0187-Use-the-correct-indentation-for-the-term-help-text.patch +Patch0188: 0188-Indent-menu-entries.patch +Patch0189: 0189-Fix-margins.patch +Patch0190: 0190-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch +Patch0191: 0191-Use-linux16-when-appropriate-880840.patch +Patch0192: 0192-Enable-pager-by-default.-985860.patch +Patch0193: 0193-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch +Patch0194: 0194-Don-t-say-GNU-Linux-in-generated-menus.patch +Patch0195: 0195-Don-t-draw-a-border-around-the-menu.patch +Patch0196: 0196-Use-the-standard-margin-for-the-timeout-string.patch +Patch0197: 0197-Add-.eh_frame-to-list-of-relocations-stripped.patch +Patch0198: 0198-Make-10_linux-work-with-our-changes-for-linux16-and-.patch +Patch0199: 0199-Don-t-print-during-fdt-loading-method.patch +Patch0200: 0200-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch +Patch0201: 0201-Don-t-require-a-password-to-boot-entries-generated-b.patch +Patch0202: 0202-Don-t-emit-Booting-.-message.patch +Patch0203: 0203-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch +Patch0204: 0204-use-fw_path-prefix-when-fallback-searching-for-grub-.patch +Patch0205: 0205-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch +Patch0206: 0206-Fix-convert-function-to-support-NVMe-devices.patch +Patch0207: 0207-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch +Patch0208: 0208-Use-the-default-device-tree-from-the-grub-default-fi.patch +Patch0209: 0209-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +Patch0210: 0210-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +Patch0211: 0211-Add-grub_util_readlink.patch +Patch0212: 0212-Make-editenv-chase-symlinks-including-those-across-d.patch +Patch0213: 0213-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch +Patch0214: 0214-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch +Patch0215: 0215-Load-arm-with-SB-enabled.patch +Patch0216: 0216-Try-prefix-if-fw_path-doesn-t-work.patch +Patch0217: 0217-Update-info-with-grub.cfg-netboot-selection-order-11.patch +Patch0218: 0218-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch +Patch0219: 0219-Handle-rssd-storage-devices.patch +Patch0220: 0220-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch +Patch0221: 0221-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +Patch0222: 0222-Add-friendly-grub2-password-config-tool-985962.patch +Patch0223: 0223-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch +Patch0224: 0224-tcp-add-window-scaling-support.patch +Patch0225: 0225-efinet-retransmit-if-our-device-is-busy.patch +Patch0226: 0226-Be-more-aggro-about-actually-using-the-configured-ne.patch +Patch0227: 0227-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch +Patch0228: 0228-Fix-security-issue-when-reading-username-and-passwor.patch +Patch0229: 0229-Warn-if-grub-password-will-not-be-read-1290803.patch +Patch0230: 0230-Clean-up-grub-setpassword-documentation-1290799.patch +Patch0231: 0231-Fix-locale-issue-in-grub-setpassword-1294243.patch +Patch0232: 0232-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch +Patch0233: 0233-efiemu-Fix-compilation-failure.patch +Patch0234: 0234-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +Patch0235: 0235-Add-a-url-parser.patch +Patch0236: 0236-efinet-and-bootp-add-support-for-dhcpv6.patch +Patch0237: 0237-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +Patch0238: 0238-Normalize-slashes-in-tftp-paths.patch +Patch0239: 0239-Fix-malformed-tftp-packets.patch +Patch0240: 0240-Fix-race-in-EFI-validation.patch +Patch0241: 0241-bz1374141-fix-incorrect-mask-for-ppc64.patch +Patch0242: 0242-Use-device-part-of-chainloader-target-if-present.patch +Patch0243: 0243-Add-secureboot-support-on-efi-chainloader.patch +Patch0244: 0244-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +Patch0245: 0245-Make-grub_fatal-also-backtrace.patch +Patch0246: 0246-Rework-linux-command.patch +Patch0247: 0247-Rework-linux16-command.patch +Patch0248: 0248-Make-grub-editenv-build-again.patch +Patch0249: 0249-Fix-up-some-man-pages-rpmdiff-noticed.patch +Patch0250: 0250-Re-work-some-intricacies-of-PE-loading.patch +Patch0251: 0251-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch +Patch0252: 0252-linuxefi-fix-double-free-on-verification-failure.patch +Patch0253: 0253-fix-machine-type-test-in-30_os-prober.in.patch +Patch0254: 0254-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch +Patch0255: 0255-efi-chainloader-truncate-overlong-relocation-section.patch +Patch0256: 0256-linuxefi-minor-cleanups.patch +Patch0257: 0257-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch +Patch0258: 0258-Fix-up-linux-params-usage.patch +Patch0259: 0259-Make-exit-take-a-return-code.patch +Patch0260: 0260-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch +Patch0261: 0261-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch +Patch0262: 0262-Make-our-info-pages-say-grub2-where-appropriate.patch +Patch0263: 0263-print-more-debug-info-in-our-module-loader.patch +Patch0264: 0264-macos-just-build-chainloader-entries-don-t-try-any-x.patch +Patch0265: 0265-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch +Patch0266: 0266-export-btrfs_subvol-and-btrfs_subvolid.patch +Patch0267: 0267-grub2-btrfs-03-follow_default.patch +Patch0268: 0268-grub2-btrfs-04-grub2-install.patch +Patch0269: 0269-grub2-btrfs-05-grub2-mkconfig.patch +Patch0270: 0270-grub2-btrfs-06-subvol-mount.patch +Patch0271: 0271-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch +Patch0272: 0272-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch +Patch0273: 0273-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch +Patch0274: 0274-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch +Patch0275: 0275-Use-grub_efi_.-memory-helpers-where-reasonable.patch +Patch0276: 0276-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch +Patch0277: 0277-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch +Patch0278: 0278-don-t-ignore-const.patch +Patch0279: 0279-don-t-use-int-for-efi-status.patch +Patch0280: 0280-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +Patch0281: 0281-Clean-up-some-errors-in-the-linuxefi-loader.patch +Patch0282: 0282-editenv-handle-relative-symlinks.patch +Patch0283: 0283-Make-libgrub.pp-depend-on-config-util.h.patch +Patch0284: 0284-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch +Patch0285: 0285-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch +Patch0286: 0286-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch +Patch0287: 0287-align-struct-efi_variable-better.patch +Patch0288: 0288-Add-quicksort-implementation.patch +Patch0289: 0289-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch +Patch0290: 0290-Add-BLS-support-to-grub-mkconfig.patch +Patch0291: 0291-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch +Patch0292: 0292-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch +Patch0293: 0293-Enable-blscfg-command-for-the-emu-platform.patch +Patch0294: 0294-Add-linux-and-initrd-commands-for-grub-emu.patch +Patch0295: 0295-Fix-the-efidir-in-grub-setpassword.patch +Patch0296: 0296-Add-grub2-switch-to-blscfg.patch +Patch0297: 0297-Add-grub_debug_enabled.patch +Patch0298: 0298-make-better-backtraces.patch +Patch0299: 0299-normal-don-t-draw-our-startup-message-if-debug-is-se.patch +Patch0300: 0300-Work-around-some-minor-include-path-weirdnesses.patch +Patch0301: 0301-Make-it-possible-to-enabled-build-id-sha1.patch +Patch0302: 0302-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch +Patch0303: 0303-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch +Patch0304: 0304-Only-attempt-to-scan-different-BLS-directories-on-EF.patch +Patch0305: 0305-Core-TPM-support.patch +Patch0306: 0306-Measure-kernel-initrd.patch +Patch0307: 0307-Add-BIOS-boot-measurement.patch +Patch0308: 0308-Measure-kernel-and-initrd-on-BIOS-systems.patch +Patch0309: 0309-Measure-the-kernel-commandline.patch +Patch0310: 0310-Measure-commands.patch +Patch0311: 0311-Measure-multiboot-images-and-modules.patch +Patch0312: 0312-Fix-boot-when-there-s-no-TPM.patch +Patch0313: 0313-Rework-TPM-measurements.patch +Patch0314: 0314-Fix-event-log-prefix.patch +Patch0315: 0315-Set-the-first-boot-menu-entry-as-default-when-using-.patch +Patch0316: 0316-tpm-fix-warnings-when-compiling-for-platforms-other-.patch +Patch0317: 0317-Make-TPM-errors-less-fatal.patch +Patch0318: 0318-blscfg-handle-multiple-initramfs-images.patch +Patch0319: 0319-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch +Patch0320: 0320-BLS-Use-etcdefaultgrub-instead-of-etc.patch +Patch0321: 0321-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch +Patch0322: 0322-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch +Patch0323: 0323-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch +Patch0324: 0324-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch +Patch0325: 0325-Include-OSTree-path-when-searching-kernels-images-if.patch +Patch0326: 0326-Use-BLS-version-field-to-compare-entries-if-id-field.patch +Patch0327: 0327-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch +Patch0328: 0328-Fixup-for-newer-compiler.patch +Patch0329: 0329-Don-t-attempt-to-export-the-start-and-_start-symbols.patch +Patch0330: 0330-Simplify-BLS-entry-key-val-pairs-lookup.patch +Patch0331: 0331-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch +Patch0332: 0332-Skip-leading-spaces-on-BLS-field-values.patch +Patch0333: 0333-Fixup-for-newer-compiler.patch +Patch0334: 0334-TPM-Fix-hash_log_extend_event-function-prototype.patch +Patch0335: 0335-TPM-Fix-compiler-warnings.patch +Patch0336: 0336-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch +Patch0337: 0337-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch +Patch0338: 0338-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch +Patch0339: 0339-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch +Patch0340: 0340-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch +Patch0341: 0341-Revert-trim-arp-packets-with-abnormal-size.patch +Patch0342: 0342-Use-xid-to-match-DHCP-replies.patch +Patch0343: 0343-Add-support-for-non-Ethernet-network-cards.patch +Patch0344: 0344-misc-fix-invalid-character-recongition-in-strto-l.patch +Patch0345: 0345-net-read-bracketed-ipv6-addrs-and-port-numbers.patch +Patch0346: 0346-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch +Patch0347: 0347-bootp-New-net_bootp6-command.patch +Patch0348: 0348-Put-back-our-code-to-add-a-local-route.patch +Patch0349: 0349-efinet-UEFI-IPv6-PXE-support.patch +Patch0350: 0350-grub.texi-Add-net_bootp6-doument.patch +Patch0351: 0351-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch +Patch0352: 0352-efinet-Setting-network-from-UEFI-device-path.patch +Patch0353: 0353-efinet-Setting-DNS-server-from-UEFI-protocol.patch +Patch0354: 0354-Fix-one-more-coverity-complaint.patch +Patch0355: 0355-Fix-grub_net_hwaddr_to_str.patch +Patch0356: 0356-Support-UEFI-networking-protocols.patch +Patch0357: 0357-AUDIT-0-http-boot-tracker-bug.patch +Patch0358: 0358-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch +Patch0359: 0359-efi-uga-use-64-bit-for-fb_base.patch +Patch0360: 0360-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch +Patch0361: 0361-EFI-console-Add-grub_console_read_key_stroke-helper-.patch +Patch0362: 0362-EFI-console-Implement-getkeystatus-support.patch +Patch0363: 0363-Make-grub_getkeystatus-helper-funtion-available-ever.patch +Patch0364: 0364-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch +Patch0365: 0365-grub-editenv-Add-incr-command-to-increment-integer-v.patch +Patch0366: 0366-Add-auto-hide-menu-support.patch +Patch0367: 0367-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch +Patch0368: 0368-Add-grub-set-bootflag-utility.patch +Patch0369: 0369-Fix-grub-setpassword-o-s-output-path.patch +Patch0370: 0370-Make-grub-set-password-be-named-like-all-the-other-g.patch +Patch0371: 0371-docs-Add-grub-boot-indeterminate.service-example.patch +Patch0372: 0372-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch +Patch0373: 0373-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch +Patch0374: 0374-Minor-fixes-to-make-armv7hl-build-as-arm-efi.patch +Patch0375: 0375-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch +Patch0376: 0376-gentpl-add-disable-support.patch +Patch0377: 0377-gentpl-add-pc-firmware-type.patch +Patch0378: 0378-Disable-the-reboot-module-on-EFI-builds-it-is-in-ker.patch +Patch0379: 0379-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch +Patch0380: 0380-Make-the-linuxefi-module-just-be-the-x86-efi-version.patch +Patch0381: 0381-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch +Patch0382: 0382-Don-t-build-the-fdt-command.patch +Patch0383: 0383-blscfg-remove-unused-typedef.patch +Patch0384: 0384-blscfg-don-t-dynamically-allocate-default_blsdir.patch +Patch0385: 0385-blscfg-sort-BLS-entries-by-version-field.patch +Patch0386: 0386-blscfg-remove-NULL-guards-around-grub_free.patch +Patch0387: 0387-blscfg-fix-filename-in-no-linux-key-error.patch +Patch0388: 0388-blscfg-don-t-leak-bls_entry.filename.patch +Patch0389: 0389-blscfg-fix-compilation-on-EFI-and-EMU.patch +Patch0390: 0390-Fix-our-linuxefi-linux-command-reunion.patch +Patch0391: 0391-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch +Patch0392: 0392-Jettison-the-non-linux16-linux-loader-make-linux16-p.patch diff --git a/grub2.spec b/grub2.spec index a51e7c7..2b924e7 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -457,6 +457,9 @@ fi %endif %changelog +* Mon Jul 16 2018 pjones - 2.02-43 +- Rework SB patches and 10_linux.in changes + * Fri Jul 13 2018 Peter Jones - 2.02-42 - Revert broken moduledir fix *again*.