diff --git a/0064-info-in-builddir.patch b/0064-info-in-builddir.patch deleted file mode 100644 index 67995585..00000000 --- a/0064-info-in-builddir.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 5cf0df8753c19e83251c7244cafe38869a65060f Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Tue, 8 Aug 2017 13:08:59 -0400 -Subject: [PATCH 064/229] info-in-builddir - ---- - docs/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/docs/Makefile.am b/docs/Makefile.am -index 93eb3962765..e396ba10f46 100644 ---- a/docs/Makefile.am -+++ b/docs/Makefile.am -@@ -1,4 +1,4 @@ --AUTOMAKE_OPTIONS = subdir-objects -+AUTOMAKE_OPTIONS = subdir-objects info-in-builddir - - # AM_MAKEINFOFLAGS = --no-split --no-validate - info_TEXINFOS = grub.texi grub-dev.texi --- -2.15.0 - diff --git a/0065-re-write-.gitignore.patch b/0064-re-write-.gitignore.patch similarity index 98% rename from 0065-re-write-.gitignore.patch rename to 0064-re-write-.gitignore.patch index cef5ee67..bd0ec2b4 100644 --- a/0065-re-write-.gitignore.patch +++ b/0064-re-write-.gitignore.patch @@ -1,7 +1,7 @@ -From ff9da35fd789354cc1490b75893e765771808352 Mon Sep 17 00:00:00 2001 +From 38bfcd3054c28aa40234840c12d900f1d18a217d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 8 Aug 2017 12:48:04 -0400 -Subject: [PATCH 065/229] re-write .gitignore +Subject: [PATCH 064/229] re-write .gitignore --- .gitignore | 352 ++++++++++++-------------------------- diff --git a/0066-IBM-client-architecture-CAS-reboot-support.patch b/0065-IBM-client-architecture-CAS-reboot-support.patch similarity index 97% rename from 0066-IBM-client-architecture-CAS-reboot-support.patch rename to 0065-IBM-client-architecture-CAS-reboot-support.patch index fab4ea36..b0a52ef9 100644 --- a/0066-IBM-client-architecture-CAS-reboot-support.patch +++ b/0065-IBM-client-architecture-CAS-reboot-support.patch @@ -1,7 +1,7 @@ -From 34423216f8f3d7ce6086e2f1ee9869407e6a2221 Mon Sep 17 00:00:00 2001 +From bf1fd830091fff49e26f39027e0db8fd4b688624 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Thu, 20 Sep 2012 18:07:39 -0300 -Subject: [PATCH 066/229] IBM client architecture (CAS) reboot support +Subject: [PATCH 065/229] IBM client architecture (CAS) reboot support This is an implementation of IBM client architecture (CAS) reboot for GRUB. diff --git a/0067-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0066-for-ppc-reset-console-display-attr-when-clear-screen.patch similarity index 90% rename from 0067-for-ppc-reset-console-display-attr-when-clear-screen.patch rename to 0066-for-ppc-reset-console-display-attr-when-clear-screen.patch index 0da76fbd..429bbdfd 100644 --- a/0067-for-ppc-reset-console-display-attr-when-clear-screen.patch +++ b/0066-for-ppc-reset-console-display-attr-when-clear-screen.patch @@ -1,7 +1,7 @@ -From 070dc282d3cc6602571296e90945df9d4671aecb Mon Sep 17 00:00:00 2001 +From 8b30fab3c07a9fc8549e404c411b747b960c57b2 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 24 Apr 2013 10:51:48 -0300 -Subject: [PATCH 067/229] for ppc, reset console display attr when clear screen +Subject: [PATCH 066/229] for ppc, reset console display attr when clear screen v2: Also use \x0c instead of a literal ^L to make future patches less awkward. diff --git a/0068-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0067-Disable-GRUB-video-support-for-IBM-power-machines.patch similarity index 94% rename from 0068-Disable-GRUB-video-support-for-IBM-power-machines.patch rename to 0067-Disable-GRUB-video-support-for-IBM-power-machines.patch index 9405e824..0410ea15 100644 --- a/0068-Disable-GRUB-video-support-for-IBM-power-machines.patch +++ b/0067-Disable-GRUB-video-support-for-IBM-power-machines.patch @@ -1,7 +1,7 @@ -From 4e31478fdf4cda470305c1bb2acb9b820e790757 Mon Sep 17 00:00:00 2001 +From 45322cbc9402639a431fc0f33bd76e387e6f02bf Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 11 Jun 2013 15:14:05 -0300 -Subject: [PATCH 068/229] Disable GRUB video support for IBM power machines +Subject: [PATCH 067/229] Disable GRUB video support for IBM power machines Should fix the problem in bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=973205 diff --git a/0069-Honor-a-symlink-when-generating-configuration-by-gru.patch b/0068-Honor-a-symlink-when-generating-configuration-by-gru.patch similarity index 86% rename from 0069-Honor-a-symlink-when-generating-configuration-by-gru.patch rename to 0068-Honor-a-symlink-when-generating-configuration-by-gru.patch index 27c76c3b..e143bb2d 100644 --- a/0069-Honor-a-symlink-when-generating-configuration-by-gru.patch +++ b/0068-Honor-a-symlink-when-generating-configuration-by-gru.patch @@ -1,7 +1,7 @@ -From 35535549324923af7fecf79cc739baba48246f21 Mon Sep 17 00:00:00 2001 +From c29e260c9f41f4f802fa852b6c46fb2e5d912cb6 Mon Sep 17 00:00:00 2001 From: Marcel Kolaja Date: Tue, 21 Jan 2014 10:57:08 -0500 -Subject: [PATCH 069/229] Honor a symlink when generating configuration by +Subject: [PATCH 068/229] Honor a symlink when generating configuration by grub2-mkconfig Honor a symlink when generating configuration by grub2-mkconfig, so that diff --git a/0070-Move-bash-completion-script-922997.patch b/0069-Move-bash-completion-script-922997.patch similarity index 93% rename from 0070-Move-bash-completion-script-922997.patch rename to 0069-Move-bash-completion-script-922997.patch index a47d25e3..06f3ba36 100644 --- a/0070-Move-bash-completion-script-922997.patch +++ b/0069-Move-bash-completion-script-922997.patch @@ -1,7 +1,7 @@ -From 999bbc2002275efce284aed6e1e31b3ca351fa19 Mon Sep 17 00:00:00 2001 +From 8eaf2f497a6bcffc5554509533940ac2b764b981 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Apr 2013 14:35:34 -0400 -Subject: [PATCH 070/229] Move bash completion script (#922997) +Subject: [PATCH 069/229] Move bash completion script (#922997) Apparently these go in a new place now. --- diff --git a/0071-Update-to-minilzo-2.08.patch b/0070-Update-to-minilzo-2.08.patch similarity index 99% rename from 0071-Update-to-minilzo-2.08.patch rename to 0070-Update-to-minilzo-2.08.patch index eb948f45..0bd0f7a5 100644 --- a/0071-Update-to-minilzo-2.08.patch +++ b/0070-Update-to-minilzo-2.08.patch @@ -1,7 +1,7 @@ -From c0977f7fd42e16cc568af7ae667a2aeda85eb583 Mon Sep 17 00:00:00 2001 +From 9a1e99c5628bafa9e3970a5317b721da704bec6a Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Dec 2014 15:36:09 -0500 -Subject: [PATCH 071/229] Update to minilzo-2.08 +Subject: [PATCH 070/229] Update to minilzo-2.08 This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow diff --git a/0072-Allow-fallback-to-include-entries-by-title-not-just-.patch b/0071-Allow-fallback-to-include-entries-by-title-not-just-.patch similarity index 96% rename from 0072-Allow-fallback-to-include-entries-by-title-not-just-.patch rename to 0071-Allow-fallback-to-include-entries-by-title-not-just-.patch index 5f7728a2..00fc4cf1 100644 --- a/0072-Allow-fallback-to-include-entries-by-title-not-just-.patch +++ b/0071-Allow-fallback-to-include-entries-by-title-not-just-.patch @@ -1,7 +1,7 @@ -From 15e9ccc8abd5621107788bea6ae6f2bdb27a3ed3 Mon Sep 17 00:00:00 2001 +From 27845fb323de35e9dcaad8c738eb1a2a2bc316f8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 5 Sep 2014 10:07:04 -0400 -Subject: [PATCH 072/229] Allow "fallback" to include entries by title, not +Subject: [PATCH 071/229] Allow "fallback" to include entries by title, not just number. Resolves: rhbz#1026084 diff --git a/0073-Add-GRUB_DISABLE_UUID.patch b/0072-Add-GRUB_DISABLE_UUID.patch similarity index 97% rename from 0073-Add-GRUB_DISABLE_UUID.patch rename to 0072-Add-GRUB_DISABLE_UUID.patch index a3ab5aa8..93eed1b4 100644 --- a/0073-Add-GRUB_DISABLE_UUID.patch +++ b/0072-Add-GRUB_DISABLE_UUID.patch @@ -1,7 +1,7 @@ -From 87602724b509a60628623baabf5a2c7741a68884 Mon Sep 17 00:00:00 2001 +From 7f7429e93fa791ac2c002beaafab9b9d9bd86b89 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 16:49:25 -0400 -Subject: [PATCH 073/229] Add GRUB_DISABLE_UUID. +Subject: [PATCH 072/229] Add GRUB_DISABLE_UUID. This will cause "search --fs-uuid --set=root ..." not to be generated by grub2-mkconfig, and instead simply attempt to use the grub device name diff --git a/0074-Make-exit-take-a-return-code.patch b/0073-Make-exit-take-a-return-code.patch similarity index 98% rename from 0074-Make-exit-take-a-return-code.patch rename to 0073-Make-exit-take-a-return-code.patch index 9e2acc84..fbf52ee8 100644 --- a/0074-Make-exit-take-a-return-code.patch +++ b/0073-Make-exit-take-a-return-code.patch @@ -1,7 +1,7 @@ -From 68d514b51b81911d8359d7825618112dae4a44d9 Mon Sep 17 00:00:00 2001 +From 384ccb1b44fc23514a59529f58f984dcc4a75cc9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 26 Feb 2014 21:49:12 -0500 -Subject: [PATCH 074/229] Make "exit" take a return code. +Subject: [PATCH 073/229] Make "exit" take a return code. This adds "exit" with a return code. With this patch, any "exit" command /may/ include a return code, and on platforms that support diff --git a/0075-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch b/0074-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch similarity index 77% rename from 0075-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch rename to 0074-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch index 5c9e2e0e..f7ed6b2a 100644 --- a/0075-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch +++ b/0074-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch @@ -1,7 +1,7 @@ -From 126f6952b853ea67e784650ed12f365ab7988f51 Mon Sep 17 00:00:00 2001 +From 939f3dfcfacde13bd7ebfe411c0dceee9e5ed0ae Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 22 Jul 2015 11:21:01 -0400 -Subject: [PATCH 075/229] Mark po/exclude.pot as binary so git won't try to +Subject: [PATCH 074/229] Mark po/exclude.pot as binary so git won't try to diff nonprintables. Signed-off-by: Peter Jones diff --git a/0076-Make-efi-machines-load-an-env-block-from-a-variable.patch b/0075-Make-efi-machines-load-an-env-block-from-a-variable.patch similarity index 94% rename from 0076-Make-efi-machines-load-an-env-block-from-a-variable.patch rename to 0075-Make-efi-machines-load-an-env-block-from-a-variable.patch index 8b1f6caa..4acdbf19 100644 --- a/0076-Make-efi-machines-load-an-env-block-from-a-variable.patch +++ b/0075-Make-efi-machines-load-an-env-block-from-a-variable.patch @@ -1,7 +1,7 @@ -From 506b52759b2b2ad46e7b389979fcbaa78d68dab9 Mon Sep 17 00:00:00 2001 +From 805220eb48a8cabcc83628d90aa40f3204b21a71 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 7 Dec 2015 14:20:49 -0500 -Subject: [PATCH 076/229] Make efi machines load an env block from a variable +Subject: [PATCH 075/229] Make efi machines load an env block from a variable Signed-off-by: Peter Jones --- diff --git a/0077-DHCP-client-ID-and-UUID-options-added.patch b/0076-DHCP-client-ID-and-UUID-options-added.patch similarity index 96% rename from 0077-DHCP-client-ID-and-UUID-options-added.patch rename to 0076-DHCP-client-ID-and-UUID-options-added.patch index aa9ca778..648cb941 100644 --- a/0077-DHCP-client-ID-and-UUID-options-added.patch +++ b/0076-DHCP-client-ID-and-UUID-options-added.patch @@ -1,7 +1,7 @@ -From 8a0b654a520e407da69e0cf64f3dd6bb7cf86240 Mon Sep 17 00:00:00 2001 +From cefc164d655fb7709efbc37a317952ff3ec4aeb3 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 17:18:53 -0200 -Subject: [PATCH 077/229] DHCP client ID and UUID options added. +Subject: [PATCH 076/229] DHCP client ID and UUID options added. --- grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++----- diff --git a/0078-trim-arp-packets-with-abnormal-size.patch b/0077-trim-arp-packets-with-abnormal-size.patch similarity index 89% rename from 0078-trim-arp-packets-with-abnormal-size.patch rename to 0077-trim-arp-packets-with-abnormal-size.patch index 03ff64bd..f35e1567 100644 --- a/0078-trim-arp-packets-with-abnormal-size.patch +++ b/0077-trim-arp-packets-with-abnormal-size.patch @@ -1,7 +1,7 @@ -From cffad45026af9a05a0509daf593fa87148a3de66 Mon Sep 17 00:00:00 2001 +From 571a6cce3b0d4c8abf11efc320e2de6ff9188d60 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 5 Feb 2014 09:42:42 -0200 -Subject: [PATCH 078/229] trim arp packets with abnormal size +Subject: [PATCH 077/229] trim arp packets with abnormal size GRUB uses arp request to create the arp response. If the incoming packet is foobared, GRUB needs to trim the arp response packet before sending it. diff --git a/0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch b/0078-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch similarity index 90% rename from 0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch rename to 0078-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch index 7be739c7..23dd1892 100644 --- a/0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch +++ b/0078-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch @@ -1,7 +1,7 @@ -From 97b0254d8f3de9a51aa3df570d862bbb8dbd044b Mon Sep 17 00:00:00 2001 +From 6cd959a64f588e256f0ba17e31bf2720b9cdec88 Mon Sep 17 00:00:00 2001 From: Prarit Bhargava Date: Wed, 12 Mar 2014 10:58:16 -0400 -Subject: [PATCH 079/229] Fix bad test on GRUB_DISABLE_SUBMENU. +Subject: [PATCH 078/229] Fix bad test on GRUB_DISABLE_SUBMENU. The file /etc/grub.d/10_linux does diff --git a/0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch b/0079-Add-support-for-UEFI-operating-systems-returned-by-o.patch similarity index 90% rename from 0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch rename to 0079-Add-support-for-UEFI-operating-systems-returned-by-o.patch index 3a348ff3..89e78db6 100644 --- a/0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch +++ b/0079-Add-support-for-UEFI-operating-systems-returned-by-o.patch @@ -1,7 +1,7 @@ -From cf5302cca4a0daf5eb9b058243e6f56e63ab58dc Mon Sep 17 00:00:00 2001 +From 0254265409f80b369c35fb474c7371feb6f9ae1d Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 12 Jun 2013 11:51:49 -0400 -Subject: [PATCH 080/229] Add support for UEFI operating systems returned by +Subject: [PATCH 079/229] Add support for UEFI operating systems returned by os-prober os-prober returns UEFI operating systems in the form: diff --git a/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0080-Migrate-PPC-from-Yaboot-to-Grub2.patch similarity index 96% rename from 0081-Migrate-PPC-from-Yaboot-to-Grub2.patch rename to 0080-Migrate-PPC-from-Yaboot-to-Grub2.patch index 91daed2c..fad62fdb 100644 --- a/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch +++ b/0080-Migrate-PPC-from-Yaboot-to-Grub2.patch @@ -1,7 +1,7 @@ -From 4fbdca3b8a359170032882db53646cc4bfd17f6b Mon Sep 17 00:00:00 2001 +From f2b4c105e3657cc32ed0f7aefa713f161cdf64f1 Mon Sep 17 00:00:00 2001 From: Mark Hamzy Date: Wed, 28 Mar 2012 14:46:41 -0500 -Subject: [PATCH 081/229] Migrate PPC from Yaboot to Grub2 +Subject: [PATCH 080/229] Migrate PPC from Yaboot to Grub2 Add configuration support for serial terminal consoles. This will set the maximum screen size so that text is not overwritten. diff --git a/0082-Add-fw_path-variable-revised.patch b/0081-Add-fw_path-variable-revised.patch similarity index 94% rename from 0082-Add-fw_path-variable-revised.patch rename to 0081-Add-fw_path-variable-revised.patch index b3b1c6c3..a77fc418 100644 --- a/0082-Add-fw_path-variable-revised.patch +++ b/0081-Add-fw_path-variable-revised.patch @@ -1,7 +1,7 @@ -From ebd364c3aabe4e484243ccf6e276563416b3f244 Mon Sep 17 00:00:00 2001 +From 7f021a05a5ed7c97432abbc1762f40e36a4915e3 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 19 Sep 2012 21:22:55 -0300 -Subject: [PATCH 082/229] Add fw_path variable (revised) +Subject: [PATCH 081/229] Add fw_path variable (revised) This patch makes grub look for its config file on efi where the app was found. It was originally written by Matthew Garrett, and adapted to fix the diff --git a/0083-Add-support-for-linuxefi.patch b/0082-Add-support-for-linuxefi.patch similarity index 99% rename from 0083-Add-support-for-linuxefi.patch rename to 0082-Add-support-for-linuxefi.patch index 9526633f..302662e4 100644 --- a/0083-Add-support-for-linuxefi.patch +++ b/0082-Add-support-for-linuxefi.patch @@ -1,7 +1,7 @@ -From e1243befd2bc84b3c85100bece1424529dedafb4 Mon Sep 17 00:00:00 2001 +From 778385965798ac2711f0d07d5cf521a6e999ca8b Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 10 Jul 2012 11:58:52 -0400 -Subject: [PATCH 083/229] Add support for linuxefi +Subject: [PATCH 082/229] Add support for linuxefi --- grub-core/Makefile.core.def | 8 + diff --git a/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch b/0083-Use-linuxefi-and-initrdefi-where-appropriate.patch similarity index 92% rename from 0084-Use-linuxefi-and-initrdefi-where-appropriate.patch rename to 0083-Use-linuxefi-and-initrdefi-where-appropriate.patch index 78cdc796..eaa12164 100644 --- a/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch +++ b/0083-Use-linuxefi-and-initrdefi-where-appropriate.patch @@ -1,7 +1,7 @@ -From 859cdda8e3c026eb132ad15320222a7ef89d8940 Mon Sep 17 00:00:00 2001 +From 793d4270384ef3373bc0b3c956cab8a8cdb75bcf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 16 Jul 2012 18:57:11 -0400 -Subject: [PATCH 084/229] Use "linuxefi" and "initrdefi" where appropriate. +Subject: [PATCH 083/229] Use "linuxefi" and "initrdefi" where appropriate. --- util/grub.d/10_linux.in | 18 ++++++++++++++++-- diff --git a/0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch b/0084-Don-t-allow-insmod-when-secure-boot-is-enabled.patch similarity index 96% rename from 0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch rename to 0084-Don-t-allow-insmod-when-secure-boot-is-enabled.patch index 40275999..a5267e9f 100644 --- a/0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch +++ b/0084-Don-t-allow-insmod-when-secure-boot-is-enabled.patch @@ -1,7 +1,7 @@ -From a7dd90b084d0e6d10e8f1892651d8c20c079c99d Mon Sep 17 00:00:00 2001 +From eb8fd62e887e624f5c6e7c2ee8512981e8b5be97 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 23 Oct 2012 10:40:49 -0400 -Subject: [PATCH 085/229] Don't allow insmod when secure boot is enabled. +Subject: [PATCH 084/229] Don't allow insmod when secure boot is enabled. Hi, diff --git a/0086-Pass-x-hex-hex-straight-through-unmolested.patch b/0085-Pass-x-hex-hex-straight-through-unmolested.patch similarity index 97% rename from 0086-Pass-x-hex-hex-straight-through-unmolested.patch rename to 0085-Pass-x-hex-hex-straight-through-unmolested.patch index 4e4a1d88..c6e956b0 100644 --- a/0086-Pass-x-hex-hex-straight-through-unmolested.patch +++ b/0085-Pass-x-hex-hex-straight-through-unmolested.patch @@ -1,7 +1,7 @@ -From 66e04779bda094f385e8bbbe3523501821b830e4 Mon Sep 17 00:00:00 2001 +From 0d54ed89090fc1bdcb75de474024b2b81dbf644f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 1 Oct 2012 13:24:37 -0400 -Subject: [PATCH 086/229] Pass "\x[[:hex:]][[:hex:]]" straight through +Subject: [PATCH 085/229] Pass "\x[[:hex:]][[:hex:]]" straight through unmolested. --- diff --git a/0087-Add-X-option-to-printf-functions.patch b/0086-Add-X-option-to-printf-functions.patch similarity index 92% rename from 0087-Add-X-option-to-printf-functions.patch rename to 0086-Add-X-option-to-printf-functions.patch index 3ed3bc25..509f64c4 100644 --- a/0087-Add-X-option-to-printf-functions.patch +++ b/0086-Add-X-option-to-printf-functions.patch @@ -1,7 +1,7 @@ -From 85d1de365ee5f0fb5409a3b1d895204262a7a068 Mon Sep 17 00:00:00 2001 +From 6237b1688124d6a72250b296e758ef2d59fde26f Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 16:58:39 -0200 -Subject: [PATCH 087/229] Add %X option to printf functions. +Subject: [PATCH 086/229] Add %X option to printf functions. --- grub-core/kern/misc.c | 7 +++++-- diff --git a/0088-Search-for-specific-config-file-for-netboot.patch b/0087-Search-for-specific-config-file-for-netboot.patch similarity index 97% rename from 0088-Search-for-specific-config-file-for-netboot.patch rename to 0087-Search-for-specific-config-file-for-netboot.patch index 01de1fc3..e7ab73f7 100644 --- a/0088-Search-for-specific-config-file-for-netboot.patch +++ b/0087-Search-for-specific-config-file-for-netboot.patch @@ -1,7 +1,7 @@ -From 4b15dd15153b2e7070ae37736c3094223fa3a01d Mon Sep 17 00:00:00 2001 +From 9491cbfdab951e38f096bd9705a76b382f54c9be Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 17:22:07 -0200 -Subject: [PATCH 088/229] Search for specific config file for netboot +Subject: [PATCH 087/229] Search for specific config file for netboot This patch implements a search for a specific configuration when the config file is on a remoteserver. It uses the following order: diff --git a/0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0088-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch similarity index 97% rename from 0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch rename to 0088-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch index a2617cce..e5a5d89a 100644 --- a/0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch +++ b/0088-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch @@ -1,7 +1,7 @@ -From cb7f166adef2b0acc52fa0b506621295a1408702 Mon Sep 17 00:00:00 2001 +From 5fcdebdc36cc84c772754b7f5bdb87aed2b42853 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Tue, 22 Jan 2013 06:31:38 +0100 -Subject: [PATCH 089/229] blscfg: add blscfg module to parse Boot Loader +Subject: [PATCH 088/229] blscfg: add blscfg module to parse Boot Loader Specification snippets http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec diff --git a/0090-Don-t-write-messages-to-the-screen.patch b/0089-Don-t-write-messages-to-the-screen.patch similarity index 97% rename from 0090-Don-t-write-messages-to-the-screen.patch rename to 0089-Don-t-write-messages-to-the-screen.patch index 23e37f18..72ea97d5 100644 --- a/0090-Don-t-write-messages-to-the-screen.patch +++ b/0089-Don-t-write-messages-to-the-screen.patch @@ -1,7 +1,7 @@ -From 472265de61af84149ba89a91072317e15298caa1 Mon Sep 17 00:00:00 2001 +From fc390be631e93744c6a3a2f42849c9edf2614a36 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:30:20 -0400 -Subject: [PATCH 090/229] Don't write messages to the screen +Subject: [PATCH 089/229] Don't write messages to the screen Writing messages to the screen before the menus or boot splash happens so quickly it looks like something is wrong and isn't diff --git a/0091-Don-t-print-GNU-GRUB-header.patch b/0090-Don-t-print-GNU-GRUB-header.patch similarity index 90% rename from 0091-Don-t-print-GNU-GRUB-header.patch rename to 0090-Don-t-print-GNU-GRUB-header.patch index 09917332..8f6b4def 100644 --- a/0091-Don-t-print-GNU-GRUB-header.patch +++ b/0090-Don-t-print-GNU-GRUB-header.patch @@ -1,7 +1,7 @@ -From 2b9d1073c695f0363202a00586e1994432d23347 Mon Sep 17 00:00:00 2001 +From 806c26ae73bc86e305c39c955d86480fad8985df Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:53:48 -0400 -Subject: [PATCH 091/229] Don't print GNU GRUB header +Subject: [PATCH 090/229] Don't print GNU GRUB header No one cares. --- diff --git a/0092-Don-t-add-to-highlighted-row.patch b/0091-Don-t-add-to-highlighted-row.patch similarity index 85% rename from 0092-Don-t-add-to-highlighted-row.patch rename to 0091-Don-t-add-to-highlighted-row.patch index c19574c3..5e000998 100644 --- a/0092-Don-t-add-to-highlighted-row.patch +++ b/0091-Don-t-add-to-highlighted-row.patch @@ -1,7 +1,7 @@ -From 7cb577925e3d40869b9748afa5060b178ba88abd Mon Sep 17 00:00:00 2001 +From 5ae2484f263365351a2891be6c056eeb96b3924b Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 17:49:45 -0400 -Subject: [PATCH 092/229] Don't add '*' to highlighted row +Subject: [PATCH 091/229] Don't add '*' to highlighted row It is already highlighted. --- diff --git a/0093-Message-string-cleanups.patch b/0092-Message-string-cleanups.patch similarity index 96% rename from 0093-Message-string-cleanups.patch rename to 0092-Message-string-cleanups.patch index 208ec144..7f5efb13 100644 --- a/0093-Message-string-cleanups.patch +++ b/0092-Message-string-cleanups.patch @@ -1,7 +1,7 @@ -From 67803e1ea2884a1ff8ecbb1cc9371fa63c9a7544 Mon Sep 17 00:00:00 2001 +From 622b238ecb927d331dc38083584a7323013b5f21 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 11:09:04 -0400 -Subject: [PATCH 093/229] Message string cleanups +Subject: [PATCH 092/229] Message string cleanups Make use of terminology consistent. Remove jargon. --- diff --git a/0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch b/0093-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch similarity index 87% rename from 0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch rename to 0093-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch index 1beb8cb4..4f4ad24a 100644 --- a/0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch +++ b/0093-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch @@ -1,7 +1,7 @@ -From 7857716e067795304fc788813e427fac3f9624d7 Mon Sep 17 00:00:00 2001 +From c7dac08ab344638afabf579e03bedfac729e1944 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:23 -0400 -Subject: [PATCH 094/229] Fix border spacing now that we aren't displaying it +Subject: [PATCH 093/229] Fix border spacing now that we aren't displaying it --- grub-core/normal/menu_text.c | 6 +++--- diff --git a/0095-Use-the-correct-indentation-for-the-term-help-text.patch b/0094-Use-the-correct-indentation-for-the-term-help-text.patch similarity index 88% rename from 0095-Use-the-correct-indentation-for-the-term-help-text.patch rename to 0094-Use-the-correct-indentation-for-the-term-help-text.patch index ac9750e3..f9f92124 100644 --- a/0095-Use-the-correct-indentation-for-the-term-help-text.patch +++ b/0094-Use-the-correct-indentation-for-the-term-help-text.patch @@ -1,7 +1,7 @@ -From 9ecf176aa2951d848ca2d0ab23e663b2ddc1b336 Mon Sep 17 00:00:00 2001 +From 8a59d6c44d946eac70ecbb7a9418c5d6801add8b Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:49 -0400 -Subject: [PATCH 095/229] Use the correct indentation for the term help text +Subject: [PATCH 094/229] Use the correct indentation for the term help text That is consistent with the menu help text --- diff --git a/0096-Indent-menu-entries.patch b/0095-Indent-menu-entries.patch similarity index 86% rename from 0096-Indent-menu-entries.patch rename to 0095-Indent-menu-entries.patch index b6ed0fe6..7d28cd59 100644 --- a/0096-Indent-menu-entries.patch +++ b/0095-Indent-menu-entries.patch @@ -1,7 +1,7 @@ -From 62af3df5904d4fff7e8c4bab0a90aae6752be432 Mon Sep 17 00:00:00 2001 +From 018439ecfda2bc5049ccbfb0d6ab7fa047411a3b Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:30:55 -0400 -Subject: [PATCH 096/229] Indent menu entries +Subject: [PATCH 095/229] Indent menu entries --- grub-core/normal/menu_text.c | 3 ++- diff --git a/0097-Fix-margins.patch b/0096-Fix-margins.patch similarity index 92% rename from 0097-Fix-margins.patch rename to 0096-Fix-margins.patch index bb2b2121..328bdf78 100644 --- a/0097-Fix-margins.patch +++ b/0096-Fix-margins.patch @@ -1,7 +1,7 @@ -From aa23d4d1be22a7255f9faa3bac39a5d29c2de9f2 Mon Sep 17 00:00:00 2001 +From 33481aa0e7897465ffd386101d6f3eda6e3bbac0 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:59:36 -0400 -Subject: [PATCH 097/229] Fix margins +Subject: [PATCH 096/229] Fix margins --- grub-core/normal/menu_text.c | 8 +++----- diff --git a/0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch b/0097-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch similarity index 85% rename from 0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch rename to 0097-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch index 083bca82..c7ca16e5 100644 --- a/0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch +++ b/0097-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch @@ -1,7 +1,7 @@ -From cc0abdf469be06b17879f19b26c73b916f479b28 Mon Sep 17 00:00:00 2001 +From ea032bd4a6cb66929da61477b1759e136c975189 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 21 Jun 2013 14:44:08 -0400 -Subject: [PATCH 098/229] Use -2 instead of -1 for our right-hand margin, so +Subject: [PATCH 097/229] Use -2 instead of -1 for our right-hand margin, so linewrapping works (#976643). Signed-off-by: Peter Jones diff --git a/0099-Use-linux16-when-appropriate-880840.patch b/0098-Use-linux16-when-appropriate-880840.patch similarity index 90% rename from 0099-Use-linux16-when-appropriate-880840.patch rename to 0098-Use-linux16-when-appropriate-880840.patch index c60daf43..638f0956 100644 --- a/0099-Use-linux16-when-appropriate-880840.patch +++ b/0098-Use-linux16-when-appropriate-880840.patch @@ -1,7 +1,7 @@ -From 9b332449552b4c8afbe2d0e30b795d93c2ac733f Mon Sep 17 00:00:00 2001 +From 8e1957d59e7e72850cbac7e779ddf22ca23c250d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:05:07 -0400 -Subject: [PATCH 099/229] Use linux16 when appropriate (#880840) +Subject: [PATCH 098/229] Use linux16 when appropriate (#880840) The kernel group really would prefer that we use the 16 bit entry point on x86 bios machines. diff --git a/0100-Enable-pager-by-default.-985860.patch b/0099-Enable-pager-by-default.-985860.patch similarity index 83% rename from 0100-Enable-pager-by-default.-985860.patch rename to 0099-Enable-pager-by-default.-985860.patch index 6b61a157..1e57fed6 100644 --- a/0100-Enable-pager-by-default.-985860.patch +++ b/0099-Enable-pager-by-default.-985860.patch @@ -1,7 +1,7 @@ -From 24b186833aad3f456111b7f9d3806065dbb95a2e Mon Sep 17 00:00:00 2001 +From 7466f51a0012ebdd8be07cfc0e63d50e0e79560d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:09:27 -0400 -Subject: [PATCH 100/229] Enable pager by default. (#985860) +Subject: [PATCH 099/229] Enable pager by default. (#985860) Signed-off-by: Peter Jones --- diff --git a/0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch b/0100-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch similarity index 88% rename from 0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch rename to 0100-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch index b279e485..166f3d6f 100644 --- a/0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch +++ b/0100-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch @@ -1,7 +1,7 @@ -From 3635e1f8f5925e9c5ba54e9bbe79503d78177ea4 Mon Sep 17 00:00:00 2001 +From 7a97d9621a145cbd04111970fea04c34433f900c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:13:27 -0400 -Subject: [PATCH 101/229] F10 doesn't work on serial, so don't tell the user to +Subject: [PATCH 100/229] F10 doesn't work on serial, so don't tell the user to hit it (#987443) Signed-off-by: Peter Jones diff --git a/0102-Don-t-say-GNU-Linux-in-generated-menus.patch b/0101-Don-t-say-GNU-Linux-in-generated-menus.patch similarity index 91% rename from 0102-Don-t-say-GNU-Linux-in-generated-menus.patch rename to 0101-Don-t-say-GNU-Linux-in-generated-menus.patch index d498d405..a8570cc6 100644 --- a/0102-Don-t-say-GNU-Linux-in-generated-menus.patch +++ b/0101-Don-t-say-GNU-Linux-in-generated-menus.patch @@ -1,7 +1,7 @@ -From c3bd10791d0ecc17cd8243de8eea4cd683ae2bdb Mon Sep 17 00:00:00 2001 +From 45877a77f50eecd0b7fd3ba1aec0d4398a3b6a20 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 14 Mar 2011 14:27:42 -0400 -Subject: [PATCH 102/229] Don't say "GNU/Linux" in generated menus. +Subject: [PATCH 101/229] Don't say "GNU/Linux" in generated menus. --- util/grub.d/10_linux.in | 4 ++-- diff --git a/0103-Don-t-draw-a-border-around-the-menu.patch b/0102-Don-t-draw-a-border-around-the-menu.patch similarity index 95% rename from 0103-Don-t-draw-a-border-around-the-menu.patch rename to 0102-Don-t-draw-a-border-around-the-menu.patch index 5a789e2a..efc478b3 100644 --- a/0103-Don-t-draw-a-border-around-the-menu.patch +++ b/0102-Don-t-draw-a-border-around-the-menu.patch @@ -1,7 +1,7 @@ -From 79e679458cc2e70d0097cfc702668976fe1fdc5d Mon Sep 17 00:00:00 2001 +From c28a3053e96859000df5ff1d48c9a560d47c0470 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 16:47:33 -0400 -Subject: [PATCH 103/229] Don't draw a border around the menu +Subject: [PATCH 102/229] Don't draw a border around the menu It looks cleaner without it. --- diff --git a/0104-Use-the-standard-margin-for-the-timeout-string.patch b/0103-Use-the-standard-margin-for-the-timeout-string.patch similarity index 91% rename from 0104-Use-the-standard-margin-for-the-timeout-string.patch rename to 0103-Use-the-standard-margin-for-the-timeout-string.patch index e1a1aca0..145fd403 100644 --- a/0104-Use-the-standard-margin-for-the-timeout-string.patch +++ b/0103-Use-the-standard-margin-for-the-timeout-string.patch @@ -1,7 +1,7 @@ -From a82ffe034724bb20b062bba9606654d0e3919acc Mon Sep 17 00:00:00 2001 +From 93018f5d1727eb58dead129f150a36080c22530a Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 10:52:32 -0400 -Subject: [PATCH 104/229] Use the standard margin for the timeout string +Subject: [PATCH 103/229] Use the standard margin for the timeout string So that it aligns with the other messages --- diff --git a/0105-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0104-Add-.eh_frame-to-list-of-relocations-stripped.patch similarity index 89% rename from 0105-Add-.eh_frame-to-list-of-relocations-stripped.patch rename to 0104-Add-.eh_frame-to-list-of-relocations-stripped.patch index 343706ce..47ab730a 100644 --- a/0105-Add-.eh_frame-to-list-of-relocations-stripped.patch +++ b/0104-Add-.eh_frame-to-list-of-relocations-stripped.patch @@ -1,7 +1,7 @@ -From 35cdd6b929d5f63750bb214a53e1c75b31dcae99 Mon Sep 17 00:00:00 2001 +From c626121f38adf6fcd39a5f69249c650b4b52c10d Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 13 Jan 2014 21:50:59 -0500 -Subject: [PATCH 105/229] Add .eh_frame to list of relocations stripped +Subject: [PATCH 104/229] Add .eh_frame to list of relocations stripped --- conf/Makefile.common | 2 +- diff --git a/0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch b/0105-Make-10_linux-work-with-our-changes-for-linux16-and-.patch similarity index 94% rename from 0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch rename to 0105-Make-10_linux-work-with-our-changes-for-linux16-and-.patch index 3e811ace..e8384597 100644 --- a/0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch +++ b/0105-Make-10_linux-work-with-our-changes-for-linux16-and-.patch @@ -1,7 +1,7 @@ -From 3f5daaa46d0a5eb390a74da40abe54d385d308cf Mon Sep 17 00:00:00 2001 +From 59275c83e7a303c63379d37ba21aa39a3c3b7203 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 13:12:23 -0500 -Subject: [PATCH 106/229] Make 10_linux work with our changes for linux16 and +Subject: [PATCH 105/229] Make 10_linux work with our changes for linux16 and linuxefi on aarch64 Signed-off-by: Peter Jones diff --git a/0107-Don-t-print-during-fdt-loading-method.patch b/0106-Don-t-print-during-fdt-loading-method.patch similarity index 82% rename from 0107-Don-t-print-during-fdt-loading-method.patch rename to 0106-Don-t-print-during-fdt-loading-method.patch index 82d447d8..4e72e0e8 100644 --- a/0107-Don-t-print-during-fdt-loading-method.patch +++ b/0106-Don-t-print-during-fdt-loading-method.patch @@ -1,7 +1,7 @@ -From 276027c67b27f2ee557ca9e2492c779a5f76cb9b Mon Sep 17 00:00:00 2001 +From aedf2aceb354ab7bf28bbf70d0a4b505c0adcfdf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 16:15:46 -0500 -Subject: [PATCH 107/229] Don't print during fdt loading method. +Subject: [PATCH 106/229] Don't print during fdt loading method. Signed-off-by: Peter Jones --- diff --git a/0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch b/0107-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch similarity index 86% rename from 0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch rename to 0107-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch index 5187992b..473a760f 100644 --- a/0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch +++ b/0107-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch @@ -1,7 +1,7 @@ -From 25add18bbc13249a2ce32f4e9b0de512ecc1fe4b Mon Sep 17 00:00:00 2001 +From f2790b1f7c8efcd5589c8fcdaca51b548ab9825c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 30 Jun 2014 14:16:46 -0400 -Subject: [PATCH 108/229] Don't munge raw spaces when we're doing our cmdline +Subject: [PATCH 107/229] Don't munge raw spaces when we're doing our cmdline escaping (#923374) Signed-off-by: Peter Jones diff --git a/0109-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0108-Don-t-require-a-password-to-boot-entries-generated-b.patch similarity index 86% rename from 0109-Don-t-require-a-password-to-boot-entries-generated-b.patch rename to 0108-Don-t-require-a-password-to-boot-entries-generated-b.patch index 694877f7..a06a7f4c 100644 --- a/0109-Don-t-require-a-password-to-boot-entries-generated-b.patch +++ b/0108-Don-t-require-a-password-to-boot-entries-generated-b.patch @@ -1,7 +1,7 @@ -From 9b109204ee0d1888d64d553849798ee57af1809f Mon Sep 17 00:00:00 2001 +From 205a7844bea4d849dc24f24b5fc96f6040d5e2b9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 11 Feb 2014 11:14:50 -0500 -Subject: [PATCH 109/229] Don't require a password to boot entries generated by +Subject: [PATCH 108/229] Don't require a password to boot entries generated by grub-mkconfig. When we set a password, we just want that to mean you can't /edit/ an entry. diff --git a/0110-Don-t-emit-Booting-.-message.patch b/0109-Don-t-emit-Booting-.-message.patch similarity index 92% rename from 0110-Don-t-emit-Booting-.-message.patch rename to 0109-Don-t-emit-Booting-.-message.patch index e4bc867c..f4a88b43 100644 --- a/0110-Don-t-emit-Booting-.-message.patch +++ b/0109-Don-t-emit-Booting-.-message.patch @@ -1,7 +1,7 @@ -From 68f1935b5c6f66afbf9d6990615946c44f3d54cb Mon Sep 17 00:00:00 2001 +From c986c38f790881be0b9c5b0acd8d3b106412a5f1 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 09:37:49 -0500 -Subject: [PATCH 110/229] Don't emit "Booting ..." message. +Subject: [PATCH 109/229] Don't emit "Booting ..." message. UI team still hates this stuff, so we're disabling it for RHEL 7. diff --git a/0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch b/0110-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch similarity index 99% rename from 0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch rename to 0110-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch index 817de026..e917af57 100644 --- a/0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch +++ b/0110-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch @@ -1,7 +1,7 @@ -From 6cdf99aa53970695fbf5c002fa288e1044571ca7 Mon Sep 17 00:00:00 2001 +From dcf3b9c590f00e33f773de68ac4ebd55ca4f6e90 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 4 Mar 2014 11:00:23 -0500 -Subject: [PATCH 111/229] Replace a lot of man pages with slightly nicer ones. +Subject: [PATCH 110/229] Replace a lot of man pages with slightly nicer ones. Replace a bunch of machine generated ones with ones that look nicer. --- @@ -168,7 +168,7 @@ index b16bd925320..39eb94bded6 100644 EXTRA_DIST += docs/grub.cfg EXTRA_DIST += docs/osdetect.cfg diff --git a/docs/Makefile.am b/docs/Makefile.am -index e396ba10f46..0669729cc57 100644 +index 93eb3962765..ab28f199694 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -5,5 +5,3 @@ info_TEXINFOS = grub.texi grub-dev.texi diff --git a/0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0111-use-fw_path-prefix-when-fallback-searching-for-grub-.patch similarity index 92% rename from 0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch rename to 0111-use-fw_path-prefix-when-fallback-searching-for-grub-.patch index 9f311a09..8f81155a 100644 --- a/0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch +++ b/0111-use-fw_path-prefix-when-fallback-searching-for-grub-.patch @@ -1,7 +1,7 @@ -From f72c593c32ecba7b10ceb4c63ca8ec48f60c3ccf Mon Sep 17 00:00:00 2001 +From 24865a88781aef2a6a54433b5b383219108f54fa Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 19 Feb 2014 15:58:43 -0500 -Subject: [PATCH 112/229] use fw_path prefix when fallback searching for grub +Subject: [PATCH 111/229] use fw_path prefix when fallback searching for grub config When PXE booting via UEFI firmware, grub was searching for grub.cfg diff --git a/0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0112-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch similarity index 95% rename from 0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch rename to 0112-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch index 3b5ccaa0..ae06df75 100644 --- a/0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch +++ b/0112-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch @@ -1,7 +1,7 @@ -From 09265872f163e6dfe1aa319ac40e8090f31830f7 Mon Sep 17 00:00:00 2001 +From d4cd9aa8695ab9448da41f756553beb75bffee46 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 6 Mar 2014 11:51:33 -0500 -Subject: [PATCH 113/229] Try mac/guid/etc before grub.cfg on tftp config +Subject: [PATCH 112/229] Try mac/guid/etc before grub.cfg on tftp config files. Signed-off-by: Peter Jones diff --git a/0114-Fix-convert-function-to-support-NVMe-devices.patch b/0113-Fix-convert-function-to-support-NVMe-devices.patch similarity index 91% rename from 0114-Fix-convert-function-to-support-NVMe-devices.patch rename to 0113-Fix-convert-function-to-support-NVMe-devices.patch index c3f46294..e02750dc 100644 --- a/0114-Fix-convert-function-to-support-NVMe-devices.patch +++ b/0113-Fix-convert-function-to-support-NVMe-devices.patch @@ -1,7 +1,7 @@ -From 39976a692a9350b1293f209953426830ddde2ad6 Mon Sep 17 00:00:00 2001 +From 397f179c26aeddf3fe452c62aa404459889835fc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 11:34:00 -0500 -Subject: [PATCH 114/229] Fix convert function to support NVMe devices +Subject: [PATCH 113/229] Fix convert function to support NVMe devices This is adapted from the patch at https://bugzilla.redhat.com/show_bug.cgi?id=1019660 , which is against diff --git a/0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch b/0114-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch similarity index 85% rename from 0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch rename to 0114-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch index 7cf9ec8c..895af390 100644 --- a/0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch +++ b/0114-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch @@ -1,7 +1,7 @@ -From 05d7e199d3f48cf9fd9b2af877cfe37c498f0874 Mon Sep 17 00:00:00 2001 +From 4291f418c3304f0f379467e87ce5892853cc16c7 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 10 Feb 2014 16:13:10 -0500 -Subject: [PATCH 115/229] Switch to use APM Mustang device tree, for hardware +Subject: [PATCH 114/229] Switch to use APM Mustang device tree, for hardware testing. Signed-off-by: David A. Marlin diff --git a/0116-Use-the-default-device-tree-from-the-grub-default-fi.patch b/0115-Use-the-default-device-tree-from-the-grub-default-fi.patch similarity index 90% rename from 0116-Use-the-default-device-tree-from-the-grub-default-fi.patch rename to 0115-Use-the-default-device-tree-from-the-grub-default-fi.patch index 563500b1..369f53e3 100644 --- a/0116-Use-the-default-device-tree-from-the-grub-default-fi.patch +++ b/0115-Use-the-default-device-tree-from-the-grub-default-fi.patch @@ -1,7 +1,7 @@ -From b2ad2a3b4a4bc998003c1275709f0677c39503a9 Mon Sep 17 00:00:00 2001 +From 5111bdda0d0a21ab02f6c9aa441a32cd02c6bc3f Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 12 Feb 2014 14:54:04 -0500 -Subject: [PATCH 116/229] Use the default device tree from the grub default +Subject: [PATCH 115/229] Use the default device tree from the grub default file instead of hardcoding a value. diff --git a/0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0116-reopen-SNP-protocol-for-exclusive-use-by-grub.patch similarity index 91% rename from 0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch rename to 0116-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index 527deee1..5e0867aa 100644 --- a/0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0116-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,7 +1,7 @@ -From 5d87e5b1697c28d55348486cb3c704b467c8e798 Mon Sep 17 00:00:00 2001 +From 0ff5bf3deefdb17dbadb51a11acc50b96e2ed797 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Sat, 15 Feb 2014 15:10:22 -0500 -Subject: [PATCH 117/229] reopen SNP protocol for exclusive use by grub +Subject: [PATCH 116/229] reopen SNP protocol for exclusive use by grub --- grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++ diff --git a/0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0117-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch similarity index 92% rename from 0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch rename to 0117-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index ec797db8..980c3318 100644 --- a/0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0117-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,7 +1,7 @@ -From f00ca4e03561840f116642c7100df6dc6395209d Mon Sep 17 00:00:00 2001 +From 58fba65b7e339d4c7279e4ca88937d9501275169 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Mar 2016 15:13:59 -0500 -Subject: [PATCH 118/229] Revert "reopen SNP protocol for exclusive use by +Subject: [PATCH 117/229] Revert "reopen SNP protocol for exclusive use by grub" This reverts commit a3f2c756ce34c9666bddef35e3b3b85ccecdcffc , which is diff --git a/0119-Add-grub_util_readlink.patch b/0118-Add-grub_util_readlink.patch similarity index 99% rename from 0119-Add-grub_util_readlink.patch rename to 0118-Add-grub_util_readlink.patch index 0f340742..2d638177 100644 --- a/0119-Add-grub_util_readlink.patch +++ b/0118-Add-grub_util_readlink.patch @@ -1,7 +1,7 @@ -From ffc123b7ab4fe37da16d4c62d87255f8c5c14b9f Mon Sep 17 00:00:00 2001 +From 76baa996f73eea47f7bdc41461efeee204626e2d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:01:03 -0400 -Subject: [PATCH 119/229] Add grub_util_readlink() +Subject: [PATCH 118/229] Add grub_util_readlink() Add grub_util_readlink(). This requires pulling in stat and readlink from gnulib, which pulls in stat and related headers, but after that the diff --git a/0120-Make-editenv-chase-symlinks-including-those-across-d.patch b/0119-Make-editenv-chase-symlinks-including-those-across-d.patch similarity index 95% rename from 0120-Make-editenv-chase-symlinks-including-those-across-d.patch rename to 0119-Make-editenv-chase-symlinks-including-those-across-d.patch index 988823ff..7d2c4e8e 100644 --- a/0120-Make-editenv-chase-symlinks-including-those-across-d.patch +++ b/0119-Make-editenv-chase-symlinks-including-those-across-d.patch @@ -1,7 +1,7 @@ -From fb903fc1587b582e23e44811dc8c4ed359806028 Mon Sep 17 00:00:00 2001 +From fd1a89c8bef603ec33937f122ae25013a724601a Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:38:00 -0400 -Subject: [PATCH 120/229] Make editenv chase symlinks including those across +Subject: [PATCH 119/229] Make editenv chase symlinks including those across devices. This lets us make /boot/grub2/grubenv a symlink to diff --git a/0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0120-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch similarity index 89% rename from 0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch rename to 0120-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch index fecb68ca..9c6a74b1 100644 --- a/0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch +++ b/0120-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch @@ -1,7 +1,7 @@ -From 5948f763fc01d7f29923e94ef9b1ed923b11ff1a Mon Sep 17 00:00:00 2001 +From c8d93b9e27e9cbf51e91f6cc99abbcb7b68189ce Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 14:23:23 -0400 -Subject: [PATCH 121/229] Generate OS and CLASS in 10_linux from +Subject: [PATCH 120/229] Generate OS and CLASS in 10_linux from /etc/os-release This makes us use pretty names in the titles we generate in diff --git a/0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0121-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch similarity index 89% rename from 0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch rename to 0121-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch index 65321c34..b205bd50 100644 --- a/0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch +++ b/0121-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch @@ -1,7 +1,7 @@ -From 547d0c60f28c026801af2ada3e0995d0ecc22c35 Mon Sep 17 00:00:00 2001 +From 974241c42b03f3ccb6a5d0eb453283e370da9848 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 15:52:08 -0400 -Subject: [PATCH 122/229] Minimize the sort ordering for .debug and -rescue- +Subject: [PATCH 121/229] Minimize the sort ordering for .debug and -rescue- kernels. Resolves: rhbz#1065360 diff --git a/0123-Load-arm-with-SB-enabled.patch b/0122-Load-arm-with-SB-enabled.patch similarity index 99% rename from 0123-Load-arm-with-SB-enabled.patch rename to 0122-Load-arm-with-SB-enabled.patch index 07f17e27..5098fc8c 100644 --- a/0123-Load-arm-with-SB-enabled.patch +++ b/0122-Load-arm-with-SB-enabled.patch @@ -1,7 +1,7 @@ -From c03bf04fd9e3192bec942a7adee23b5377ea81dc Mon Sep 17 00:00:00 2001 +From edfc2b0952b1eacf95188e53167cc038e5ea0129 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 18 Sep 2014 11:26:14 -0400 -Subject: [PATCH 123/229] Load arm with SB enabled. +Subject: [PATCH 122/229] Load arm with SB enabled. Make sure we actually try to validate secure boot on this platform (even though we're not shipping it enabled by default.) diff --git a/0124-Try-prefix-if-fw_path-doesn-t-work.patch b/0123-Try-prefix-if-fw_path-doesn-t-work.patch similarity index 97% rename from 0124-Try-prefix-if-fw_path-doesn-t-work.patch rename to 0123-Try-prefix-if-fw_path-doesn-t-work.patch index 91aae07c..2858ee72 100644 --- a/0124-Try-prefix-if-fw_path-doesn-t-work.patch +++ b/0123-Try-prefix-if-fw_path-doesn-t-work.patch @@ -1,7 +1,7 @@ -From 0c98cb57eb1a34ec29f719e3a798f5b20c6a4082 Mon Sep 17 00:00:00 2001 +From 3846b040f1050f246e1e975ee88f22c687ae04bf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 3 Oct 2014 11:08:03 -0400 -Subject: [PATCH 124/229] Try $prefix if $fw_path doesn't work. +Subject: [PATCH 123/229] Try $prefix if $fw_path doesn't work. Related: rhbz#1148652 diff --git a/0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch b/0124-Update-info-with-grub.cfg-netboot-selection-order-11.patch similarity index 94% rename from 0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch rename to 0124-Update-info-with-grub.cfg-netboot-selection-order-11.patch index 0588a071..6abecb0b 100644 --- a/0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch +++ b/0124-Update-info-with-grub.cfg-netboot-selection-order-11.patch @@ -1,7 +1,7 @@ -From d446fed131fadd00d0daab0654c7d9e14442d451 Mon Sep 17 00:00:00 2001 +From d4b4184078610a3639fa1e0e463679c424496c3b Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 16:34:51 -0400 -Subject: [PATCH 125/229] Update info with grub.cfg netboot selection order +Subject: [PATCH 124/229] Update info with grub.cfg netboot selection order (#1148650) Added documentation to the grub info page that specifies the order diff --git a/0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch b/0125-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch similarity index 98% rename from 0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch rename to 0125-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch index c9a9c47e..acd8bcc4 100644 --- a/0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch +++ b/0125-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch @@ -1,7 +1,7 @@ -From e62ab1057d87e2a1e3c7fcf6b134f86ec24f2eac Mon Sep 17 00:00:00 2001 +From ce125cafc1e94bf70f2a3dbb545960bd8dd23a2f Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 14:14:19 -0400 -Subject: [PATCH 126/229] Use Distribution Package Sort for grub2-mkconfig +Subject: [PATCH 125/229] Use Distribution Package Sort for grub2-mkconfig (#1124074) Users reported that newly installed kernels on their systems installed diff --git a/0127-Handle-rssd-storage-devices.patch b/0126-Handle-rssd-storage-devices.patch similarity index 89% rename from 0127-Handle-rssd-storage-devices.patch rename to 0126-Handle-rssd-storage-devices.patch index d05ce983..0a9974da 100644 --- a/0127-Handle-rssd-storage-devices.patch +++ b/0126-Handle-rssd-storage-devices.patch @@ -1,7 +1,7 @@ -From 8d3f2f0f389efbb9ed5da0c4f90fc82d104163c1 Mon Sep 17 00:00:00 2001 +From 1956a2192ac0a8421ee83bf77fdf223f2be0bdfb Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 30 Jun 2015 15:50:41 -0400 -Subject: [PATCH 127/229] Handle rssd storage devices. +Subject: [PATCH 126/229] Handle rssd storage devices. Resolves: rhbz#1087962 diff --git a/0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch b/0127-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch similarity index 94% rename from 0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch rename to 0127-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch index a01ff4a5..7b4f97bc 100644 --- a/0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch +++ b/0127-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch @@ -1,7 +1,7 @@ -From e5ed14fb98e18d173f9396103aca65351e4e67e2 Mon Sep 17 00:00:00 2001 +From 5f89c77c7cff17c931f1ea52af0c39df8ab28ac9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 27 Oct 2014 09:22:55 -0400 -Subject: [PATCH 128/229] Try to emit linux16/initrd16 and linuxefi/initrdefi +Subject: [PATCH 127/229] Try to emit linux16/initrd16 and linuxefi/initrdefi in 30-os_prober. Resolves: rhbz#1108296 diff --git a/0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0128-Make-grub2-mkconfig-construct-titles-that-look-like-.patch similarity index 94% rename from 0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch rename to 0128-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index b16f11e2..c31f686e 100644 --- a/0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0128-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -1,7 +1,7 @@ -From 75c3d5fedb92fcf107b594216655c29bb20cbebc Mon Sep 17 00:00:00 2001 +From c7ae420d095ccec20481c25b14773ab2fce658b5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 28 Apr 2015 11:15:03 -0400 -Subject: [PATCH 129/229] Make grub2-mkconfig construct titles that look like +Subject: [PATCH 128/229] Make grub2-mkconfig construct titles that look like the ones we want elsewhere. Resolves: rhbz#1215839 diff --git a/0130-Add-friendly-grub2-password-config-tool-985962.patch b/0129-Add-friendly-grub2-password-config-tool-985962.patch similarity index 98% rename from 0130-Add-friendly-grub2-password-config-tool-985962.patch rename to 0129-Add-friendly-grub2-password-config-tool-985962.patch index 8181b963..08d89e0b 100644 --- a/0130-Add-friendly-grub2-password-config-tool-985962.patch +++ b/0129-Add-friendly-grub2-password-config-tool-985962.patch @@ -1,7 +1,7 @@ -From d03d08a8ba14eddda515907cafc640fb1dbe0874 Mon Sep 17 00:00:00 2001 +From 68f21f5ebebc23a6d8512631f2a1d474afcccd43 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Thu, 25 Jun 2015 11:13:11 -0400 -Subject: [PATCH 130/229] Add friendly grub2 password config tool (#985962) +Subject: [PATCH 129/229] Add friendly grub2 password config tool (#985962) Provided a tool for users to reset the grub2 root user password without having to alter the grub.cfg. The hashed password now diff --git a/0131-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0130-Make-grub2-mkconfig-construct-titles-that-look-like-.patch similarity index 94% rename from 0131-Make-grub2-mkconfig-construct-titles-that-look-like-.patch rename to 0130-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index 376ab522..7bdceefb 100644 --- a/0131-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0130-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -1,7 +1,7 @@ -From 7d9c29023e6c242306ae008a984245037655a23c Mon Sep 17 00:00:00 2001 +From 7a7644507e4d953ea8f8d1d7133622a72a2168f5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 28 Apr 2015 11:15:03 -0400 -Subject: [PATCH 131/229] Make grub2-mkconfig construct titles that look like +Subject: [PATCH 130/229] Make grub2-mkconfig construct titles that look like the ones we want elsewhere. Resolves: rhbz#1215839 diff --git a/0132-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch b/0131-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch similarity index 92% rename from 0132-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch rename to 0131-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch index 53940ec2..674271b9 100644 --- a/0132-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch +++ b/0131-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch @@ -1,7 +1,7 @@ -From e97b5c4ec2f11ac544c3c1de8fa5b84ac24d9536 Mon Sep 17 00:00:00 2001 +From 6f892038567f1706fdde819f5f226ec4cacbea47 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 3 Aug 2015 11:46:42 -0400 -Subject: [PATCH 132/229] Try to make sure configure.ac and grub-rpm-sort play +Subject: [PATCH 131/229] Try to make sure configure.ac and grub-rpm-sort play nice. Apparently the test for whether to use grub-rpm-sort and also the diff --git a/0133-tcp-add-window-scaling-support.patch b/0132-tcp-add-window-scaling-support.patch similarity index 96% rename from 0133-tcp-add-window-scaling-support.patch rename to 0132-tcp-add-window-scaling-support.patch index 60632365..b4bbf280 100644 --- a/0133-tcp-add-window-scaling-support.patch +++ b/0132-tcp-add-window-scaling-support.patch @@ -1,7 +1,7 @@ -From df119e7a941f0e1329181d33d63349375b9b56d9 Mon Sep 17 00:00:00 2001 +From 71e31c279c07f9f51f2a482b70b40b7deed69a69 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Wed, 12 Aug 2015 08:57:55 -0700 -Subject: [PATCH 133/229] tcp: add window scaling support +Subject: [PATCH 132/229] tcp: add window scaling support Sometimes we have to provision boxes across regions, such as California to Sweden. The http server has a 10 minute timeout, so if we can't get our 250mb diff --git a/0134-efinet-retransmit-if-our-device-is-busy.patch b/0133-efinet-retransmit-if-our-device-is-busy.patch similarity index 92% rename from 0134-efinet-retransmit-if-our-device-is-busy.patch rename to 0133-efinet-retransmit-if-our-device-is-busy.patch index 4ff907f2..036974a3 100644 --- a/0134-efinet-retransmit-if-our-device-is-busy.patch +++ b/0133-efinet-retransmit-if-our-device-is-busy.patch @@ -1,7 +1,7 @@ -From d4f94fc4cd48954f757d6efb82311eb3256389e4 Mon Sep 17 00:00:00 2001 +From d09f32622f6fc247dd88f731c34be10395785d8d Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Mon, 31 Aug 2015 13:34:35 -0400 -Subject: [PATCH 134/229] efinet: retransmit if our device is busy +Subject: [PATCH 133/229] efinet: retransmit if our device is busy When I fixed the txbuf handling I ripped out the retransmission code since it was flooding our network when we had the buggy behavior. Turns out this was too diff --git a/0135-Be-more-aggro-about-actually-using-the-configured-ne.patch b/0134-Be-more-aggro-about-actually-using-the-configured-ne.patch similarity index 98% rename from 0135-Be-more-aggro-about-actually-using-the-configured-ne.patch rename to 0134-Be-more-aggro-about-actually-using-the-configured-ne.patch index 0b650500..681afdc9 100644 --- a/0135-Be-more-aggro-about-actually-using-the-configured-ne.patch +++ b/0134-Be-more-aggro-about-actually-using-the-configured-ne.patch @@ -1,7 +1,7 @@ -From d4eb7984ad8938e50764c541f0e8f4c8d6d012f8 Mon Sep 17 00:00:00 2001 +From 8ece44c2c8f88f531ac9a679f65a263e7b6d2dba Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 11 Sep 2015 17:30:49 -0400 -Subject: [PATCH 135/229] Be more aggro about actually using the *configured* +Subject: [PATCH 134/229] Be more aggro about actually using the *configured* network device. Right now we use any SNP device with the same mac+IP block, but when diff --git a/0136-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch b/0135-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch similarity index 94% rename from 0136-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch rename to 0135-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch index 99ddeedf..3856b148 100644 --- a/0136-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch +++ b/0135-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch @@ -1,7 +1,7 @@ -From fdbc8b81c9f3bbef64298dbf1f5230eda0cda02f Mon Sep 17 00:00:00 2001 +From 82b9fdcbbc339c36842c625203fc2b1f22a86c9e Mon Sep 17 00:00:00 2001 From: RHEL Ninjas Date: Fri, 25 Sep 2015 16:24:23 +0900 -Subject: [PATCH 136/229] efinet: add filter for the first exclusive reopen of +Subject: [PATCH 135/229] efinet: add filter for the first exclusive reopen of SNP --- diff --git a/0137-Fix-security-issue-when-reading-username-and-passwor.patch b/0136-Fix-security-issue-when-reading-username-and-passwor.patch similarity index 90% rename from 0137-Fix-security-issue-when-reading-username-and-passwor.patch rename to 0136-Fix-security-issue-when-reading-username-and-passwor.patch index 3fac2465..ca7f4c58 100644 --- a/0137-Fix-security-issue-when-reading-username-and-passwor.patch +++ b/0136-Fix-security-issue-when-reading-username-and-passwor.patch @@ -1,7 +1,7 @@ -From fa4b152860e04053ee1cae6b70237a1975473a81 Mon Sep 17 00:00:00 2001 +From 9961e63642244617b697d93bbc49379e23b6839d Mon Sep 17 00:00:00 2001 From: Hector Marco-Gisbert Date: Fri, 13 Nov 2015 16:21:09 +0100 -Subject: [PATCH 137/229] Fix security issue when reading username and password +Subject: [PATCH 136/229] Fix security issue when reading username and password This patch fixes two integer underflows at: * grub-core/lib/crypto.c diff --git a/0138-Warn-if-grub-password-will-not-be-read-1290803.patch b/0137-Warn-if-grub-password-will-not-be-read-1290803.patch similarity index 89% rename from 0138-Warn-if-grub-password-will-not-be-read-1290803.patch rename to 0137-Warn-if-grub-password-will-not-be-read-1290803.patch index 55a74f00..ffc3fea1 100644 --- a/0138-Warn-if-grub-password-will-not-be-read-1290803.patch +++ b/0137-Warn-if-grub-password-will-not-be-read-1290803.patch @@ -1,7 +1,7 @@ -From c8ed108d2f3f9b57add84e282fef6e39634aec99 Mon Sep 17 00:00:00 2001 +From 056a956aea898f9d3ee34ecad9660addc3f3108c Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 22 Feb 2016 15:30:05 -0500 -Subject: [PATCH 138/229] Warn if grub password will not be read (#1290803) +Subject: [PATCH 137/229] Warn if grub password will not be read (#1290803) It is possible for a system to have never run grub-mkconfig and add the section that reads the user.cfg file which contains a user set GRUB diff --git a/0139-Clean-up-grub-setpassword-documentation-1290799.patch b/0138-Clean-up-grub-setpassword-documentation-1290799.patch similarity index 93% rename from 0139-Clean-up-grub-setpassword-documentation-1290799.patch rename to 0138-Clean-up-grub-setpassword-documentation-1290799.patch index 00a8cfca..d9c0b607 100644 --- a/0139-Clean-up-grub-setpassword-documentation-1290799.patch +++ b/0138-Clean-up-grub-setpassword-documentation-1290799.patch @@ -1,7 +1,7 @@ -From 884c7f7b14633fc47d5cada7f02df6fb5176b224 Mon Sep 17 00:00:00 2001 +From 92af2b24adb7371d8234c0b32ae716adf0b80d42 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Tue, 26 Jan 2016 10:28:35 -0500 -Subject: [PATCH 139/229] Clean up grub-setpassword documentation (#1290799) +Subject: [PATCH 138/229] Clean up grub-setpassword documentation (#1290799) The output for --help had some errors. Corrected those and polished the text to be a little easier to follow. Carried verbage over to man page diff --git a/0140-Fix-locale-issue-in-grub-setpassword-1294243.patch b/0139-Fix-locale-issue-in-grub-setpassword-1294243.patch similarity index 86% rename from 0140-Fix-locale-issue-in-grub-setpassword-1294243.patch rename to 0139-Fix-locale-issue-in-grub-setpassword-1294243.patch index e33d2789..a8b02e81 100644 --- a/0140-Fix-locale-issue-in-grub-setpassword-1294243.patch +++ b/0139-Fix-locale-issue-in-grub-setpassword-1294243.patch @@ -1,7 +1,7 @@ -From 5f3812d1820b13137b5c79b135a6b790cb78ae60 Mon Sep 17 00:00:00 2001 +From 373adc50cf9f09015e40ffd1bf79ab9f291f4fc2 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Fri, 29 Jan 2016 16:56:11 -0500 -Subject: [PATCH 140/229] Fix locale issue in grub-setpassword (#1294243) +Subject: [PATCH 139/229] Fix locale issue in grub-setpassword (#1294243) A shell substitution was expecting non-translated output to grab the hashed password and put it in the user.cfg file. Modified code to force diff --git a/0141-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch b/0140-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch similarity index 87% rename from 0141-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch rename to 0140-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch index 6f1ba40d..90a626fb 100644 --- a/0141-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch +++ b/0140-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch @@ -1,7 +1,7 @@ -From a7a38221a7f4593a9abb5f422d0dd349866ed029 Mon Sep 17 00:00:00 2001 +From eab0520310030376f6295e0338e874bce10b0d5f Mon Sep 17 00:00:00 2001 From: Robert Elliott Date: Fri, 22 Jan 2016 13:32:30 +0100 -Subject: [PATCH 141/229] efiemu: Handle persistent RAM and unknown possible +Subject: [PATCH 140/229] efiemu: Handle persistent RAM and unknown possible future additions. (cherry picked from commit ae3b83a4d4df75a01198a2fed7542391e7c449e0) diff --git a/0142-efiemu-Fix-compilation-failure.patch b/0141-efiemu-Fix-compilation-failure.patch similarity index 87% rename from 0142-efiemu-Fix-compilation-failure.patch rename to 0141-efiemu-Fix-compilation-failure.patch index 964b1c64..ed4eeed3 100644 --- a/0142-efiemu-Fix-compilation-failure.patch +++ b/0141-efiemu-Fix-compilation-failure.patch @@ -1,7 +1,7 @@ -From 1da43f34f211772fbda36ef6fd81e1cbde37eae7 Mon Sep 17 00:00:00 2001 +From 68bdf29eb6e376a3b4a817bbe7481efd12b8f9de Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 22 Jan 2016 14:10:30 +0100 -Subject: [PATCH 142/229] efiemu: Fix compilation failure +Subject: [PATCH 141/229] efiemu: Fix compilation failure (cherry picked from commit b6a03dfd327489d53ee07c6d7d593b99c7b7cb62) diff --git a/0143-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0142-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch similarity index 94% rename from 0143-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch rename to 0142-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index 3a92d7c9..f85c24f0 100644 --- a/0143-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0142-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,7 +1,7 @@ -From 9b93a986a68502c1ab2303efd7469fda0c5709cf Mon Sep 17 00:00:00 2001 +From df19c5ff9c9e716df0383e39992466304053c99d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 7 Apr 2016 10:58:06 -0400 -Subject: [PATCH 143/229] Revert "reopen SNP protocol for exclusive use by +Subject: [PATCH 142/229] Revert "reopen SNP protocol for exclusive use by grub" I *think* this should have been replaced by upstream's diff --git a/0144-Add-a-url-parser.patch b/0143-Add-a-url-parser.patch similarity index 99% rename from 0144-Add-a-url-parser.patch rename to 0143-Add-a-url-parser.patch index 9287bd9e..8490a792 100644 --- a/0144-Add-a-url-parser.patch +++ b/0143-Add-a-url-parser.patch @@ -1,7 +1,7 @@ -From 520e6078ff9e3fbf1edf687e51597dac98c07d56 Mon Sep 17 00:00:00 2001 +From 2f84b2e097ad9f6f7f06013f749251743eb32c2e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jun 2016 16:18:44 -0400 -Subject: [PATCH 144/229] Add a url parser. +Subject: [PATCH 143/229] Add a url parser. This patch adds a url parser that can parse http, https, tftp, and tftps urls, and is easily extensible to handle more types. diff --git a/0145-efinet-and-bootp-add-support-for-dhcpv6.patch b/0144-efinet-and-bootp-add-support-for-dhcpv6.patch similarity index 99% rename from 0145-efinet-and-bootp-add-support-for-dhcpv6.patch rename to 0144-efinet-and-bootp-add-support-for-dhcpv6.patch index aac69f12..0c9bc80d 100644 --- a/0145-efinet-and-bootp-add-support-for-dhcpv6.patch +++ b/0144-efinet-and-bootp-add-support-for-dhcpv6.patch @@ -1,7 +1,7 @@ -From 0bdcc68529fe2f3cdf92173fadffd2f9a6476b9b Mon Sep 17 00:00:00 2001 +From 48768b0295ad4d908cefd8e8fbee96a4dc2765f5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 8 Jun 2016 21:03:37 -0400 -Subject: [PATCH 145/229] efinet and bootp: add support for dhcpv6 +Subject: [PATCH 144/229] efinet and bootp: add support for dhcpv6 Signed-off-by: Peter Jones --- diff --git a/0146-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0145-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch similarity index 98% rename from 0146-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch rename to 0145-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch index 48b56f74..8baff525 100644 --- a/0146-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +++ b/0145-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch @@ -1,7 +1,7 @@ -From dcadcc9070f778654eb704fc0907e261996ef76e Mon Sep 17 00:00:00 2001 +From 764506b89942103c3a511d7933edef351fb594b8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 23 Jun 2016 11:01:39 -0400 -Subject: [PATCH 146/229] Add grub-get-kernel-settings and use it in 10_linux +Subject: [PATCH 145/229] Add grub-get-kernel-settings and use it in 10_linux This patch adds grub-get-kernel-settings, which reads the system kernel installation configuration from /etc/sysconfig/kernel, and outputs diff --git a/0147-Normalize-slashes-in-tftp-paths.patch b/0146-Normalize-slashes-in-tftp-paths.patch similarity index 92% rename from 0147-Normalize-slashes-in-tftp-paths.patch rename to 0146-Normalize-slashes-in-tftp-paths.patch index 73dd7117..6d5feb89 100644 --- a/0147-Normalize-slashes-in-tftp-paths.patch +++ b/0146-Normalize-slashes-in-tftp-paths.patch @@ -1,7 +1,7 @@ -From 130783c1e461b64befbf0fa8c9002ef763606105 Mon Sep 17 00:00:00 2001 +From 406402dfaecc62ede346793c9c7a0568dc71c131 Mon Sep 17 00:00:00 2001 From: Lenny Szubowicz Date: Mon, 29 Aug 2016 11:04:48 -0400 -Subject: [PATCH 147/229] Normalize slashes in tftp paths. +Subject: [PATCH 146/229] Normalize slashes in tftp paths. Some tftp servers do not handle multiple consecutive slashes correctly; this patch avoids sending tftp requests with non-normalized paths. diff --git a/0148-Fix-malformed-tftp-packets.patch b/0147-Fix-malformed-tftp-packets.patch similarity index 91% rename from 0148-Fix-malformed-tftp-packets.patch rename to 0147-Fix-malformed-tftp-packets.patch index 7aa075e1..69056868 100644 --- a/0148-Fix-malformed-tftp-packets.patch +++ b/0147-Fix-malformed-tftp-packets.patch @@ -1,7 +1,7 @@ -From af0e4fc8f9cd844c44c969c0991269ec9ab01a62 Mon Sep 17 00:00:00 2001 +From 7d05a8298e6a54bfae0038841462443f21da3535 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Tue, 7 Mar 2017 18:26:17 -0500 -Subject: [PATCH 148/229] Fix malformed tftp packets +Subject: [PATCH 147/229] Fix malformed tftp packets 0088-Normalize-slashes-in-tftp-paths.patch collapses multiple contiguous slashes in a filename into one slash in the tftp packet filename field. diff --git a/0149-Fix-race-in-EFI-validation.patch b/0148-Fix-race-in-EFI-validation.patch similarity index 95% rename from 0149-Fix-race-in-EFI-validation.patch rename to 0148-Fix-race-in-EFI-validation.patch index 791d0f86..45ee7955 100644 --- a/0149-Fix-race-in-EFI-validation.patch +++ b/0148-Fix-race-in-EFI-validation.patch @@ -1,7 +1,7 @@ -From d5339007d0ffdaf6e8a4e9702e7cec447b118804 Mon Sep 17 00:00:00 2001 +From bf59d76ca82eb4eaa20a747f5890d09632ba93d0 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 14 Jul 2015 16:58:51 -0700 -Subject: [PATCH 149/229] Fix race in EFI validation +Subject: [PATCH 148/229] Fix race in EFI validation --- grub-core/loader/i386/efi/linux.c | 44 ++++++++++----------------------------- diff --git a/0150-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0149-bz1374141-fix-incorrect-mask-for-ppc64.patch similarity index 94% rename from 0150-bz1374141-fix-incorrect-mask-for-ppc64.patch rename to 0149-bz1374141-fix-incorrect-mask-for-ppc64.patch index 92ca6b58..9d81fdbb 100644 --- a/0150-bz1374141-fix-incorrect-mask-for-ppc64.patch +++ b/0149-bz1374141-fix-incorrect-mask-for-ppc64.patch @@ -1,7 +1,7 @@ -From eea2b6113c2f17ed5755b23242457948025bfd33 Mon Sep 17 00:00:00 2001 +From 84a5f535949f590a8976c64c3d1fde08fe0f7464 Mon Sep 17 00:00:00 2001 From: Masahiro Matsuya Date: Sat, 29 Oct 2016 08:35:26 +0900 -Subject: [PATCH 150/229] bz1374141 fix incorrect mask for ppc64 +Subject: [PATCH 149/229] bz1374141 fix incorrect mask for ppc64 The netmask configured in firmware is not respected on ppc64 (big endian). When 255.255.252.0 is set as netmask in firmware, the following is the value of bootpath string in grub_ieee1275_parse_bootpath(). diff --git a/0151-Use-device-part-of-chainloader-target-if-present.patch b/0150-Use-device-part-of-chainloader-target-if-present.patch similarity index 89% rename from 0151-Use-device-part-of-chainloader-target-if-present.patch rename to 0150-Use-device-part-of-chainloader-target-if-present.patch index 83a911c9..02c9d99a 100644 --- a/0151-Use-device-part-of-chainloader-target-if-present.patch +++ b/0150-Use-device-part-of-chainloader-target-if-present.patch @@ -1,7 +1,7 @@ -From d08c1a531d80b4e14a7bfeb0d762125f4fab1317 Mon Sep 17 00:00:00 2001 +From d426e20f8b41ebf114075dc4ffbcaf438ceb4b95 Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Fri, 10 Apr 2015 01:45:02 -0400 -Subject: [PATCH 151/229] Use device part of chainloader target, if present. +Subject: [PATCH 150/229] Use device part of chainloader target, if present. Otherwise chainloading is restricted to '$root', which might not even be readable by EFI! diff --git a/0152-Add-secureboot-support-on-efi-chainloader.patch b/0151-Add-secureboot-support-on-efi-chainloader.patch similarity index 99% rename from 0152-Add-secureboot-support-on-efi-chainloader.patch rename to 0151-Add-secureboot-support-on-efi-chainloader.patch index 57324601..acf1da40 100644 --- a/0152-Add-secureboot-support-on-efi-chainloader.patch +++ b/0151-Add-secureboot-support-on-efi-chainloader.patch @@ -1,7 +1,7 @@ -From 729766b6416f6ca13c694ce220c3b2156ced1691 Mon Sep 17 00:00:00 2001 +From bbf98517303e438cea398bb74306b6553c880ac3 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 13:04:37 -0400 -Subject: [PATCH 152/229] Add secureboot support on efi chainloader +Subject: [PATCH 151/229] Add secureboot support on efi chainloader Expand the chainloader to be able to verify the image by means of shim lock protocol. The PE/COFF image is loaded and relocated by the diff --git a/0153-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0152-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch similarity index 99% rename from 0153-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch rename to 0152-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch index 4bbca640..a70fd9d0 100644 --- a/0153-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +++ b/0152-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch @@ -1,7 +1,7 @@ -From fe18b297027c4976d11b87f1b5adc07a7565cdee Mon Sep 17 00:00:00 2001 +From 25ea5be888dcc92cd0b3cb7d34b381f5005f1e30 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 16:09:25 -0400 -Subject: [PATCH 153/229] Make any of the loaders that link in efi mode honor +Subject: [PATCH 152/229] Make any of the loaders that link in efi mode honor secure boot. And in this case "honor" means "even if somebody does link this in, they diff --git a/0154-Make-grub_fatal-also-backtrace.patch b/0153-Make-grub_fatal-also-backtrace.patch similarity index 97% rename from 0154-Make-grub_fatal-also-backtrace.patch rename to 0153-Make-grub_fatal-also-backtrace.patch index f73247f2..b23cad7f 100644 --- a/0154-Make-grub_fatal-also-backtrace.patch +++ b/0153-Make-grub_fatal-also-backtrace.patch @@ -1,7 +1,7 @@ -From b2fd6377486d66ced5fd82325c3ee8e11f4f1176 Mon Sep 17 00:00:00 2001 +From eb1a27144476324a22561383a0a2e61aa327d2f5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 27 Jan 2016 09:22:42 -0500 -Subject: [PATCH 154/229] Make grub_fatal() also backtrace. +Subject: [PATCH 153/229] Make grub_fatal() also backtrace. --- grub-core/Makefile.core.def | 3 ++ diff --git a/0155-Rework-linux-command.patch b/0154-Rework-linux-command.patch similarity index 96% rename from 0155-Rework-linux-command.patch rename to 0154-Rework-linux-command.patch index 31d83837..85706ba1 100644 --- a/0155-Rework-linux-command.patch +++ b/0154-Rework-linux-command.patch @@ -1,7 +1,7 @@ -From 4fec1bb24e09f36366c62196285392a674d259d3 Mon Sep 17 00:00:00 2001 +From 12312bfe1727a2992042436cb0f8c8ba1c69ee2f Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:12:39 -0700 -Subject: [PATCH 155/229] Rework linux command +Subject: [PATCH 154/229] Rework linux command We want a single buffer that contains the entire kernel image in order to perform a TPM measurement. Allocate one and copy the entire kernel into it diff --git a/0156-Rework-linux16-command.patch b/0155-Rework-linux16-command.patch similarity index 96% rename from 0156-Rework-linux16-command.patch rename to 0155-Rework-linux16-command.patch index a2e60035..94c24682 100644 --- a/0156-Rework-linux16-command.patch +++ b/0155-Rework-linux16-command.patch @@ -1,7 +1,7 @@ -From 7d6ce3346f32a67e07fd3fda9ad65ac76f600628 Mon Sep 17 00:00:00 2001 +From 24250bbb84f8817462426c46b255d875de627bf1 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:20:58 -0700 -Subject: [PATCH 156/229] Rework linux16 command +Subject: [PATCH 155/229] Rework linux16 command We want a single buffer that contains the entire kernel image in order to perform a TPM measurement. Allocate one and copy the entire kernel int it diff --git a/0157-Make-grub-editenv-build-again.patch b/0156-Make-grub-editenv-build-again.patch similarity index 87% rename from 0157-Make-grub-editenv-build-again.patch rename to 0156-Make-grub-editenv-build-again.patch index c431d59c..386d2aaf 100644 --- a/0157-Make-grub-editenv-build-again.patch +++ b/0156-Make-grub-editenv-build-again.patch @@ -1,7 +1,7 @@ -From 4e0105392434bac9f10ac79a820a69098abec2f5 Mon Sep 17 00:00:00 2001 +From ebe69b2682b5b3029d8ea503f12134ee81c4b2ce Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Mar 2016 16:29:13 -0500 -Subject: [PATCH 157/229] Make grub-editenv build again. +Subject: [PATCH 156/229] Make grub-editenv build again. 36212460d3565b18439a3a8130b28e6c97702c6a split how some of the mkimage utility functions are defined, and they wind up being linked into diff --git a/0158-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0157-Fix-up-some-man-pages-rpmdiff-noticed.patch similarity index 96% rename from 0158-Fix-up-some-man-pages-rpmdiff-noticed.patch rename to 0157-Fix-up-some-man-pages-rpmdiff-noticed.patch index 4b9c25ba..c15b447b 100644 --- a/0158-Fix-up-some-man-pages-rpmdiff-noticed.patch +++ b/0157-Fix-up-some-man-pages-rpmdiff-noticed.patch @@ -1,7 +1,7 @@ -From 7779112786e3f892e05b9d293299dd7ef151d9dd Mon Sep 17 00:00:00 2001 +From c71e6152ea8e4e525a853441bb5f08808bae3afd Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 23 Sep 2014 09:58:49 -0400 -Subject: [PATCH 158/229] Fix up some man pages rpmdiff noticed. +Subject: [PATCH 157/229] Fix up some man pages rpmdiff noticed. --- configure.ac | 2 ++ diff --git a/0159-Re-work-some-intricacies-of-PE-loading.patch b/0158-Re-work-some-intricacies-of-PE-loading.patch similarity index 99% rename from 0159-Re-work-some-intricacies-of-PE-loading.patch rename to 0158-Re-work-some-intricacies-of-PE-loading.patch index 7cd15558..73ed8ed4 100644 --- a/0159-Re-work-some-intricacies-of-PE-loading.patch +++ b/0158-Re-work-some-intricacies-of-PE-loading.patch @@ -1,7 +1,7 @@ -From 9ca2908ab56bc32052b2f01bda6a35a190e39bae Mon Sep 17 00:00:00 2001 +From 145214ee7c411c7d600016f011dc11b213bce0b2 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 9 Jun 2016 12:22:29 -0400 -Subject: [PATCH 159/229] Re-work some intricacies of PE loading. +Subject: [PATCH 158/229] Re-work some intricacies of PE loading. The PE spec is not a well written document, and awesomely every place where there's an ambiguous way to read something, Windows' bootmgfw.efi diff --git a/0160-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch b/0159-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch similarity index 99% rename from 0160-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch rename to 0159-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch index 3e99ce72..d2a9eb0e 100644 --- a/0160-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch +++ b/0159-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch @@ -1,7 +1,7 @@ -From d8441e12feab1ae94f11849d1bcc5e73abb69231 Mon Sep 17 00:00:00 2001 +From ef24bc601e11b96eefe06f477b5da1199d761b3d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 10 Jun 2016 14:06:15 -0400 -Subject: [PATCH 160/229] Rework even more of efi chainload so non-sb cases +Subject: [PATCH 159/229] Rework even more of efi chainload so non-sb cases work right. This ensures that if shim protocol is not loaded, or is loaded but shim diff --git a/0161-linuxefi-fix-double-free-on-verification-failure.patch b/0160-linuxefi-fix-double-free-on-verification-failure.patch similarity index 83% rename from 0161-linuxefi-fix-double-free-on-verification-failure.patch rename to 0160-linuxefi-fix-double-free-on-verification-failure.patch index 3b2f6f9f..d1a64a4b 100644 --- a/0161-linuxefi-fix-double-free-on-verification-failure.patch +++ b/0160-linuxefi-fix-double-free-on-verification-failure.patch @@ -1,7 +1,7 @@ -From e432d9b485112f0d35fd623e4b2467a3d788a38f Mon Sep 17 00:00:00 2001 +From 5ef3f00e6be3033092453a66f456b8dac8cd4f7c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jun 2016 09:50:25 -0400 -Subject: [PATCH 161/229] linuxefi: fix double free on verification failure. +Subject: [PATCH 160/229] linuxefi: fix double free on verification failure. Signed-off-by: Peter Jones --- diff --git a/0162-fix-machine-type-test-in-30_os-prober.in.patch b/0161-fix-machine-type-test-in-30_os-prober.in.patch similarity index 82% rename from 0162-fix-machine-type-test-in-30_os-prober.in.patch rename to 0161-fix-machine-type-test-in-30_os-prober.in.patch index bcf22c14..1da34ebe 100644 --- a/0162-fix-machine-type-test-in-30_os-prober.in.patch +++ b/0161-fix-machine-type-test-in-30_os-prober.in.patch @@ -1,7 +1,7 @@ -From 33faccd6c6f23774bbbbc83731a712a7bed76c3f Mon Sep 17 00:00:00 2001 +From 4139fdfdb64fd248a0d5f200b27c583159dbb190 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 11 Jul 2016 13:36:45 -0400 -Subject: [PATCH 162/229] fix machine type test in 30_os-prober.in +Subject: [PATCH 161/229] fix machine type test in 30_os-prober.in Signed-off-by: Peter Jones --- diff --git a/0163-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch b/0162-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch similarity index 91% rename from 0163-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch rename to 0162-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch index bc96cbb4..0b8725f6 100644 --- a/0163-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch +++ b/0162-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch @@ -1,7 +1,7 @@ -From ab9c2a7711858b2300abf802230c044db55c5171 Mon Sep 17 00:00:00 2001 +From 671699a76fa6510a62c3a94acd698a31686cb8fa Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Mon, 21 Nov 2016 15:34:00 +0100 -Subject: [PATCH 163/229] efi/chainloader: fix wrong sanity check in +Subject: [PATCH 162/229] efi/chainloader: fix wrong sanity check in relocate_coff() In relocate_coff(), the relocation entries are parsed from the original diff --git a/0164-efi-chainloader-truncate-overlong-relocation-section.patch b/0163-efi-chainloader-truncate-overlong-relocation-section.patch similarity index 97% rename from 0164-efi-chainloader-truncate-overlong-relocation-section.patch rename to 0163-efi-chainloader-truncate-overlong-relocation-section.patch index 1c0fdbfd..0280868c 100644 --- a/0164-efi-chainloader-truncate-overlong-relocation-section.patch +++ b/0163-efi-chainloader-truncate-overlong-relocation-section.patch @@ -1,7 +1,7 @@ -From 243bfac3395d76a7fc7344c5471e49ea41689233 Mon Sep 17 00:00:00 2001 +From d081bd5f47235e3bfd256fd262a6f98fe8b0d0ff Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 23 Nov 2016 06:27:09 +0100 -Subject: [PATCH 164/229] efi/chainloader: truncate overlong relocation section +Subject: [PATCH 163/229] efi/chainloader: truncate overlong relocation section The UEFI Windows 7 boot loader ("EFI/Microsoft/Boot/bootmgfw.efi", SHA1 31b410e029bba87d2068c65a80b88882f9f8ea25) has inconsistent headers. diff --git a/0165-linuxefi-minor-cleanups.patch b/0164-linuxefi-minor-cleanups.patch similarity index 96% rename from 0165-linuxefi-minor-cleanups.patch rename to 0164-linuxefi-minor-cleanups.patch index 1c706cef..6ead190a 100644 --- a/0165-linuxefi-minor-cleanups.patch +++ b/0164-linuxefi-minor-cleanups.patch @@ -1,7 +1,7 @@ -From ea34d6d6755dcd818fe6e74526a58a4f818f711a Mon Sep 17 00:00:00 2001 +From 8dc21ff37f62f3d10fb3d708ffd33b7d723a23cf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Feb 2017 16:31:52 -0500 -Subject: [PATCH 165/229] linuxefi: minor cleanups +Subject: [PATCH 164/229] linuxefi: minor cleanups Signed-off-by: Peter Jones --- diff --git a/0166-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/0165-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch similarity index 98% rename from 0166-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch rename to 0165-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch index d3ae53a1..e246bee7 100644 --- a/0166-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch +++ b/0165-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch @@ -1,7 +1,7 @@ -From 543b4c21f3bf43b8919bd4b47195ebb542b73733 Mon Sep 17 00:00:00 2001 +From 10d6d333de0aa7e390a22ebc4b308f7ad937d5bc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Feb 2017 16:18:54 -0500 -Subject: [PATCH 166/229] Handle multi-arch (64-on-32) boot in linuxefi loader. +Subject: [PATCH 165/229] Handle multi-arch (64-on-32) boot in linuxefi loader. Allow booting 64-bit kernels on 32-bit EFI on x86. diff --git a/0167-Fix-up-linux-params-usage.patch b/0166-Fix-up-linux-params-usage.patch similarity index 92% rename from 0167-Fix-up-linux-params-usage.patch rename to 0166-Fix-up-linux-params-usage.patch index bdb06e4f..1b97ba6a 100644 --- a/0167-Fix-up-linux-params-usage.patch +++ b/0166-Fix-up-linux-params-usage.patch @@ -1,7 +1,7 @@ -From 02a30356c3a09ac0959abdc4a29b88a59e1f1ac1 Mon Sep 17 00:00:00 2001 +From 93be95c27b0ddb63c2e3a287a3ed92c0a5de93e5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 30 May 2017 14:16:07 -0400 -Subject: [PATCH 167/229] Fix up linux params usage... +Subject: [PATCH 166/229] Fix up linux params usage... Signed-off-by: Peter Jones --- diff --git a/0168-Make-exit-take-a-return-code.patch b/0167-Make-exit-take-a-return-code.patch similarity index 91% rename from 0168-Make-exit-take-a-return-code.patch rename to 0167-Make-exit-take-a-return-code.patch index e659bfa9..1aa10337 100644 --- a/0168-Make-exit-take-a-return-code.patch +++ b/0167-Make-exit-take-a-return-code.patch @@ -1,7 +1,7 @@ -From 874de3a91070b6f056434f2fce48d778ff84c665 Mon Sep 17 00:00:00 2001 +From 6b67d46c1764c86611939dc01267f9c70f413184 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 26 Feb 2014 21:49:12 -0500 -Subject: [PATCH 168/229] Make "exit" take a return code. +Subject: [PATCH 167/229] Make "exit" take a return code. This adds "exit" with a return code. With this patch, any "exit" command /may/ include a return code, and on platforms that support diff --git a/0169-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch b/0168-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch similarity index 91% rename from 0169-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch rename to 0168-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch index 3f5f612c..cd4bf875 100644 --- a/0169-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch +++ b/0168-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch @@ -1,7 +1,7 @@ -From a327d2275238e8dd54ec8599d2d158e9cdd7693c Mon Sep 17 00:00:00 2001 +From e48a4c0b9e475b16366ff6c375de5186432eb1f7 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 17 Apr 2017 08:44:29 -0400 -Subject: [PATCH 169/229] arm64: make sure fdt has #address-cells and +Subject: [PATCH 168/229] arm64: make sure fdt has #address-cells and #size-cells properties Recent upstream changes to kexec-tools relies on #address-cells diff --git a/0170-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch b/0169-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch similarity index 91% rename from 0170-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch rename to 0169-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch index 691a72bc..fde73e62 100644 --- a/0170-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch +++ b/0169-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch @@ -1,7 +1,7 @@ -From 848a699f96e8529a30a47670051c5cb1f1a91d66 Mon Sep 17 00:00:00 2001 +From 755fa5ccf0834abdb7e50a1cb06fad618f6c9af6 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 9 May 2016 14:15:17 -0400 -Subject: [PATCH 170/229] Add some grub_dprintf() in the secure boot verify +Subject: [PATCH 169/229] Add some grub_dprintf() in the secure boot verify code. Signed-off-by: Peter Jones diff --git a/0171-Make-our-info-pages-say-grub2-where-appropriate.patch b/0170-Make-our-info-pages-say-grub2-where-appropriate.patch similarity index 99% rename from 0171-Make-our-info-pages-say-grub2-where-appropriate.patch rename to 0170-Make-our-info-pages-say-grub2-where-appropriate.patch index 18748f37..5da9b008 100644 --- a/0171-Make-our-info-pages-say-grub2-where-appropriate.patch +++ b/0170-Make-our-info-pages-say-grub2-where-appropriate.patch @@ -1,7 +1,7 @@ -From 004821d9e309f65e4ff533f66787663fe2a54eac Mon Sep 17 00:00:00 2001 +From 15c340acd845056ba259b9fffd6c7d083874cb82 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 6 May 2016 18:43:08 -0400 -Subject: [PATCH 171/229] Make our info pages say "grub2" where appropriate. +Subject: [PATCH 170/229] Make our info pages say "grub2" where appropriate. This needs to be hooked up to --program-transform=, but I haven't had time. diff --git a/0172-print-more-debug-info-in-our-module-loader.patch b/0171-print-more-debug-info-in-our-module-loader.patch similarity index 90% rename from 0172-print-more-debug-info-in-our-module-loader.patch rename to 0171-print-more-debug-info-in-our-module-loader.patch index a58d3cf0..54387180 100644 --- a/0172-print-more-debug-info-in-our-module-loader.patch +++ b/0171-print-more-debug-info-in-our-module-loader.patch @@ -1,7 +1,7 @@ -From 6025b0afe64157eb922d562e85f1734b7ce800c9 Mon Sep 17 00:00:00 2001 +From 0d0a7ebbed42b97fca63cbcaf85a469b77c76fda Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 1 May 2017 11:19:40 -0400 -Subject: [PATCH 172/229] print more debug info in our module loader. +Subject: [PATCH 171/229] print more debug info in our module loader. Signed-off-by: Peter Jones --- diff --git a/0173-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0172-macos-just-build-chainloader-entries-don-t-try-any-x.patch similarity index 97% rename from 0173-macos-just-build-chainloader-entries-don-t-try-any-x.patch rename to 0172-macos-just-build-chainloader-entries-don-t-try-any-x.patch index 8c050cb6..14189b95 100644 --- a/0173-macos-just-build-chainloader-entries-don-t-try-any-x.patch +++ b/0172-macos-just-build-chainloader-entries-don-t-try-any-x.patch @@ -1,7 +1,7 @@ -From 21539770394174892fe90ab9ce09a4d9a7e2a676 Mon Sep 17 00:00:00 2001 +From 4cb6b65d74966dfbe6e8463ee1e88d99ca7de5b1 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 24 May 2017 12:42:32 -0400 -Subject: [PATCH 173/229] macos: just build chainloader entries, don't try any +Subject: [PATCH 172/229] macos: just build chainloader entries, don't try any xnu xnu. Since our bugs tell us that the xnu boot entries really just don't work diff --git a/0174-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0173-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch similarity index 99% rename from 0174-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch rename to 0173-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch index 8958bfe6..bef9d787 100644 --- a/0174-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch +++ b/0173-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch @@ -1,7 +1,7 @@ -From ba06fbb797dff2261df7d211484c98905447ddb6 Mon Sep 17 00:00:00 2001 +From 396001716b7f8c7a6aee17f33fdb9e5d47424cbc Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Wed, 18 Dec 2013 09:57:04 +0000 -Subject: [PATCH 174/229] grub2/btrfs: Add ability to boot from subvolumes +Subject: [PATCH 173/229] grub2/btrfs: Add ability to boot from subvolumes This patch adds the ability to specify a different root on a btrfs filesystem too boot from other than the default one. diff --git a/0175-export-btrfs_subvol-and-btrfs_subvolid.patch b/0174-export-btrfs_subvol-and-btrfs_subvolid.patch similarity index 86% rename from 0175-export-btrfs_subvol-and-btrfs_subvolid.patch rename to 0174-export-btrfs_subvol-and-btrfs_subvolid.patch index 188dc4dc..419fb99a 100644 --- a/0175-export-btrfs_subvol-and-btrfs_subvolid.patch +++ b/0174-export-btrfs_subvol-and-btrfs_subvolid.patch @@ -1,7 +1,7 @@ -From c2d51bfc2fedf707ec4bc8cca9a10cb1100c6888 Mon Sep 17 00:00:00 2001 +From 35c1015fc1a4313be34757eebb195547336e0edf Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 18 Dec 2013 09:57:04 +0000 -Subject: [PATCH 175/229] export btrfs_subvol and btrfs_subvolid +Subject: [PATCH 174/229] export btrfs_subvol and btrfs_subvolid We should export btrfs_subvol and btrfs_subvolid to have both visible to subsidiary configuration files loaded using configfile. diff --git a/0176-grub2-btrfs-03-follow_default.patch b/0175-grub2-btrfs-03-follow_default.patch similarity index 97% rename from 0176-grub2-btrfs-03-follow_default.patch rename to 0175-grub2-btrfs-03-follow_default.patch index ad38cb34..6f20c99c 100644 --- a/0176-grub2-btrfs-03-follow_default.patch +++ b/0175-grub2-btrfs-03-follow_default.patch @@ -1,7 +1,7 @@ -From afc0024ac644e80552c808e8b8def04fd7f89918 Mon Sep 17 00:00:00 2001 +From 476a0251e8ca2850da7c383baf7fdbd810bc789f Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 -Subject: [PATCH 176/229] grub2-btrfs-03-follow_default +Subject: [PATCH 175/229] grub2-btrfs-03-follow_default --- grub-core/fs/btrfs.c | 107 ++++++++++++++++++++++++++++++++++++--------------- diff --git a/0177-grub2-btrfs-04-grub2-install.patch b/0176-grub2-btrfs-04-grub2-install.patch similarity index 97% rename from 0177-grub2-btrfs-04-grub2-install.patch rename to 0176-grub2-btrfs-04-grub2-install.patch index f3d1215c..90a26412 100644 --- a/0177-grub2-btrfs-04-grub2-install.patch +++ b/0176-grub2-btrfs-04-grub2-install.patch @@ -1,7 +1,7 @@ -From a5cb6219b1f4abb50cbe0254ee6a2850e379854f Mon Sep 17 00:00:00 2001 +From e03dd83cc804d70af0716d0a429715afbcdc7eae Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 -Subject: [PATCH 177/229] grub2-btrfs-04-grub2-install +Subject: [PATCH 176/229] grub2-btrfs-04-grub2-install --- grub-core/osdep/linux/getroot.c | 7 +++++++ diff --git a/0178-grub2-btrfs-05-grub2-mkconfig.patch b/0177-grub2-btrfs-05-grub2-mkconfig.patch similarity index 97% rename from 0178-grub2-btrfs-05-grub2-mkconfig.patch rename to 0177-grub2-btrfs-05-grub2-mkconfig.patch index 5ed51ac0..51ba3189 100644 --- a/0178-grub2-btrfs-05-grub2-mkconfig.patch +++ b/0177-grub2-btrfs-05-grub2-mkconfig.patch @@ -1,7 +1,7 @@ -From 3312b0eab4773f09b00d294e3438d6cf881d62ef Mon Sep 17 00:00:00 2001 +From cb43e7a6c96127e72d6787c6063de8911284fe18 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 -Subject: [PATCH 178/229] grub2-btrfs-05-grub2-mkconfig +Subject: [PATCH 177/229] grub2-btrfs-05-grub2-mkconfig --- util/grub-mkconfig.in | 3 ++- diff --git a/0179-grub2-btrfs-06-subvol-mount.patch b/0178-grub2-btrfs-06-subvol-mount.patch similarity index 99% rename from 0179-grub2-btrfs-06-subvol-mount.patch rename to 0178-grub2-btrfs-06-subvol-mount.patch index db8766f6..8324e7c3 100644 --- a/0179-grub2-btrfs-06-subvol-mount.patch +++ b/0178-grub2-btrfs-06-subvol-mount.patch @@ -1,7 +1,7 @@ -From 421b1facc21a25ca28a48c9dd323c48c5ce8a46b Mon Sep 17 00:00:00 2001 +From 84d6a482c2c8d0677141bb888512a6a89daf9d8b Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Fri, 22 May 2015 11:45:25 +0000 -Subject: [PATCH 179/229] grub2-btrfs-06-subvol-mount +Subject: [PATCH 178/229] grub2-btrfs-06-subvol-mount --- grub-core/fs/btrfs.c | 195 +++++++++++++++++++++++++++++++++++++++- diff --git a/0180-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch b/0179-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch similarity index 87% rename from 0180-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch rename to 0179-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch index e50fe75b..f798a137 100644 --- a/0180-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch +++ b/0179-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch @@ -1,7 +1,7 @@ -From 1eeea190cf2e134fddb448c7b55e6c82697f3f72 Mon Sep 17 00:00:00 2001 +From 741c0651cd54970c08e9c19a82f5805aafbfda23 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Sat, 18 Jul 2015 15:38:08 +0000 -Subject: [PATCH 180/229] No more "Bootable Snapshot" submenu in grub.cfg. +Subject: [PATCH 179/229] No more "Bootable Snapshot" submenu in grub.cfg. This breaks grubby (run on kernel upgrades) because grubby just does a search for "menuentry". diff --git a/0181-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0180-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch similarity index 92% rename from 0181-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch rename to 0180-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch index 99692295..13077728 100644 --- a/0181-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch +++ b/0180-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch @@ -1,7 +1,7 @@ -From 5f9e9d0d069b416175a2102edc574ffb9d523978 Mon Sep 17 00:00:00 2001 +From ab8e0d4bf544b708f5afa4cc56e6bd16789f2f1e Mon Sep 17 00:00:00 2001 From: Andrei Borzenkov Date: Tue, 21 Jun 2016 16:44:17 +0000 -Subject: [PATCH 181/229] Fallback to old subvol name scheme to support old +Subject: [PATCH 180/229] Fallback to old subvol name scheme to support old snapshot config Ref: bsc#953538 diff --git a/0182-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0181-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch similarity index 98% rename from 0182-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch rename to 0181-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch index a85d5352..ae030492 100644 --- a/0182-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch +++ b/0181-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch @@ -1,7 +1,7 @@ -From 158b6b3987ed402ddcb6d0568acbb60cc7a01aac Mon Sep 17 00:00:00 2001 +From eb8535428a42c7099666ddb58ac900bb8ee745ba Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 11 May 2017 08:56:57 +0000 -Subject: [PATCH 182/229] Grub not working correctly with btrfs snapshots +Subject: [PATCH 181/229] Grub not working correctly with btrfs snapshots (bsc#1026511) --- diff --git a/0183-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0182-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch similarity index 94% rename from 0183-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch rename to 0182-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch index ce5e2082..f59c82c3 100644 --- a/0183-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch +++ b/0182-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch @@ -1,7 +1,7 @@ -From bdc07d05d0eeb39f0c90e7f8f6850016ebc4bf6b Mon Sep 17 00:00:00 2001 +From 2a6e1d2491b7334985ad25315faa22d26354d8b7 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 09:59:56 -0400 -Subject: [PATCH 183/229] Add grub_efi_allocate_pool() and grub_efi_free_pool() +Subject: [PATCH 182/229] Add grub_efi_allocate_pool() and grub_efi_free_pool() wrappers. Signed-off-by: Peter Jones diff --git a/0184-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0183-Use-grub_efi_.-memory-helpers-where-reasonable.patch similarity index 96% rename from 0184-Use-grub_efi_.-memory-helpers-where-reasonable.patch rename to 0183-Use-grub_efi_.-memory-helpers-where-reasonable.patch index 557348f3..f5fbb3c8 100644 --- a/0184-Use-grub_efi_.-memory-helpers-where-reasonable.patch +++ b/0183-Use-grub_efi_.-memory-helpers-where-reasonable.patch @@ -1,7 +1,7 @@ -From 0e6c1a61c5a7c38bd04a0d494dade62bc2c8cd43 Mon Sep 17 00:00:00 2001 +From 6ea13cdb3f33da45d7a8042d85ad87e2a18fc946 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 10:06:38 -0400 -Subject: [PATCH 184/229] Use grub_efi_...() memory helpers where reasonable. +Subject: [PATCH 183/229] Use grub_efi_...() memory helpers where reasonable. This uses grub_efi_allocate_pool(), grub_efi_free_pool(), and grub_efi_free_pages() instead of open-coded efi_call_N() calls, so we diff --git a/0185-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0184-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch similarity index 93% rename from 0185-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch rename to 0184-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch index 564e6093..3a45d817 100644 --- a/0185-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch +++ b/0184-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch @@ -1,7 +1,7 @@ -From 4759e79a841a9d7eab743e67715459d3a864a29f Mon Sep 17 00:00:00 2001 +From eae94a16a8ae350cdeab8b7742f9227d92001272 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 10:07:50 -0400 -Subject: [PATCH 185/229] Add PRIxGRUB_EFI_STATUS and use it. +Subject: [PATCH 184/229] Add PRIxGRUB_EFI_STATUS and use it. This avoids syntax checkers getting confused about if it's llx or lx. diff --git a/0186-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch b/0185-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch similarity index 91% rename from 0186-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch rename to 0185-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch index 26e9aea1..0967f226 100644 --- a/0186-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch +++ b/0185-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch @@ -1,7 +1,7 @@ -From c7bb1be13a759a55216c99662d660614a161c37f Mon Sep 17 00:00:00 2001 +From 41a50aa2c275076caa2f9fe7a747eeb054abed16 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:42:57 -0400 -Subject: [PATCH 186/229] Don't use dynamic sized arrays since we don't build +Subject: [PATCH 185/229] Don't use dynamic sized arrays since we don't build with -std=c99 --- diff --git a/0187-don-t-ignore-const.patch b/0186-don-t-ignore-const.patch similarity index 83% rename from 0187-don-t-ignore-const.patch rename to 0186-don-t-ignore-const.patch index dd27d509..30e8730a 100644 --- a/0187-don-t-ignore-const.patch +++ b/0186-don-t-ignore-const.patch @@ -1,7 +1,7 @@ -From 3eb59abe528f660e24e004a99b86686ea2f022c5 Mon Sep 17 00:00:00 2001 +From d06e2578107f217d2bc8beee7fd0dc7f2645873d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:43:22 -0400 -Subject: [PATCH 187/229] don't ignore const +Subject: [PATCH 186/229] don't ignore const --- grub-core/net/tftp.c | 2 +- diff --git a/0188-don-t-use-int-for-efi-status.patch b/0187-don-t-use-int-for-efi-status.patch similarity index 83% rename from 0188-don-t-use-int-for-efi-status.patch rename to 0187-don-t-use-int-for-efi-status.patch index 841e2728..f9f1a47b 100644 --- a/0188-don-t-use-int-for-efi-status.patch +++ b/0187-don-t-use-int-for-efi-status.patch @@ -1,7 +1,7 @@ -From d4517c646fb4617a9ac162489b2fbaf9c2fcdd7b Mon Sep 17 00:00:00 2001 +From 6d86c59c24e12c8e8471cdd2affca574fdee160d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:44:59 -0400 -Subject: [PATCH 188/229] don't use int for efi status +Subject: [PATCH 187/229] don't use int for efi status --- grub-core/kern/efi/efi.c | 2 +- diff --git a/0189-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0188-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch similarity index 87% rename from 0189-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch rename to 0188-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch index 24e624fb..b464a3ff 100644 --- a/0189-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +++ b/0188-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch @@ -1,7 +1,7 @@ -From 72eb71bcadf8f35851b15632e8ef4ad1d0a64513 Mon Sep 17 00:00:00 2001 +From ba6828d073bbda85eba59a9ce9220eada51a540b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:46:23 -0400 -Subject: [PATCH 189/229] make GRUB_MOD_INIT() declare its function prototypes. +Subject: [PATCH 188/229] make GRUB_MOD_INIT() declare its function prototypes. --- include/grub/dl.h | 2 ++ diff --git a/0190-Clean-up-some-errors-in-the-linuxefi-loader.patch b/0189-Clean-up-some-errors-in-the-linuxefi-loader.patch similarity index 95% rename from 0190-Clean-up-some-errors-in-the-linuxefi-loader.patch rename to 0189-Clean-up-some-errors-in-the-linuxefi-loader.patch index 649e08df..063f2cc7 100644 --- a/0190-Clean-up-some-errors-in-the-linuxefi-loader.patch +++ b/0189-Clean-up-some-errors-in-the-linuxefi-loader.patch @@ -1,7 +1,7 @@ -From e240faaa432ad7ba3f7ced51b983d8d663a83460 Mon Sep 17 00:00:00 2001 +From 8bdc0c77919ddb9bd588ac45e96c96497683f76c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 24 May 2017 15:58:18 -0400 -Subject: [PATCH 190/229] Clean up some errors in the linuxefi loader +Subject: [PATCH 189/229] Clean up some errors in the linuxefi loader Signed-off-by: Peter Jones --- diff --git a/0191-editenv-handle-relative-symlinks.patch b/0190-editenv-handle-relative-symlinks.patch similarity index 91% rename from 0191-editenv-handle-relative-symlinks.patch rename to 0190-editenv-handle-relative-symlinks.patch index 556bb320..9ed1c878 100644 --- a/0191-editenv-handle-relative-symlinks.patch +++ b/0190-editenv-handle-relative-symlinks.patch @@ -1,7 +1,7 @@ -From 9778fafba22ec67f97bb35a34980230966ebe0de Mon Sep 17 00:00:00 2001 +From 098987b7b5fcc15a5ba3600fa132fcec36095c5a Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 14 Aug 2017 14:37:20 -0400 -Subject: [PATCH 191/229] editenv: handle relative symlinks +Subject: [PATCH 190/229] editenv: handle relative symlinks Handle symlinks with targets relative to the containing dir. This ensures that the rename operation does not depend on the cwd. diff --git a/0192-Make-libgrub.pp-depend-on-config-util.h.patch b/0191-Make-libgrub.pp-depend-on-config-util.h.patch similarity index 97% rename from 0192-Make-libgrub.pp-depend-on-config-util.h.patch rename to 0191-Make-libgrub.pp-depend-on-config-util.h.patch index 2e0c111c..70fbbdfb 100644 --- a/0192-Make-libgrub.pp-depend-on-config-util.h.patch +++ b/0191-Make-libgrub.pp-depend-on-config-util.h.patch @@ -1,7 +1,7 @@ -From b8baf7070cc80fc44ee998a4748029c893f5ab13 Mon Sep 17 00:00:00 2001 +From c86299049c2cc0503728deee280d9f6bf50886f4 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 23 Aug 2017 10:37:27 -0400 -Subject: [PATCH 192/229] Make libgrub.pp depend on config-util.h +Subject: [PATCH 191/229] Make libgrub.pp depend on config-util.h If you build with "make -j48" a lot, sometimes you see: diff --git a/0193-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0192-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch similarity index 90% rename from 0193-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch rename to 0192-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch index dc18ab73..0781d963 100644 --- a/0193-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch +++ b/0192-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch @@ -1,7 +1,7 @@ -From 385f38332007339ac7dd3e3e551c54faa3c32dbc Mon Sep 17 00:00:00 2001 +From 351799d9310a4bec23ed4074444780c2a35435fd Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 20 Apr 2017 13:29:06 -0400 -Subject: [PATCH 193/229] Don't guess /boot/efi/ as HFS+ on ppc machines in +Subject: [PATCH 192/229] Don't guess /boot/efi/ as HFS+ on ppc machines in grub-install This should never be trying this, and since we've consolidated the diff --git a/0194-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch b/0193-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch similarity index 93% rename from 0194-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch rename to 0193-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch index fbddf861..46931345 100644 --- a/0194-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch +++ b/0193-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch @@ -1,7 +1,7 @@ -From 733966aa9d241a0987a7097eca74b0f58b426833 Mon Sep 17 00:00:00 2001 +From cba0322cd88baf136ac693f5ec1826f3314daeff Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Mon, 28 Aug 2017 13:51:14 -0400 -Subject: [PATCH 194/229] Fix util/grub.d/20_linux_xen.in: Add xen_boot command +Subject: [PATCH 193/229] Fix util/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64 Commit d33045ce7ffcb7c1e4a60c14d5ca64b36e3c5abe introduced diff --git a/0195-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch b/0194-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch similarity index 87% rename from 0195-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch rename to 0194-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch index 18a950b2..91775a2b 100644 --- a/0195-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch +++ b/0194-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch @@ -1,7 +1,7 @@ -From d592ef69ef92e3f7a414577af70678be706ff8c8 Mon Sep 17 00:00:00 2001 +From 87c089b6f1945ebcc690697d279c74284f1b4072 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Mon, 28 Aug 2017 13:59:12 -0400 -Subject: [PATCH 195/229] Use grub-file to figure out whether multiboot2 should +Subject: [PATCH 194/229] Use grub-file to figure out whether multiboot2 should be used for Xen.gz The multiboot2 is much more preferable than multiboot. Especiall diff --git a/0196-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/0195-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch similarity index 89% rename from 0196-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch rename to 0195-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch index 61f39def..cdf614c2 100644 --- a/0196-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch +++ b/0195-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch @@ -1,7 +1,7 @@ -From ae2759407aad1b5cfee90299ef0a6f53ca4d3d9a Mon Sep 17 00:00:00 2001 +From 92d3db585076d022521ab94a2ceed03eb05013fc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 19 Oct 2017 11:29:11 -0400 -Subject: [PATCH 196/229] 20_linux_xen: load xen or multiboot{,2} modules as +Subject: [PATCH 195/229] 20_linux_xen: load xen or multiboot{,2} modules as needed. Signed-off-by: Peter Jones diff --git a/0197-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch b/0196-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch similarity index 90% rename from 0197-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch rename to 0196-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch index f46932ef..a2a33916 100644 --- a/0197-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch +++ b/0196-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch @@ -1,7 +1,7 @@ -From d88a8ff86cb9c360bc92b75db69e5024b1e814cc Mon Sep 17 00:00:00 2001 +From 2e5b957292d3f313d48bded25e8ca83468326c5b Mon Sep 17 00:00:00 2001 From: "David E. Box" Date: Fri, 15 Sep 2017 15:37:05 -0700 -Subject: [PATCH 197/229] tsc: Change default tsc calibration method to pmtimer +Subject: [PATCH 196/229] tsc: Change default tsc calibration method to pmtimer on EFI systems On efi systems, make pmtimer based tsc calibration the default over the diff --git a/0198-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch b/0197-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch similarity index 98% rename from 0198-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch rename to 0197-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch index af81f67c..553d8062 100644 --- a/0198-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch +++ b/0197-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch @@ -1,7 +1,7 @@ -From ee10486cadcae785711ccc7c46dac24a500be8fc Mon Sep 17 00:00:00 2001 +From 0b158c30810db86f549cabd6e6021ab15962370d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 7 Nov 2017 17:12:17 -0500 -Subject: [PATCH 198/229] Make pmtimer tsc calibration not take 51 seconds to +Subject: [PATCH 197/229] Make pmtimer tsc calibration not take 51 seconds to fail. On my laptop running at 2.4GHz, if I run a VM where tsc calibration diff --git a/0199-align-struct-efi_variable-better.patch b/0198-align-struct-efi_variable-better.patch similarity index 88% rename from 0199-align-struct-efi_variable-better.patch rename to 0198-align-struct-efi_variable-better.patch index 6603c84c..35c4a3c3 100644 --- a/0199-align-struct-efi_variable-better.patch +++ b/0198-align-struct-efi_variable-better.patch @@ -1,7 +1,7 @@ -From cfcacf01ed042f6354c5d4249bdc6d883d04b330 Mon Sep 17 00:00:00 2001 +From 2485633ada06c11c07a34a696a92b14e58f1e846 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 27 Feb 2018 13:55:35 -0500 -Subject: [PATCH 199/229] align struct efi_variable better... +Subject: [PATCH 198/229] align struct efi_variable better... --- include/grub/efiemu/runtime.h | 2 +- diff --git a/0200-Add-quicksort-implementation.patch b/0199-Add-quicksort-implementation.patch similarity index 98% rename from 0200-Add-quicksort-implementation.patch rename to 0199-Add-quicksort-implementation.patch index 5e9bc73b..d53e69fa 100644 --- a/0200-Add-quicksort-implementation.patch +++ b/0199-Add-quicksort-implementation.patch @@ -1,7 +1,7 @@ -From f46dc44957a3a31a86a215d43f3971fa4ca97318 Mon Sep 17 00:00:00 2001 +From a2cd100d71711b950beaf60ea7ddca4c77a70d59 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 9 Dec 2016 15:39:47 -0500 -Subject: [PATCH 200/229] Add quicksort implementation +Subject: [PATCH 199/229] Add quicksort implementation This will be used to sort the boot menu entries that are read from the BootLoaderSpec config files. diff --git a/0201-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch b/0200-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch similarity index 99% rename from 0201-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch rename to 0200-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch index 9cf4bc4f..8aaf431f 100644 --- a/0201-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch +++ b/0200-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch @@ -1,7 +1,7 @@ -From de3430a0a616a9600ccac0f0a9df661446661999 Mon Sep 17 00:00:00 2001 +From ed595feeea2f7b7fd0158d42fa2fd39420eea683 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 9 Dec 2016 15:40:58 -0500 -Subject: [PATCH 201/229] Add blscfg command support to parse BootLoaderSpec +Subject: [PATCH 200/229] Add blscfg command support to parse BootLoaderSpec config fragments The BootLoaderSpec (BLS) defines a scheme where different bootloaders can diff --git a/0202-Add-BLS-support-to-grub-mkconfig.patch b/0201-Add-BLS-support-to-grub-mkconfig.patch similarity index 98% rename from 0202-Add-BLS-support-to-grub-mkconfig.patch rename to 0201-Add-BLS-support-to-grub-mkconfig.patch index 2bec2a63..f5635365 100644 --- a/0202-Add-BLS-support-to-grub-mkconfig.patch +++ b/0201-Add-BLS-support-to-grub-mkconfig.patch @@ -1,7 +1,7 @@ -From 9baa7c16e5138497862eba684d2c41e5ed16e787 Mon Sep 17 00:00:00 2001 +From d847a4806bb7a4f3b457d0074d712e500fbd5e97 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 9 Dec 2016 15:40:29 -0500 -Subject: [PATCH 202/229] Add BLS support to grub-mkconfig +Subject: [PATCH 201/229] Add BLS support to grub-mkconfig GRUB now has BootLoaderSpec support, the user can choose to use this by setting GRUB_ENABLE_BLSCFG to true in /etc/default/grub. On this setup, diff --git a/0203-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch b/0202-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch similarity index 87% rename from 0203-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch rename to 0202-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch index 3fedabe1..b9b57cf7 100644 --- a/0203-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch +++ b/0202-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch @@ -1,7 +1,7 @@ -From 206697fab4e803807a83f1f7f330d3d009aba2fd Mon Sep 17 00:00:00 2001 +From 2d7dabdbf322e8f679eeaefd48cb26b083cdeb1c Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Tue, 6 Feb 2018 11:02:09 +0100 -Subject: [PATCH 203/229] Remove duplicated grub_exit() definition for grub-emu +Subject: [PATCH 202/229] Remove duplicated grub_exit() definition for grub-emu platform The grub_exit() function signature was changed on all platforms to take a diff --git a/0204-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch b/0203-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch similarity index 86% rename from 0204-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch rename to 0203-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch index 0e6dd9ef..0188c9bb 100644 --- a/0204-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch +++ b/0203-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch @@ -1,7 +1,7 @@ -From 37844213b374844bc1a4056712241cf6d9421880 Mon Sep 17 00:00:00 2001 +From f45946a92377c83ffcad8dbc3298fc26072567d9 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Tue, 6 Feb 2018 11:16:28 +0100 -Subject: [PATCH 204/229] Don't attempt to backtrace on grub_abort() for +Subject: [PATCH 203/229] Don't attempt to backtrace on grub_abort() for grub-emu The emu platform doesn't have a grub_backtrace() implementation, so this diff --git a/0205-Enable-blscfg-command-for-the-emu-platform.patch b/0204-Enable-blscfg-command-for-the-emu-platform.patch similarity index 97% rename from 0205-Enable-blscfg-command-for-the-emu-platform.patch rename to 0204-Enable-blscfg-command-for-the-emu-platform.patch index 8204baf7..4f266f0f 100644 --- a/0205-Enable-blscfg-command-for-the-emu-platform.patch +++ b/0204-Enable-blscfg-command-for-the-emu-platform.patch @@ -1,7 +1,7 @@ -From 01839f5d2491ba1b5694d1c4b2f3c2818a2408ae Mon Sep 17 00:00:00 2001 +From 39bb86c661911f06ff40caa842a9babf18f27c8b Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Fri, 2 Feb 2018 11:36:29 +0100 -Subject: [PATCH 205/229] Enable blscfg command for the emu platform +Subject: [PATCH 204/229] Enable blscfg command for the emu platform Allow grub-emu to call a blscfg command. This may be useful for platforms that don't support GRUB, so grub-emu can be used to parse the BLS configs diff --git a/0206-Add-linux-and-initrd-commands-for-grub-emu.patch b/0205-Add-linux-and-initrd-commands-for-grub-emu.patch similarity index 98% rename from 0206-Add-linux-and-initrd-commands-for-grub-emu.patch rename to 0205-Add-linux-and-initrd-commands-for-grub-emu.patch index f11498e0..835a66f5 100644 --- a/0206-Add-linux-and-initrd-commands-for-grub-emu.patch +++ b/0205-Add-linux-and-initrd-commands-for-grub-emu.patch @@ -1,7 +1,7 @@ -From f1a8f489ec2cafdcfbdd3b60ffc7752bed8c8528 Mon Sep 17 00:00:00 2001 +From 49c719a6f6e223b95733e18720a48993ab6e5317 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Tue, 6 Feb 2018 09:09:00 +0100 -Subject: [PATCH 206/229] Add linux and initrd commands for grub-emu +Subject: [PATCH 205/229] Add linux and initrd commands for grub-emu When using grub-emu, the linux and initrd commands are used as arguments to the kexec command line tool, to allow booting the selected menu entry. diff --git a/0207-Fix-the-efidir-in-grub-setpassword.patch b/0206-Fix-the-efidir-in-grub-setpassword.patch similarity index 86% rename from 0207-Fix-the-efidir-in-grub-setpassword.patch rename to 0206-Fix-the-efidir-in-grub-setpassword.patch index 203f5b6b..3d41475a 100644 --- a/0207-Fix-the-efidir-in-grub-setpassword.patch +++ b/0206-Fix-the-efidir-in-grub-setpassword.patch @@ -1,7 +1,7 @@ -From 3682958910d45a129f38cb1f28bc61288f92a698 Mon Sep 17 00:00:00 2001 +From c7c6cb4380f5bd85a2cbe747433657fdce89a802 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 15 Mar 2018 14:12:54 -0400 -Subject: [PATCH 207/229] Fix the efidir in grub-setpassword +Subject: [PATCH 206/229] Fix the efidir in grub-setpassword Signed-off-by: Peter Jones --- diff --git a/0208-Add-grub2-switch-to-blscfg.patch b/0207-Add-grub2-switch-to-blscfg.patch similarity index 98% rename from 0208-Add-grub2-switch-to-blscfg.patch rename to 0207-Add-grub2-switch-to-blscfg.patch index dadcdbf2..2c6d0a93 100644 --- a/0208-Add-grub2-switch-to-blscfg.patch +++ b/0207-Add-grub2-switch-to-blscfg.patch @@ -1,7 +1,7 @@ -From 95d9f5c317fb59dbb47c1df531fe5ab6f61e55af Mon Sep 17 00:00:00 2001 +From 89b3a570de8b5e7ad19769983a87f6e10024f0ec Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 15 Mar 2018 14:12:40 -0400 -Subject: [PATCH 208/229] Add grub2-switch-to-blscfg +Subject: [PATCH 207/229] Add grub2-switch-to-blscfg Signed-off-by: Peter Jones --- diff --git a/0209-Add-grub_debug_enabled.patch b/0208-Add-grub_debug_enabled.patch similarity index 93% rename from 0209-Add-grub_debug_enabled.patch rename to 0208-Add-grub_debug_enabled.patch index 040f3368..1cfc4546 100644 --- a/0209-Add-grub_debug_enabled.patch +++ b/0208-Add-grub_debug_enabled.patch @@ -1,7 +1,7 @@ -From 73a860b83bc81959baabceeec6e9a32102884a57 Mon Sep 17 00:00:00 2001 +From 6776773c89828c9b69c1552760ba6a4d9cd5589f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 30 Nov 2017 15:11:39 -0500 -Subject: [PATCH 209/229] Add grub_debug_enabled() +Subject: [PATCH 208/229] Add grub_debug_enabled() --- grub-core/kern/misc.c | 21 ++++++++++++++++----- diff --git a/0210-make-better-backtraces.patch b/0209-make-better-backtraces.patch similarity index 99% rename from 0210-make-better-backtraces.patch rename to 0209-make-better-backtraces.patch index b65ecc59..7ae91696 100644 --- a/0210-make-better-backtraces.patch +++ b/0209-make-better-backtraces.patch @@ -1,7 +1,7 @@ -From 775dacceb8acc4036737080040f592f48daeb6e8 Mon Sep 17 00:00:00 2001 +From 318ee04aadcda40b779b2a5314dd23ead165f896 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 6 Nov 2017 18:31:56 -0500 -Subject: [PATCH 210/229] make better backtraces +Subject: [PATCH 209/229] make better backtraces Signed-off-by: Peter Jones --- diff --git a/0211-normal-don-t-draw-our-startup-message-if-debug-is-se.patch b/0210-normal-don-t-draw-our-startup-message-if-debug-is-se.patch similarity index 85% rename from 0211-normal-don-t-draw-our-startup-message-if-debug-is-se.patch rename to 0210-normal-don-t-draw-our-startup-message-if-debug-is-se.patch index 67f4784c..f7280a09 100644 --- a/0211-normal-don-t-draw-our-startup-message-if-debug-is-se.patch +++ b/0210-normal-don-t-draw-our-startup-message-if-debug-is-se.patch @@ -1,7 +1,7 @@ -From cc1566933cbc2d8d56aa77ab1ca8a15392ee0d42 Mon Sep 17 00:00:00 2001 +From 81d0e079ea5aa6f43daf12f7a8698d0bcd1a36f8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 9 Nov 2017 15:58:52 -0500 -Subject: [PATCH 211/229] normal: don't draw our startup message if debug is +Subject: [PATCH 210/229] normal: don't draw our startup message if debug is set --- diff --git a/0212-Work-around-some-minor-include-path-weirdnesses.patch b/0211-Work-around-some-minor-include-path-weirdnesses.patch similarity index 97% rename from 0212-Work-around-some-minor-include-path-weirdnesses.patch rename to 0211-Work-around-some-minor-include-path-weirdnesses.patch index 36ed0035..79260889 100644 --- a/0212-Work-around-some-minor-include-path-weirdnesses.patch +++ b/0211-Work-around-some-minor-include-path-weirdnesses.patch @@ -1,7 +1,7 @@ -From 1829abfbbb0544a06973eaa76659a282aae8b32d Mon Sep 17 00:00:00 2001 +From e2bba0f7ee8e56c68e425853a21a8fdd766add70 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 16 Mar 2018 13:28:57 -0400 -Subject: [PATCH 212/229] Work around some minor include path weirdnesses +Subject: [PATCH 211/229] Work around some minor include path weirdnesses Signed-off-by: Peter Jones --- diff --git a/0213-Make-it-possible-to-enabled-build-id-sha1.patch b/0212-Make-it-possible-to-enabled-build-id-sha1.patch similarity index 93% rename from 0213-Make-it-possible-to-enabled-build-id-sha1.patch rename to 0212-Make-it-possible-to-enabled-build-id-sha1.patch index 756a5ea5..178aa4f6 100644 --- a/0213-Make-it-possible-to-enabled-build-id-sha1.patch +++ b/0212-Make-it-possible-to-enabled-build-id-sha1.patch @@ -1,7 +1,7 @@ -From 8e15f2dce2f8b2bdcad2d35da4d068e8af44eb1d Mon Sep 17 00:00:00 2001 +From 8521929bcf671b465d6450b969d11617b6aec608 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 25 Jun 2015 15:41:06 -0400 -Subject: [PATCH 213/229] Make it possible to enabled --build-id=sha1 +Subject: [PATCH 212/229] Make it possible to enabled --build-id=sha1 Signed-off-by: Peter Jones --- diff --git a/0214-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch b/0213-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch similarity index 93% rename from 0214-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch rename to 0213-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch index 9692527e..4c810828 100644 --- a/0214-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch +++ b/0213-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch @@ -1,7 +1,7 @@ -From 29216d4ad0f75587c42274ebd63b8526fa9e815c Mon Sep 17 00:00:00 2001 +From 8c4b2eaa204f0ea0377ca4592d2be6029fdb9be7 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Sun, 28 Jun 2015 13:09:58 -0400 -Subject: [PATCH 214/229] Add grub_qdprintf() - grub_dprintf() without the +Subject: [PATCH 213/229] Add grub_qdprintf() - grub_dprintf() without the file+line number. This just makes copy+paste of our debug loading info easier. diff --git a/0215-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/0214-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch similarity index 97% rename from 0215-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch rename to 0214-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch index cee34c3e..2848fe9d 100644 --- a/0215-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch +++ b/0214-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch @@ -1,7 +1,7 @@ -From bc8e33848ee9888fd8b3aa61b4d3ecf9094356aa Mon Sep 17 00:00:00 2001 +From 030095a01a205aba04a0849ac0c0329ac429a9ed Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 25 Jun 2015 15:11:36 -0400 -Subject: [PATCH 215/229] Make a "gdb" dprintf that tells us load addresses. +Subject: [PATCH 214/229] Make a "gdb" dprintf that tells us load addresses. This makes a grub_dprintf() call during platform init and during module loading that tells us the virtual addresses of the .text and .data diff --git a/0216-Only-attempt-to-scan-different-BLS-directories-on-EF.patch b/0215-Only-attempt-to-scan-different-BLS-directories-on-EF.patch similarity index 92% rename from 0216-Only-attempt-to-scan-different-BLS-directories-on-EF.patch rename to 0215-Only-attempt-to-scan-different-BLS-directories-on-EF.patch index 0d9766f9..4e41a078 100644 --- a/0216-Only-attempt-to-scan-different-BLS-directories-on-EF.patch +++ b/0215-Only-attempt-to-scan-different-BLS-directories-on-EF.patch @@ -1,7 +1,7 @@ -From 62b3c9bf77feda2ae595c5e811b3918d3bf990a4 Mon Sep 17 00:00:00 2001 +From 5f0417c63a4dd2252a5a801568f4369ac74a47e6 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Tue, 3 Apr 2018 15:42:47 +0200 -Subject: [PATCH 216/229] Only attempt to scan different BLS directories on EFI +Subject: [PATCH 215/229] Only attempt to scan different BLS directories on EFI machines Current BLS support attempted to scan for BLS directories, but this only diff --git a/0217-Core-TPM-support.patch b/0216-Core-TPM-support.patch similarity index 99% rename from 0217-Core-TPM-support.patch rename to 0216-Core-TPM-support.patch index 9dbdbcfb..dd662ac1 100644 --- a/0217-Core-TPM-support.patch +++ b/0216-Core-TPM-support.patch @@ -1,7 +1,7 @@ -From 7f4bde559545d19352072829fb9267b916c60fa3 Mon Sep 17 00:00:00 2001 +From 65be94a64a5608209561ba0914d29445d81bf4b2 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 14 Jul 2015 17:06:35 -0700 -Subject: [PATCH 217/229] Core TPM support +Subject: [PATCH 216/229] Core TPM support Add support for performing basic TPM measurements. Right now this only supports extending PCRs statically and only on UEFI and BIOS systems, but diff --git a/0218-Measure-kernel-initrd.patch b/0217-Measure-kernel-initrd.patch similarity index 91% rename from 0218-Measure-kernel-initrd.patch rename to 0217-Measure-kernel-initrd.patch index 911f0dc5..c620b0d7 100644 --- a/0218-Measure-kernel-initrd.patch +++ b/0217-Measure-kernel-initrd.patch @@ -1,7 +1,7 @@ -From 556a7abe5d08b3b7b2d8446759587b17337fe9c9 Mon Sep 17 00:00:00 2001 +From ffd305d09def6610ef96f928c0df8303c5529d63 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Thu, 16 Jul 2015 15:22:34 -0700 -Subject: [PATCH 218/229] Measure kernel + initrd +Subject: [PATCH 217/229] Measure kernel + initrd Measure the kernel and initrd when loaded on UEFI systems --- diff --git a/0219-Add-BIOS-boot-measurement.patch b/0218-Add-BIOS-boot-measurement.patch similarity index 97% rename from 0219-Add-BIOS-boot-measurement.patch rename to 0218-Add-BIOS-boot-measurement.patch index ec174580..0d91cdf1 100644 --- a/0219-Add-BIOS-boot-measurement.patch +++ b/0218-Add-BIOS-boot-measurement.patch @@ -1,7 +1,7 @@ -From 8390e231d322fd94f7a8223f140c4bc5de2ba56f Mon Sep 17 00:00:00 2001 +From d8870587d46f8aa8d4f8db2cdcddecc829993447 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 15:48:51 -0700 -Subject: [PATCH 219/229] Add BIOS boot measurement +Subject: [PATCH 218/229] Add BIOS boot measurement Measure the on-disk grub core on BIOS systems - unlike UEFI, the firmware can't do this stage for us. diff --git a/0220-Measure-kernel-and-initrd-on-BIOS-systems.patch b/0219-Measure-kernel-and-initrd-on-BIOS-systems.patch similarity index 94% rename from 0220-Measure-kernel-and-initrd-on-BIOS-systems.patch rename to 0219-Measure-kernel-and-initrd-on-BIOS-systems.patch index 015c3cb8..248f5baf 100644 --- a/0220-Measure-kernel-and-initrd-on-BIOS-systems.patch +++ b/0219-Measure-kernel-and-initrd-on-BIOS-systems.patch @@ -1,7 +1,7 @@ -From 2c3d5dcff2281c9f0894ce01b1c75be47dd13050 Mon Sep 17 00:00:00 2001 +From 5aee2444093cfc8006865766f89e5a775a940ab1 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:28:29 -0700 -Subject: [PATCH 220/229] Measure kernel and initrd on BIOS systems +Subject: [PATCH 219/229] Measure kernel and initrd on BIOS systems Measure the kernel and initrd when loaded on BIOS systems --- diff --git a/0221-Measure-the-kernel-commandline.patch b/0220-Measure-the-kernel-commandline.patch similarity index 89% rename from 0221-Measure-the-kernel-commandline.patch rename to 0220-Measure-the-kernel-commandline.patch index 3d575382..e4de3112 100644 --- a/0221-Measure-the-kernel-commandline.patch +++ b/0220-Measure-the-kernel-commandline.patch @@ -1,7 +1,7 @@ -From eeca74b2e520dd3c0ca74deb8c6351e9ec14096c Mon Sep 17 00:00:00 2001 +From c1694574d6eb287e6e181dd018fe54b718a613b3 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:32:29 -0700 -Subject: [PATCH 221/229] Measure the kernel commandline +Subject: [PATCH 220/229] Measure the kernel commandline Measure the kernel commandline to ensure that it hasn't been modified --- diff --git a/0222-Measure-commands.patch b/0221-Measure-commands.patch similarity index 95% rename from 0222-Measure-commands.patch rename to 0221-Measure-commands.patch index ec24fb4d..bf58f0af 100644 --- a/0222-Measure-commands.patch +++ b/0221-Measure-commands.patch @@ -1,7 +1,7 @@ -From c45fb4188646f0ea2a8e37dd5e1fa069ca6f7b8a Mon Sep 17 00:00:00 2001 +From c93a27f2e6a323a4985e6fe902eb5c6447fca572 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Mon, 10 Aug 2015 15:27:12 -0700 -Subject: [PATCH 222/229] Measure commands +Subject: [PATCH 221/229] Measure commands Measure each command executed by grub, which includes script execution. --- diff --git a/0223-Measure-multiboot-images-and-modules.patch b/0222-Measure-multiboot-images-and-modules.patch similarity index 94% rename from 0223-Measure-multiboot-images-and-modules.patch rename to 0222-Measure-multiboot-images-and-modules.patch index e28d233d..ca0b6e99 100644 --- a/0223-Measure-multiboot-images-and-modules.patch +++ b/0222-Measure-multiboot-images-and-modules.patch @@ -1,7 +1,7 @@ -From 98dd154527b9cddaff15ab22b35c41815d9f1b13 Mon Sep 17 00:00:00 2001 +From b164ec560cd6373c0c5d8a189d70baeca2c3ef13 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 1 Sep 2015 16:02:55 -0700 -Subject: [PATCH 223/229] Measure multiboot images and modules +Subject: [PATCH 222/229] Measure multiboot images and modules --- grub-core/loader/i386/multiboot_mbi.c | 3 +++ diff --git a/0224-Fix-boot-when-there-s-no-TPM.patch b/0223-Fix-boot-when-there-s-no-TPM.patch similarity index 86% rename from 0224-Fix-boot-when-there-s-no-TPM.patch rename to 0223-Fix-boot-when-there-s-no-TPM.patch index fc5452e2..cf4c776f 100644 --- a/0224-Fix-boot-when-there-s-no-TPM.patch +++ b/0223-Fix-boot-when-there-s-no-TPM.patch @@ -1,7 +1,7 @@ -From d621b990b2d3ba20a275de963841c4c2c9246a90 Mon Sep 17 00:00:00 2001 +From 33fb6113d65a819496d0b67b8db071fedad845a7 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 23 Mar 2016 16:49:42 -0700 -Subject: [PATCH 224/229] Fix boot when there's no TPM +Subject: [PATCH 223/229] Fix boot when there's no TPM If the firmware has TPM support but has no TPM, we're jumping to core.img without popping the registers back onto the stack. Fix that. diff --git a/0225-Rework-TPM-measurements.patch b/0224-Rework-TPM-measurements.patch similarity index 98% rename from 0225-Rework-TPM-measurements.patch rename to 0224-Rework-TPM-measurements.patch index 61daa16f..00e6e9f0 100644 --- a/0225-Rework-TPM-measurements.patch +++ b/0224-Rework-TPM-measurements.patch @@ -1,7 +1,7 @@ -From b3e11d156a1244087ff79f4cdf93cdf35d0fa926 Mon Sep 17 00:00:00 2001 +From 415072bbda8b4de133c6dc6add230e41ee6d9579 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 23 Mar 2016 17:03:43 -0700 -Subject: [PATCH 225/229] Rework TPM measurements +Subject: [PATCH 224/229] Rework TPM measurements Rework TPM measurements to use fewer PCRs. After discussion with upstream, it's preferable to avoid using so many PCRs. Instead, measure into PCRs 8 diff --git a/0226-Fix-event-log-prefix.patch b/0225-Fix-event-log-prefix.patch similarity index 88% rename from 0226-Fix-event-log-prefix.patch rename to 0225-Fix-event-log-prefix.patch index dbc0c67d..c026d72d 100644 --- a/0226-Fix-event-log-prefix.patch +++ b/0225-Fix-event-log-prefix.patch @@ -1,7 +1,7 @@ -From 8bea1ad0aa389bf8ffbe7b442603161cba3bd3c7 Mon Sep 17 00:00:00 2001 +From 0816621235226952a5bd0cfd027eb97ff84df547 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 29 Mar 2016 15:36:49 -0700 -Subject: [PATCH 226/229] Fix event log prefix +Subject: [PATCH 225/229] Fix event log prefix We're not passing the prefixed version of the description to the event log. Fix that. diff --git a/0227-Set-the-first-boot-menu-entry-as-default-when-using-.patch b/0226-Set-the-first-boot-menu-entry-as-default-when-using-.patch similarity index 86% rename from 0227-Set-the-first-boot-menu-entry-as-default-when-using-.patch rename to 0226-Set-the-first-boot-menu-entry-as-default-when-using-.patch index 9bffbac9..99e7c2e6 100644 --- a/0227-Set-the-first-boot-menu-entry-as-default-when-using-.patch +++ b/0226-Set-the-first-boot-menu-entry-as-default-when-using-.patch @@ -1,7 +1,7 @@ -From e540034970a1dbeaeafc5d9f08c2e83d9197b0db Mon Sep 17 00:00:00 2001 +From 8278e40fdc4a4db0865fc632cbe2dcf7c124ba7a Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Fri, 6 Apr 2018 14:08:36 +0200 -Subject: [PATCH 227/229] Set the first boot menu entry as default when using +Subject: [PATCH 226/229] Set the first boot menu entry as default when using BLS fragments When BootLoaderSpec configuration files are used, the default boot menu diff --git a/0228-tpm-fix-warnings-when-compiling-for-platforms-other-.patch b/0227-tpm-fix-warnings-when-compiling-for-platforms-other-.patch similarity index 91% rename from 0228-tpm-fix-warnings-when-compiling-for-platforms-other-.patch rename to 0227-tpm-fix-warnings-when-compiling-for-platforms-other-.patch index 1a0889a1..9f88b58c 100644 --- a/0228-tpm-fix-warnings-when-compiling-for-platforms-other-.patch +++ b/0227-tpm-fix-warnings-when-compiling-for-platforms-other-.patch @@ -1,7 +1,7 @@ -From abcbb11d3647140ea158bb01945f033d69a7a53a Mon Sep 17 00:00:00 2001 +From 4c53f61b1a889c0f55e76a763b05b6686ec613b8 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sun, 21 Aug 2016 18:24:58 -0700 -Subject: [PATCH 228/229] tpm: fix warnings when compiling for platforms other +Subject: [PATCH 227/229] tpm: fix warnings when compiling for platforms other than pc and efi --- diff --git a/0229-Make-TPM-errors-less-fatal.patch b/0228-Make-TPM-errors-less-fatal.patch similarity index 98% rename from 0229-Make-TPM-errors-less-fatal.patch rename to 0228-Make-TPM-errors-less-fatal.patch index 3ea4adf2..2269fd60 100644 --- a/0229-Make-TPM-errors-less-fatal.patch +++ b/0228-Make-TPM-errors-less-fatal.patch @@ -1,7 +1,7 @@ -From 64be807ea7b4b3744b77ad3d5c28f98c6625339d Mon Sep 17 00:00:00 2001 +From 406f7dda0cc2689170f102341a546c87072d1ce5 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Thu, 13 Oct 2016 13:55:26 -0700 -Subject: [PATCH 229/229] Make TPM errors less fatal +Subject: [PATCH 228/229] Make TPM errors less fatal Handle TPM errors, and stop trying to use the TPM once we hit one. --- diff --git a/0229-blscfg-handle-multiple-initramfs-images.patch b/0229-blscfg-handle-multiple-initramfs-images.patch new file mode 100644 index 00000000..a266c002 --- /dev/null +++ b/0229-blscfg-handle-multiple-initramfs-images.patch @@ -0,0 +1,107 @@ +From a230ec5c31d818c2f046acf3592a5492d3e2ea69 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 11 Apr 2018 13:44:29 -0400 +Subject: [PATCH 229/229] blscfg: handle multiple initramfs images. + +Signed-off-by: Peter Jones +--- + grub-core/commands/blscfg.c | 54 ++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 44 insertions(+), 10 deletions(-) + +diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c +index c0973ff83ea..1e5972422d6 100644 +--- a/grub-core/commands/blscfg.c ++++ b/grub-core/commands/blscfg.c +@@ -587,6 +587,7 @@ static void create_entry (struct bls_entry *entry, const char *cfgfile) + char *title = NULL; + char *clinux = NULL; + char *options = NULL; ++ char **initrds = NULL; + char *initrd = NULL; + char *id = NULL; + char *hotkey = NULL; +@@ -609,7 +610,7 @@ static void create_entry (struct bls_entry *entry, const char *cfgfile) + + title = bls_get_val (entry, "title", NULL); + options = bls_get_val (entry, "options", NULL); +- initrd = bls_get_val (entry, "initrd", NULL); ++ initrds = bls_make_list (entry, "initrd", NULL); + id = bls_get_val (entry, "id", NULL); + + hotkey = bls_get_val (entry, "grub_hotkey", NULL); +@@ -624,30 +625,63 @@ static void create_entry (struct bls_entry *entry, const char *cfgfile) + argv[i] = args[i-1]; + argv[argc] = NULL; + +- grub_dprintf("blscfg", "adding menu entry for \"%s\"\n", title); ++ grub_dprintf ("blscfg", "adding menu entry for \"%s\"\n", title); ++ if (initrds) ++ { ++ int initrd_size = sizeof (GRUB_INITRD_CMD); ++ char *tmp; ++ ++ for (i = 0; initrds != NULL && initrds[i] != NULL; i++) ++ initrd_size += sizeof (" " GRUB_BOOT_DEVICE) \ ++ + grub_strlen (initrds[i]) + 1; ++ initrd_size += 1; ++ ++ initrd = grub_malloc (initrd_size); ++ if (!initrd) ++ { ++ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory")); ++ goto finish; ++ } ++ ++ ++ tmp = grub_stpcpy(initrd, GRUB_INITRD_CMD); ++ for (i = 0; initrds != NULL && initrds[i] != NULL; i++) ++ { ++ grub_dprintf ("blscfg", "adding initrd %s\n", initrds[i]); ++ tmp = grub_stpcpy (tmp, " " GRUB_BOOT_DEVICE); ++ tmp = grub_stpcpy (tmp, initrds[i]); ++ } ++ tmp = grub_stpcpy (tmp, "\n"); ++ } ++ + src = grub_xasprintf ("load_video\n" + "set gfx_payload=keep\n" + "insmod gzio\n" + GRUB_LINUX_CMD " %s%s%s%s\n" +- "%s%s%s%s", ++ "%s", + GRUB_BOOT_DEVICE, clinux, options ? " " : "", options ? options : "", +- initrd ? GRUB_INITRD_CMD " " : "", initrd ? GRUB_BOOT_DEVICE : "", initrd ? initrd : "", initrd ? "\n" : ""); ++ initrd ? initrd : ""); + + grub_normal_add_menu_entry (argc, argv, classes, id, users, hotkey, NULL, src, 0); + + finish: ++ if (initrd) ++ grub_free (initrd); ++ ++ if (initrds) ++ grub_free (initrds); ++ + if (classes) +- grub_free (classes); +- grub_dprintf("blscfg", "%s got here\n", __func__); ++ grub_free (classes); ++ + if (args) +- grub_free (args); ++ grub_free (args); + + if (argv) +- grub_free (argv); ++ grub_free (argv); + + if (src) +- grub_free (src); +- grub_dprintf("blscfg", "%s got here\n", __func__); ++ grub_free (src); + } + + struct find_entry_info { +-- +2.15.0 + diff --git a/grub.patches b/grub.patches index a13bb2ee..80ae0121 100644 --- a/grub.patches +++ b/grub.patches @@ -61,169 +61,169 @@ Patch0060: 0060-arm64-linux-loader-improve-type-portability.patch Patch0061: 0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch Patch0062: 0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch Patch0063: 0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch -Patch0064: 0064-info-in-builddir.patch -Patch0065: 0065-re-write-.gitignore.patch -Patch0066: 0066-IBM-client-architecture-CAS-reboot-support.patch -Patch0067: 0067-for-ppc-reset-console-display-attr-when-clear-screen.patch -Patch0068: 0068-Disable-GRUB-video-support-for-IBM-power-machines.patch -Patch0069: 0069-Honor-a-symlink-when-generating-configuration-by-gru.patch -Patch0070: 0070-Move-bash-completion-script-922997.patch -Patch0071: 0071-Update-to-minilzo-2.08.patch -Patch0072: 0072-Allow-fallback-to-include-entries-by-title-not-just-.patch -Patch0073: 0073-Add-GRUB_DISABLE_UUID.patch -Patch0074: 0074-Make-exit-take-a-return-code.patch -Patch0075: 0075-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch -Patch0076: 0076-Make-efi-machines-load-an-env-block-from-a-variable.patch -Patch0077: 0077-DHCP-client-ID-and-UUID-options-added.patch -Patch0078: 0078-trim-arp-packets-with-abnormal-size.patch -Patch0079: 0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch -Patch0080: 0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch -Patch0081: 0081-Migrate-PPC-from-Yaboot-to-Grub2.patch -Patch0082: 0082-Add-fw_path-variable-revised.patch -Patch0083: 0083-Add-support-for-linuxefi.patch -Patch0084: 0084-Use-linuxefi-and-initrdefi-where-appropriate.patch -Patch0085: 0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch -Patch0086: 0086-Pass-x-hex-hex-straight-through-unmolested.patch -Patch0087: 0087-Add-X-option-to-printf-functions.patch -Patch0088: 0088-Search-for-specific-config-file-for-netboot.patch -Patch0089: 0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch -Patch0090: 0090-Don-t-write-messages-to-the-screen.patch -Patch0091: 0091-Don-t-print-GNU-GRUB-header.patch -Patch0092: 0092-Don-t-add-to-highlighted-row.patch -Patch0093: 0093-Message-string-cleanups.patch -Patch0094: 0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch -Patch0095: 0095-Use-the-correct-indentation-for-the-term-help-text.patch -Patch0096: 0096-Indent-menu-entries.patch -Patch0097: 0097-Fix-margins.patch -Patch0098: 0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch -Patch0099: 0099-Use-linux16-when-appropriate-880840.patch -Patch0100: 0100-Enable-pager-by-default.-985860.patch -Patch0101: 0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch -Patch0102: 0102-Don-t-say-GNU-Linux-in-generated-menus.patch -Patch0103: 0103-Don-t-draw-a-border-around-the-menu.patch -Patch0104: 0104-Use-the-standard-margin-for-the-timeout-string.patch -Patch0105: 0105-Add-.eh_frame-to-list-of-relocations-stripped.patch -Patch0106: 0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch -Patch0107: 0107-Don-t-print-during-fdt-loading-method.patch -Patch0108: 0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch -Patch0109: 0109-Don-t-require-a-password-to-boot-entries-generated-b.patch -Patch0110: 0110-Don-t-emit-Booting-.-message.patch -Patch0111: 0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch -Patch0112: 0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch -Patch0113: 0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch -Patch0114: 0114-Fix-convert-function-to-support-NVMe-devices.patch -Patch0115: 0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch -Patch0116: 0116-Use-the-default-device-tree-from-the-grub-default-fi.patch -Patch0117: 0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch -Patch0118: 0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch -Patch0119: 0119-Add-grub_util_readlink.patch -Patch0120: 0120-Make-editenv-chase-symlinks-including-those-across-d.patch -Patch0121: 0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch -Patch0122: 0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch -Patch0123: 0123-Load-arm-with-SB-enabled.patch -Patch0124: 0124-Try-prefix-if-fw_path-doesn-t-work.patch -Patch0125: 0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch -Patch0126: 0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch -Patch0127: 0127-Handle-rssd-storage-devices.patch -Patch0128: 0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch -Patch0129: 0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch -Patch0130: 0130-Add-friendly-grub2-password-config-tool-985962.patch -Patch0131: 0131-Make-grub2-mkconfig-construct-titles-that-look-like-.patch -Patch0132: 0132-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch -Patch0133: 0133-tcp-add-window-scaling-support.patch -Patch0134: 0134-efinet-retransmit-if-our-device-is-busy.patch -Patch0135: 0135-Be-more-aggro-about-actually-using-the-configured-ne.patch -Patch0136: 0136-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch -Patch0137: 0137-Fix-security-issue-when-reading-username-and-passwor.patch -Patch0138: 0138-Warn-if-grub-password-will-not-be-read-1290803.patch -Patch0139: 0139-Clean-up-grub-setpassword-documentation-1290799.patch -Patch0140: 0140-Fix-locale-issue-in-grub-setpassword-1294243.patch -Patch0141: 0141-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch -Patch0142: 0142-efiemu-Fix-compilation-failure.patch -Patch0143: 0143-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch -Patch0144: 0144-Add-a-url-parser.patch -Patch0145: 0145-efinet-and-bootp-add-support-for-dhcpv6.patch -Patch0146: 0146-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch -Patch0147: 0147-Normalize-slashes-in-tftp-paths.patch -Patch0148: 0148-Fix-malformed-tftp-packets.patch -Patch0149: 0149-Fix-race-in-EFI-validation.patch -Patch0150: 0150-bz1374141-fix-incorrect-mask-for-ppc64.patch -Patch0151: 0151-Use-device-part-of-chainloader-target-if-present.patch -Patch0152: 0152-Add-secureboot-support-on-efi-chainloader.patch -Patch0153: 0153-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch -Patch0154: 0154-Make-grub_fatal-also-backtrace.patch -Patch0155: 0155-Rework-linux-command.patch -Patch0156: 0156-Rework-linux16-command.patch -Patch0157: 0157-Make-grub-editenv-build-again.patch -Patch0158: 0158-Fix-up-some-man-pages-rpmdiff-noticed.patch -Patch0159: 0159-Re-work-some-intricacies-of-PE-loading.patch -Patch0160: 0160-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch -Patch0161: 0161-linuxefi-fix-double-free-on-verification-failure.patch -Patch0162: 0162-fix-machine-type-test-in-30_os-prober.in.patch -Patch0163: 0163-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch -Patch0164: 0164-efi-chainloader-truncate-overlong-relocation-section.patch -Patch0165: 0165-linuxefi-minor-cleanups.patch -Patch0166: 0166-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch -Patch0167: 0167-Fix-up-linux-params-usage.patch -Patch0168: 0168-Make-exit-take-a-return-code.patch -Patch0169: 0169-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch -Patch0170: 0170-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch -Patch0171: 0171-Make-our-info-pages-say-grub2-where-appropriate.patch -Patch0172: 0172-print-more-debug-info-in-our-module-loader.patch -Patch0173: 0173-macos-just-build-chainloader-entries-don-t-try-any-x.patch -Patch0174: 0174-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch -Patch0175: 0175-export-btrfs_subvol-and-btrfs_subvolid.patch -Patch0176: 0176-grub2-btrfs-03-follow_default.patch -Patch0177: 0177-grub2-btrfs-04-grub2-install.patch -Patch0178: 0178-grub2-btrfs-05-grub2-mkconfig.patch -Patch0179: 0179-grub2-btrfs-06-subvol-mount.patch -Patch0180: 0180-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch -Patch0181: 0181-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch -Patch0182: 0182-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch -Patch0183: 0183-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch -Patch0184: 0184-Use-grub_efi_.-memory-helpers-where-reasonable.patch -Patch0185: 0185-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch -Patch0186: 0186-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch -Patch0187: 0187-don-t-ignore-const.patch -Patch0188: 0188-don-t-use-int-for-efi-status.patch -Patch0189: 0189-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch -Patch0190: 0190-Clean-up-some-errors-in-the-linuxefi-loader.patch -Patch0191: 0191-editenv-handle-relative-symlinks.patch -Patch0192: 0192-Make-libgrub.pp-depend-on-config-util.h.patch -Patch0193: 0193-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch -Patch0194: 0194-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch -Patch0195: 0195-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch -Patch0196: 0196-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch -Patch0197: 0197-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch -Patch0198: 0198-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch -Patch0199: 0199-align-struct-efi_variable-better.patch -Patch0200: 0200-Add-quicksort-implementation.patch -Patch0201: 0201-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch -Patch0202: 0202-Add-BLS-support-to-grub-mkconfig.patch -Patch0203: 0203-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch -Patch0204: 0204-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch -Patch0205: 0205-Enable-blscfg-command-for-the-emu-platform.patch -Patch0206: 0206-Add-linux-and-initrd-commands-for-grub-emu.patch -Patch0207: 0207-Fix-the-efidir-in-grub-setpassword.patch -Patch0208: 0208-Add-grub2-switch-to-blscfg.patch -Patch0209: 0209-Add-grub_debug_enabled.patch -Patch0210: 0210-make-better-backtraces.patch -Patch0211: 0211-normal-don-t-draw-our-startup-message-if-debug-is-se.patch -Patch0212: 0212-Work-around-some-minor-include-path-weirdnesses.patch -Patch0213: 0213-Make-it-possible-to-enabled-build-id-sha1.patch -Patch0214: 0214-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch -Patch0215: 0215-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch -Patch0216: 0216-Only-attempt-to-scan-different-BLS-directories-on-EF.patch -Patch0217: 0217-Core-TPM-support.patch -Patch0218: 0218-Measure-kernel-initrd.patch -Patch0219: 0219-Add-BIOS-boot-measurement.patch -Patch0220: 0220-Measure-kernel-and-initrd-on-BIOS-systems.patch -Patch0221: 0221-Measure-the-kernel-commandline.patch -Patch0222: 0222-Measure-commands.patch -Patch0223: 0223-Measure-multiboot-images-and-modules.patch -Patch0224: 0224-Fix-boot-when-there-s-no-TPM.patch -Patch0225: 0225-Rework-TPM-measurements.patch -Patch0226: 0226-Fix-event-log-prefix.patch -Patch0227: 0227-Set-the-first-boot-menu-entry-as-default-when-using-.patch -Patch0228: 0228-tpm-fix-warnings-when-compiling-for-platforms-other-.patch -Patch0229: 0229-Make-TPM-errors-less-fatal.patch +Patch0064: 0064-re-write-.gitignore.patch +Patch0065: 0065-IBM-client-architecture-CAS-reboot-support.patch +Patch0066: 0066-for-ppc-reset-console-display-attr-when-clear-screen.patch +Patch0067: 0067-Disable-GRUB-video-support-for-IBM-power-machines.patch +Patch0068: 0068-Honor-a-symlink-when-generating-configuration-by-gru.patch +Patch0069: 0069-Move-bash-completion-script-922997.patch +Patch0070: 0070-Update-to-minilzo-2.08.patch +Patch0071: 0071-Allow-fallback-to-include-entries-by-title-not-just-.patch +Patch0072: 0072-Add-GRUB_DISABLE_UUID.patch +Patch0073: 0073-Make-exit-take-a-return-code.patch +Patch0074: 0074-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch +Patch0075: 0075-Make-efi-machines-load-an-env-block-from-a-variable.patch +Patch0076: 0076-DHCP-client-ID-and-UUID-options-added.patch +Patch0077: 0077-trim-arp-packets-with-abnormal-size.patch +Patch0078: 0078-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch +Patch0079: 0079-Add-support-for-UEFI-operating-systems-returned-by-o.patch +Patch0080: 0080-Migrate-PPC-from-Yaboot-to-Grub2.patch +Patch0081: 0081-Add-fw_path-variable-revised.patch +Patch0082: 0082-Add-support-for-linuxefi.patch +Patch0083: 0083-Use-linuxefi-and-initrdefi-where-appropriate.patch +Patch0084: 0084-Don-t-allow-insmod-when-secure-boot-is-enabled.patch +Patch0085: 0085-Pass-x-hex-hex-straight-through-unmolested.patch +Patch0086: 0086-Add-X-option-to-printf-functions.patch +Patch0087: 0087-Search-for-specific-config-file-for-netboot.patch +Patch0088: 0088-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch +Patch0089: 0089-Don-t-write-messages-to-the-screen.patch +Patch0090: 0090-Don-t-print-GNU-GRUB-header.patch +Patch0091: 0091-Don-t-add-to-highlighted-row.patch +Patch0092: 0092-Message-string-cleanups.patch +Patch0093: 0093-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch +Patch0094: 0094-Use-the-correct-indentation-for-the-term-help-text.patch +Patch0095: 0095-Indent-menu-entries.patch +Patch0096: 0096-Fix-margins.patch +Patch0097: 0097-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch +Patch0098: 0098-Use-linux16-when-appropriate-880840.patch +Patch0099: 0099-Enable-pager-by-default.-985860.patch +Patch0100: 0100-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch +Patch0101: 0101-Don-t-say-GNU-Linux-in-generated-menus.patch +Patch0102: 0102-Don-t-draw-a-border-around-the-menu.patch +Patch0103: 0103-Use-the-standard-margin-for-the-timeout-string.patch +Patch0104: 0104-Add-.eh_frame-to-list-of-relocations-stripped.patch +Patch0105: 0105-Make-10_linux-work-with-our-changes-for-linux16-and-.patch +Patch0106: 0106-Don-t-print-during-fdt-loading-method.patch +Patch0107: 0107-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch +Patch0108: 0108-Don-t-require-a-password-to-boot-entries-generated-b.patch +Patch0109: 0109-Don-t-emit-Booting-.-message.patch +Patch0110: 0110-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch +Patch0111: 0111-use-fw_path-prefix-when-fallback-searching-for-grub-.patch +Patch0112: 0112-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch +Patch0113: 0113-Fix-convert-function-to-support-NVMe-devices.patch +Patch0114: 0114-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch +Patch0115: 0115-Use-the-default-device-tree-from-the-grub-default-fi.patch +Patch0116: 0116-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +Patch0117: 0117-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +Patch0118: 0118-Add-grub_util_readlink.patch +Patch0119: 0119-Make-editenv-chase-symlinks-including-those-across-d.patch +Patch0120: 0120-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch +Patch0121: 0121-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch +Patch0122: 0122-Load-arm-with-SB-enabled.patch +Patch0123: 0123-Try-prefix-if-fw_path-doesn-t-work.patch +Patch0124: 0124-Update-info-with-grub.cfg-netboot-selection-order-11.patch +Patch0125: 0125-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch +Patch0126: 0126-Handle-rssd-storage-devices.patch +Patch0127: 0127-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch +Patch0128: 0128-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +Patch0129: 0129-Add-friendly-grub2-password-config-tool-985962.patch +Patch0130: 0130-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +Patch0131: 0131-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch +Patch0132: 0132-tcp-add-window-scaling-support.patch +Patch0133: 0133-efinet-retransmit-if-our-device-is-busy.patch +Patch0134: 0134-Be-more-aggro-about-actually-using-the-configured-ne.patch +Patch0135: 0135-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch +Patch0136: 0136-Fix-security-issue-when-reading-username-and-passwor.patch +Patch0137: 0137-Warn-if-grub-password-will-not-be-read-1290803.patch +Patch0138: 0138-Clean-up-grub-setpassword-documentation-1290799.patch +Patch0139: 0139-Fix-locale-issue-in-grub-setpassword-1294243.patch +Patch0140: 0140-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch +Patch0141: 0141-efiemu-Fix-compilation-failure.patch +Patch0142: 0142-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +Patch0143: 0143-Add-a-url-parser.patch +Patch0144: 0144-efinet-and-bootp-add-support-for-dhcpv6.patch +Patch0145: 0145-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +Patch0146: 0146-Normalize-slashes-in-tftp-paths.patch +Patch0147: 0147-Fix-malformed-tftp-packets.patch +Patch0148: 0148-Fix-race-in-EFI-validation.patch +Patch0149: 0149-bz1374141-fix-incorrect-mask-for-ppc64.patch +Patch0150: 0150-Use-device-part-of-chainloader-target-if-present.patch +Patch0151: 0151-Add-secureboot-support-on-efi-chainloader.patch +Patch0152: 0152-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +Patch0153: 0153-Make-grub_fatal-also-backtrace.patch +Patch0154: 0154-Rework-linux-command.patch +Patch0155: 0155-Rework-linux16-command.patch +Patch0156: 0156-Make-grub-editenv-build-again.patch +Patch0157: 0157-Fix-up-some-man-pages-rpmdiff-noticed.patch +Patch0158: 0158-Re-work-some-intricacies-of-PE-loading.patch +Patch0159: 0159-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch +Patch0160: 0160-linuxefi-fix-double-free-on-verification-failure.patch +Patch0161: 0161-fix-machine-type-test-in-30_os-prober.in.patch +Patch0162: 0162-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch +Patch0163: 0163-efi-chainloader-truncate-overlong-relocation-section.patch +Patch0164: 0164-linuxefi-minor-cleanups.patch +Patch0165: 0165-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch +Patch0166: 0166-Fix-up-linux-params-usage.patch +Patch0167: 0167-Make-exit-take-a-return-code.patch +Patch0168: 0168-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch +Patch0169: 0169-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch +Patch0170: 0170-Make-our-info-pages-say-grub2-where-appropriate.patch +Patch0171: 0171-print-more-debug-info-in-our-module-loader.patch +Patch0172: 0172-macos-just-build-chainloader-entries-don-t-try-any-x.patch +Patch0173: 0173-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch +Patch0174: 0174-export-btrfs_subvol-and-btrfs_subvolid.patch +Patch0175: 0175-grub2-btrfs-03-follow_default.patch +Patch0176: 0176-grub2-btrfs-04-grub2-install.patch +Patch0177: 0177-grub2-btrfs-05-grub2-mkconfig.patch +Patch0178: 0178-grub2-btrfs-06-subvol-mount.patch +Patch0179: 0179-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch +Patch0180: 0180-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch +Patch0181: 0181-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch +Patch0182: 0182-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch +Patch0183: 0183-Use-grub_efi_.-memory-helpers-where-reasonable.patch +Patch0184: 0184-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch +Patch0185: 0185-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch +Patch0186: 0186-don-t-ignore-const.patch +Patch0187: 0187-don-t-use-int-for-efi-status.patch +Patch0188: 0188-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +Patch0189: 0189-Clean-up-some-errors-in-the-linuxefi-loader.patch +Patch0190: 0190-editenv-handle-relative-symlinks.patch +Patch0191: 0191-Make-libgrub.pp-depend-on-config-util.h.patch +Patch0192: 0192-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch +Patch0193: 0193-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch +Patch0194: 0194-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch +Patch0195: 0195-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch +Patch0196: 0196-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch +Patch0197: 0197-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch +Patch0198: 0198-align-struct-efi_variable-better.patch +Patch0199: 0199-Add-quicksort-implementation.patch +Patch0200: 0200-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch +Patch0201: 0201-Add-BLS-support-to-grub-mkconfig.patch +Patch0202: 0202-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch +Patch0203: 0203-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch +Patch0204: 0204-Enable-blscfg-command-for-the-emu-platform.patch +Patch0205: 0205-Add-linux-and-initrd-commands-for-grub-emu.patch +Patch0206: 0206-Fix-the-efidir-in-grub-setpassword.patch +Patch0207: 0207-Add-grub2-switch-to-blscfg.patch +Patch0208: 0208-Add-grub_debug_enabled.patch +Patch0209: 0209-make-better-backtraces.patch +Patch0210: 0210-normal-don-t-draw-our-startup-message-if-debug-is-se.patch +Patch0211: 0211-Work-around-some-minor-include-path-weirdnesses.patch +Patch0212: 0212-Make-it-possible-to-enabled-build-id-sha1.patch +Patch0213: 0213-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch +Patch0214: 0214-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch +Patch0215: 0215-Only-attempt-to-scan-different-BLS-directories-on-EF.patch +Patch0216: 0216-Core-TPM-support.patch +Patch0217: 0217-Measure-kernel-initrd.patch +Patch0218: 0218-Add-BIOS-boot-measurement.patch +Patch0219: 0219-Measure-kernel-and-initrd-on-BIOS-systems.patch +Patch0220: 0220-Measure-the-kernel-commandline.patch +Patch0221: 0221-Measure-commands.patch +Patch0222: 0222-Measure-multiboot-images-and-modules.patch +Patch0223: 0223-Fix-boot-when-there-s-no-TPM.patch +Patch0224: 0224-Rework-TPM-measurements.patch +Patch0225: 0225-Fix-event-log-prefix.patch +Patch0226: 0226-Set-the-first-boot-menu-entry-as-default-when-using-.patch +Patch0227: 0227-tpm-fix-warnings-when-compiling-for-platforms-other-.patch +Patch0228: 0228-Make-TPM-errors-less-fatal.patch +Patch0229: 0229-blscfg-handle-multiple-initramfs-images.patch diff --git a/grub2.spec b/grub2.spec index afb42db6..e786d7b6 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -203,6 +203,7 @@ cat << EOF > ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/grub2.conf EOF # Install kernel-install scripts +install -d -m 0755 %{buildroot}%{_prefix}/lib/kernel/install.d/ install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE9} install -d -m 0755 %{buildroot}%{_sysconfdir}/kernel/install.d/ install -m 0644 /dev/null %{buildroot}%{_sysconfdir}/kernel/install.d/20-grubby.install @@ -452,6 +453,9 @@ fi %endif %changelog +* Wed Apr 11 2018 Peter Jones - 2.02-33 +- Work around some issues with older automake found in CentOS. + * Wed Apr 11 2018 Javier Martinez Canillas - 2.02-32 - Make 20-grub.install to generate debug BLS when MAKEDEBUG is set.