From b8119d910467855d676d1acdb57a35ffe2215f03 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 16 Aug 2017 11:34:58 -0400 Subject: [PATCH 01/20] Fix a mismerge that makes arm not boot. Signed-off-by: Peter Jones --- 0123-Load-arm-with-SB-enabled.patch | 8 ++++---- 0124-Try-prefix-if-fw_path-doesn-t-work.patch | 2 +- ...te-info-with-grub.cfg-netboot-selection-order-11.patch | 2 +- ...Distribution-Package-Sort-for-grub2-mkconfig-112.patch | 2 +- 0127-Handle-rssd-storage-devices.patch | 2 +- ...to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch | 2 +- ...-grub2-mkconfig-construct-titles-that-look-like-.patch | 2 +- 0130-Add-friendly-grub2-password-config-tool-985962.patch | 2 +- ...brate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch | 2 +- ...-grub2-mkconfig-construct-titles-that-look-like-.patch | 2 +- ...to-make-sure-configure.ac-and-grub-rpm-sort-play.patch | 2 +- 0134-tcp-add-window-scaling-support.patch | 2 +- 0135-efinet-retransmit-if-our-device-is-busy.patch | 2 +- ...ore-aggro-about-actually-using-the-configured-ne.patch | 2 +- ...et-add-filter-for-the-first-exclusive-reopen-of-.patch | 2 +- ...security-issue-when-reading-username-and-passwor.patch | 2 +- 0139-Warn-if-grub-password-will-not-be-read-1290803.patch | 2 +- ...-Clean-up-grub-setpassword-documentation-1290799.patch | 2 +- 0141-Fix-locale-issue-in-grub-setpassword-1294243.patch | 2 +- ...mu-Handle-persistent-RAM-and-unknown-possible-fu.patch | 2 +- 0143-efiemu-Fix-compilation-failure.patch | 2 +- ...rt-reopen-SNP-protocol-for-exclusive-use-by-grub.patch | 2 +- 0145-Add-a-url-parser.patch | 2 +- 0146-efinet-and-bootp-add-support-for-dhcpv6.patch | 2 +- ...-grub-get-kernel-settings-and-use-it-in-10_linux.patch | 2 +- 0148-Normalize-slashes-in-tftp-paths.patch | 2 +- 0149-Fix-malformed-tftp-packets.patch | 2 +- 0150-Fix-race-in-EFI-validation.patch | 2 +- 0151-bz1374141-fix-incorrect-mask-for-ppc64.patch | 2 +- ...Use-device-part-of-chainloader-target-if-present.patch | 2 +- 0153-Add-secureboot-support-on-efi-chainloader.patch | 2 +- ...-any-of-the-loaders-that-link-in-efi-mode-honor-.patch | 2 +- 0155-Make-grub_fatal-also-backtrace.patch | 2 +- 0156-Rework-linux-command.patch | 2 +- 0157-Rework-linux16-command.patch | 2 +- 0158-Make-grub-editenv-build-again.patch | 2 +- 0159-Fix-up-some-man-pages-rpmdiff-noticed.patch | 2 +- 0160-Re-work-some-intricacies-of-PE-loading.patch | 2 +- ...rk-even-more-of-efi-chainload-so-non-sb-cases-wo.patch | 4 ++-- ...linuxefi-fix-double-free-on-verification-failure.patch | 2 +- 0163-fix-machine-type-test-in-30_os-prober.in.patch | 2 +- ...chainloader-fix-wrong-sanity-check-in-relocate_c.patch | 2 +- ...chainloader-truncate-overlong-relocation-section.patch | 2 +- 0166-linuxefi-minor-cleanups.patch | 2 +- ...ndle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch | 2 +- 0168-Fix-up-linux-params-usage.patch | 2 +- 0169-Make-exit-take-a-return-code.patch | 2 +- ...4-make-sure-fdt-has-address-cells-and-size-cells.patch | 4 ++-- ...some-grub_dprintf-in-the-secure-boot-verify-code.patch | 2 +- ...-Make-our-info-pages-say-grub2-where-appropriate.patch | 2 +- 0173-print-more-debug-info-in-our-module-loader.patch | 2 +- ...s-just-build-chainloader-entries-don-t-try-any-x.patch | 2 +- ...-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch | 2 +- 0176-export-btrfs_subvol-and-btrfs_subvolid.patch | 2 +- 0177-grub2-btrfs-03-follow_default.patch | 2 +- 0178-grub2-btrfs-04-grub2-install.patch | 2 +- 0179-grub2-btrfs-05-grub2-mkconfig.patch | 2 +- 0180-grub2-btrfs-06-subvol-mount.patch | 2 +- 0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch | 2 +- ...back-to-old-subvol-name-scheme-to-support-old-sn.patch | 2 +- ...-not-working-correctly-with-btrfs-snapshots-bsc-.patch | 2 +- ...grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch | 2 +- 0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch | 2 +- 0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch | 2 +- ...t-use-dynamic-sized-arrays-since-we-don-t-build-.patch | 2 +- 0188-don-t-ignore-const.patch | 2 +- 0189-don-t-use-int-for-efi-status.patch | 2 +- ...ke-GRUB_MOD_INIT-declare-its-function-prototypes.patch | 2 +- 0191-Clean-up-some-errors-in-the-linuxefi-loader.patch | 2 +- 0192-editenv-handle-relative-symlinks.patch | 2 +- 70 files changed, 75 insertions(+), 75 deletions(-) diff --git a/0123-Load-arm-with-SB-enabled.patch b/0123-Load-arm-with-SB-enabled.patch index d2faef6..82d6e49 100644 --- a/0123-Load-arm-with-SB-enabled.patch +++ b/0123-Load-arm-with-SB-enabled.patch @@ -1,4 +1,4 @@ -From 6e8a67f6e4d0699d47c6fe86343d122252491f09 Mon Sep 17 00:00:00 2001 +From 89cc931e0faf05a4cf79cf8554037d035b829d0a Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 18 Sep 2014 11:26:14 -0400 Subject: [PATCH 123/192] Load arm with SB enabled. @@ -42,7 +42,7 @@ index 7f3d5a2bf..5ae70204c 100644 enable = x86_64_efi; }; diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 746edd104..450d1a1de 100644 +index 746edd104..03ff83563 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -28,6 +28,7 @@ @@ -86,8 +86,8 @@ index 746edd104..450d1a1de 100644 + loaded_image->load_options_size = len = + (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t); + loaded_image->load_options = -+ grub_efi_allocate_pages (0, -+ GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size)); ++ grub_efi_allocate_pages_max (0, ++ GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size)); + if (!loaded_image->load_options) + return grub_error(GRUB_ERR_BAD_OS, "failed to create kernel parameters"); + diff --git a/0124-Try-prefix-if-fw_path-doesn-t-work.patch b/0124-Try-prefix-if-fw_path-doesn-t-work.patch index 9f9ad3c..cedc449 100644 --- a/0124-Try-prefix-if-fw_path-doesn-t-work.patch +++ b/0124-Try-prefix-if-fw_path-doesn-t-work.patch @@ -1,4 +1,4 @@ -From 55734dd999108c3658a3b866fffc3102737c10a5 Mon Sep 17 00:00:00 2001 +From 9f6d403d5d3e782759276c158736e431e5c9de3f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 3 Oct 2014 11:08:03 -0400 Subject: [PATCH 124/192] Try $prefix if $fw_path doesn't work. diff --git a/0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch b/0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch index a2eff38..9a27b28 100644 --- a/0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch +++ b/0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch @@ -1,4 +1,4 @@ -From b3d96d38f0f7ac225efe863eb34aaec71f5c6236 Mon Sep 17 00:00:00 2001 +From fdd459b6c8a262066c1dcbebd919b03e566bd597 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 16:34:51 -0400 Subject: [PATCH 125/192] Update info with grub.cfg netboot selection order diff --git a/0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch b/0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch index 20bd0ad..be38a80 100644 --- a/0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch +++ b/0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch @@ -1,4 +1,4 @@ -From 61e77dd153b356351235c0e548ab52f81fe473b9 Mon Sep 17 00:00:00 2001 +From 8da9508faa25ba5add92267cce1286c0d44541e7 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 14:14:19 -0400 Subject: [PATCH 126/192] Use Distribution Package Sort for grub2-mkconfig diff --git a/0127-Handle-rssd-storage-devices.patch b/0127-Handle-rssd-storage-devices.patch index ec57954..3fec5e5 100644 --- a/0127-Handle-rssd-storage-devices.patch +++ b/0127-Handle-rssd-storage-devices.patch @@ -1,4 +1,4 @@ -From 6865b4f0ee030c7575ecf7d1bf31bdef3981d43b Mon Sep 17 00:00:00 2001 +From cdbc94f3f51b2575535a51c952238b2cd5b34639 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 30 Jun 2015 15:50:41 -0400 Subject: [PATCH 127/192] Handle rssd storage devices. diff --git a/0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch b/0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch index e5347b4..099bcb3 100644 --- a/0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch +++ b/0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch @@ -1,4 +1,4 @@ -From 426b12a33d84f11e896c19cc2e1fdc5a695ebdc3 Mon Sep 17 00:00:00 2001 +From ce0866787ab88f37c346595c639921ef8922975e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 27 Oct 2014 09:22:55 -0400 Subject: [PATCH 128/192] Try to emit linux16/initrd16 and linuxefi/initrdefi diff --git a/0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index c5abc9e..2a70c57 100644 --- a/0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -1,4 +1,4 @@ -From 2672466f667ac62616ccaf274d40a3d10ab9b61b Mon Sep 17 00:00:00 2001 +From abd7a4299e641a3c3ee2d91dfe7721796355ee2d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 28 Apr 2015 11:15:03 -0400 Subject: [PATCH 129/192] Make grub2-mkconfig construct titles that look like diff --git a/0130-Add-friendly-grub2-password-config-tool-985962.patch b/0130-Add-friendly-grub2-password-config-tool-985962.patch index 9246c8a..03dfccb 100644 --- a/0130-Add-friendly-grub2-password-config-tool-985962.patch +++ b/0130-Add-friendly-grub2-password-config-tool-985962.patch @@ -1,4 +1,4 @@ -From 6fc3455ae10a9e6c18e37c781cda811b3a73285e Mon Sep 17 00:00:00 2001 +From 03c35775014c6937302aad6c97e87734c7f6a82f Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Thu, 25 Jun 2015 11:13:11 -0400 Subject: [PATCH 130/192] Add friendly grub2 password config tool (#985962) diff --git a/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch b/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch index ad35534..b45df49 100644 --- a/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch +++ b/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch @@ -1,4 +1,4 @@ -From 8d52adac75a53452e6b1e6ed527b90b7cbaac7a6 Mon Sep 17 00:00:00 2001 +From 2e6a1b095ea2acab1b16a80f199e34d9a287a6da Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Fri, 10 Oct 2014 11:11:09 +0200 Subject: [PATCH 131/192] calibrate_tsc(): use the Stall() EFI boot service on diff --git a/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index 2ee5099..7162778 100644 --- a/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -1,4 +1,4 @@ -From 3c013a85d664c54b2079b3a99ed9b3c35ed35558 Mon Sep 17 00:00:00 2001 +From e0ceb7a5c51264891d65944e3da487c076a362d9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 28 Apr 2015 11:15:03 -0400 Subject: [PATCH 132/192] Make grub2-mkconfig construct titles that look like diff --git a/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch b/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch index a74b320..94568b9 100644 --- a/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch +++ b/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch @@ -1,4 +1,4 @@ -From 941c74e3216ffe8f8fe24e7ba36a50455ed6b497 Mon Sep 17 00:00:00 2001 +From 696f516bc0868f089f1298ebbe7889f9fdc2930c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 3 Aug 2015 11:46:42 -0400 Subject: [PATCH 133/192] Try to make sure configure.ac and grub-rpm-sort play diff --git a/0134-tcp-add-window-scaling-support.patch b/0134-tcp-add-window-scaling-support.patch index ac2e1bb..4851f86 100644 --- a/0134-tcp-add-window-scaling-support.patch +++ b/0134-tcp-add-window-scaling-support.patch @@ -1,4 +1,4 @@ -From 4a2c29f5380f275e6bc45da4aab984b508c33b86 Mon Sep 17 00:00:00 2001 +From 1fa17daed3d36b3697a2af98ecbf05aeb0cdffa8 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Wed, 12 Aug 2015 08:57:55 -0700 Subject: [PATCH 134/192] tcp: add window scaling support diff --git a/0135-efinet-retransmit-if-our-device-is-busy.patch b/0135-efinet-retransmit-if-our-device-is-busy.patch index 5c920cc..47a6b36 100644 --- a/0135-efinet-retransmit-if-our-device-is-busy.patch +++ b/0135-efinet-retransmit-if-our-device-is-busy.patch @@ -1,4 +1,4 @@ -From c0eee5273948412c2b9ef225b42e0ced909aeb43 Mon Sep 17 00:00:00 2001 +From cc3b425098bae73eb87947785aeea6a4fb3c8d05 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Mon, 31 Aug 2015 13:34:35 -0400 Subject: [PATCH 135/192] efinet: retransmit if our device is busy diff --git a/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch b/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch index ffb9cfe..b261b90 100644 --- a/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch +++ b/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch @@ -1,4 +1,4 @@ -From 44d119990a08f605076bac1066d0292ab8e74dda Mon Sep 17 00:00:00 2001 +From d09b120606921bde20630c4a9dd1c500104cef13 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 11 Sep 2015 17:30:49 -0400 Subject: [PATCH 136/192] Be more aggro about actually using the *configured* diff --git a/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch b/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch index 11afaa7..be2d480 100644 --- a/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch +++ b/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch @@ -1,4 +1,4 @@ -From eb23b29a1a70fc61ac2cc68acb756499e7a60cb2 Mon Sep 17 00:00:00 2001 +From b3a46d78db26c265e3343c26e3322b03e825b6c1 Mon Sep 17 00:00:00 2001 From: RHEL Ninjas Date: Fri, 25 Sep 2015 16:24:23 +0900 Subject: [PATCH 137/192] efinet: add filter for the first exclusive reopen of diff --git a/0138-Fix-security-issue-when-reading-username-and-passwor.patch b/0138-Fix-security-issue-when-reading-username-and-passwor.patch index 695ba3a..19d44bf 100644 --- a/0138-Fix-security-issue-when-reading-username-and-passwor.patch +++ b/0138-Fix-security-issue-when-reading-username-and-passwor.patch @@ -1,4 +1,4 @@ -From ba44a4863d38296e61ee7be3e71841fafe655b71 Mon Sep 17 00:00:00 2001 +From 31eb7da21d59107afb5e1e0d4f732d1dc269a2c0 Mon Sep 17 00:00:00 2001 From: Hector Marco-Gisbert Date: Fri, 13 Nov 2015 16:21:09 +0100 Subject: [PATCH 138/192] Fix security issue when reading username and password diff --git a/0139-Warn-if-grub-password-will-not-be-read-1290803.patch b/0139-Warn-if-grub-password-will-not-be-read-1290803.patch index 213b951..7be7fc1 100644 --- a/0139-Warn-if-grub-password-will-not-be-read-1290803.patch +++ b/0139-Warn-if-grub-password-will-not-be-read-1290803.patch @@ -1,4 +1,4 @@ -From ae7883c825d891acf86441d36736d04bbf50521c Mon Sep 17 00:00:00 2001 +From 97ec7dbda41e62685428fc695ba593986bbf9ef0 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 22 Feb 2016 15:30:05 -0500 Subject: [PATCH 139/192] Warn if grub password will not be read (#1290803) diff --git a/0140-Clean-up-grub-setpassword-documentation-1290799.patch b/0140-Clean-up-grub-setpassword-documentation-1290799.patch index 09c660e..3d36c6e 100644 --- a/0140-Clean-up-grub-setpassword-documentation-1290799.patch +++ b/0140-Clean-up-grub-setpassword-documentation-1290799.patch @@ -1,4 +1,4 @@ -From 97810f430350c3844e233f66dd5ed8823448a546 Mon Sep 17 00:00:00 2001 +From 92a6412b9e3cf872792a2748310cd2a5861953da Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Tue, 26 Jan 2016 10:28:35 -0500 Subject: [PATCH 140/192] Clean up grub-setpassword documentation (#1290799) diff --git a/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch b/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch index 13017d9..7c3674f 100644 --- a/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch +++ b/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch @@ -1,4 +1,4 @@ -From f577bb7128c8985b656ad8c70f44a4ee866da21e Mon Sep 17 00:00:00 2001 +From 4a85dce84b2ed10b30abcc40ab40d5882afae028 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Fri, 29 Jan 2016 16:56:11 -0500 Subject: [PATCH 141/192] Fix locale issue in grub-setpassword (#1294243) diff --git a/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch b/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch index 692f77f..42dc65d 100644 --- a/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch +++ b/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch @@ -1,4 +1,4 @@ -From f9fd25d475d0cae011fa18d709a1fe071d8124e1 Mon Sep 17 00:00:00 2001 +From 8935c9fd26c5d4e2517393d4665b4602dfac0d63 Mon Sep 17 00:00:00 2001 From: Robert Elliott Date: Fri, 22 Jan 2016 13:32:30 +0100 Subject: [PATCH 142/192] efiemu: Handle persistent RAM and unknown possible diff --git a/0143-efiemu-Fix-compilation-failure.patch b/0143-efiemu-Fix-compilation-failure.patch index a228d14..c03dc82 100644 --- a/0143-efiemu-Fix-compilation-failure.patch +++ b/0143-efiemu-Fix-compilation-failure.patch @@ -1,4 +1,4 @@ -From d1dcefa3407afe1d4bc7e6de773386509290e8e2 Mon Sep 17 00:00:00 2001 +From a017f7824b24be5e818c4fd110c2a06df4d45a0f Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 22 Jan 2016 14:10:30 +0100 Subject: [PATCH 143/192] efiemu: Fix compilation failure diff --git a/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index 0b61f14..3d8e5a1 100644 --- a/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,4 +1,4 @@ -From b415a4bfdd6f48944a92d0b3c0a0eb6dd8042dde Mon Sep 17 00:00:00 2001 +From 29a2a50d54efc3dbc79031e9188aa5694f2fcfc1 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 7 Apr 2016 10:58:06 -0400 Subject: [PATCH 144/192] Revert "reopen SNP protocol for exclusive use by diff --git a/0145-Add-a-url-parser.patch b/0145-Add-a-url-parser.patch index d2da510..92d18e4 100644 --- a/0145-Add-a-url-parser.patch +++ b/0145-Add-a-url-parser.patch @@ -1,4 +1,4 @@ -From c6222c1a74d13ffe7b70aad9f2bc12dc2dc79c9a Mon Sep 17 00:00:00 2001 +From 8616d37a59d2cce2e68ec4c497a7c42d525481d8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jun 2016 16:18:44 -0400 Subject: [PATCH 145/192] Add a url parser. diff --git a/0146-efinet-and-bootp-add-support-for-dhcpv6.patch b/0146-efinet-and-bootp-add-support-for-dhcpv6.patch index 9312268..9eb4732 100644 --- a/0146-efinet-and-bootp-add-support-for-dhcpv6.patch +++ b/0146-efinet-and-bootp-add-support-for-dhcpv6.patch @@ -1,4 +1,4 @@ -From 4a9dea49f6ef9b81b8b78af3f893a5030219bd25 Mon Sep 17 00:00:00 2001 +From 973a2cbc0d4cb3ac66b32525ba047f59dab060b2 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 8 Jun 2016 21:03:37 -0400 Subject: [PATCH 146/192] efinet and bootp: add support for dhcpv6 diff --git a/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch index 4c6c81f..5134b68 100644 --- a/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +++ b/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch @@ -1,4 +1,4 @@ -From 96527f198250d25e29c23d6905481c96233bb032 Mon Sep 17 00:00:00 2001 +From 291e69a7b9b2f56c8928e2a33827980992c94d1e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 23 Jun 2016 11:01:39 -0400 Subject: [PATCH 147/192] Add grub-get-kernel-settings and use it in 10_linux diff --git a/0148-Normalize-slashes-in-tftp-paths.patch b/0148-Normalize-slashes-in-tftp-paths.patch index e96eb28..324502e 100644 --- a/0148-Normalize-slashes-in-tftp-paths.patch +++ b/0148-Normalize-slashes-in-tftp-paths.patch @@ -1,4 +1,4 @@ -From dad8660131c924b29b3020dafb59b36be3093efa Mon Sep 17 00:00:00 2001 +From bac663561b4d6b666d3a89d80f21a81667353989 Mon Sep 17 00:00:00 2001 From: Lenny Szubowicz Date: Mon, 29 Aug 2016 11:04:48 -0400 Subject: [PATCH 148/192] Normalize slashes in tftp paths. diff --git a/0149-Fix-malformed-tftp-packets.patch b/0149-Fix-malformed-tftp-packets.patch index 5011f28..f29c5a5 100644 --- a/0149-Fix-malformed-tftp-packets.patch +++ b/0149-Fix-malformed-tftp-packets.patch @@ -1,4 +1,4 @@ -From 02884031aa1677f6c6af8a6a58c33f701a8984d3 Mon Sep 17 00:00:00 2001 +From bb1eaf9f908130c805db845dfc5fffcaec0d98e4 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Tue, 7 Mar 2017 18:26:17 -0500 Subject: [PATCH 149/192] Fix malformed tftp packets diff --git a/0150-Fix-race-in-EFI-validation.patch b/0150-Fix-race-in-EFI-validation.patch index 9040138..6264661 100644 --- a/0150-Fix-race-in-EFI-validation.patch +++ b/0150-Fix-race-in-EFI-validation.patch @@ -1,4 +1,4 @@ -From 4c081b1042610b4726a2463dd364c9ee21769d20 Mon Sep 17 00:00:00 2001 +From 387037519dbb9f019fa377026f8abf27e34d0327 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 14 Jul 2015 16:58:51 -0700 Subject: [PATCH 150/192] Fix race in EFI validation diff --git a/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch index 853f5e3..459f9aa 100644 --- a/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch +++ b/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch @@ -1,4 +1,4 @@ -From 4acdb98d4b6e1204a70f1a4dd435fd8176dad8cf Mon Sep 17 00:00:00 2001 +From e84de0761303285ef42940c70fc7a7d53a4a2504 Mon Sep 17 00:00:00 2001 From: Masahiro Matsuya Date: Sat, 29 Oct 2016 08:35:26 +0900 Subject: [PATCH 151/192] bz1374141 fix incorrect mask for ppc64 diff --git a/0152-Use-device-part-of-chainloader-target-if-present.patch b/0152-Use-device-part-of-chainloader-target-if-present.patch index c9d83d4..a887907 100644 --- a/0152-Use-device-part-of-chainloader-target-if-present.patch +++ b/0152-Use-device-part-of-chainloader-target-if-present.patch @@ -1,4 +1,4 @@ -From 01e86878090c2b7d9c0e63024da5d86130da8d4d Mon Sep 17 00:00:00 2001 +From 90a2478253009a33584ee4ba3785e5945e64482d Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Fri, 10 Apr 2015 01:45:02 -0400 Subject: [PATCH 152/192] Use device part of chainloader target, if present. diff --git a/0153-Add-secureboot-support-on-efi-chainloader.patch b/0153-Add-secureboot-support-on-efi-chainloader.patch index 0c2f991..f44fad5 100644 --- a/0153-Add-secureboot-support-on-efi-chainloader.patch +++ b/0153-Add-secureboot-support-on-efi-chainloader.patch @@ -1,4 +1,4 @@ -From 4d7c46d507e90d67c1c3c8e773940f41d3c647e9 Mon Sep 17 00:00:00 2001 +From f4cf150259fab118806ac1dcc4e73cb2e50b3ffc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 13:04:37 -0400 Subject: [PATCH 153/192] Add secureboot support on efi chainloader diff --git a/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch index 9bde617..9426df4 100644 --- a/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +++ b/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch @@ -1,4 +1,4 @@ -From 23965f6becb9ab6e8e83495d70dbdf650811b630 Mon Sep 17 00:00:00 2001 +From 4c768f9b3ee1f26b1d7cedc6f5aa79e9a77a0f1b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 16:09:25 -0400 Subject: [PATCH 154/192] Make any of the loaders that link in efi mode honor diff --git a/0155-Make-grub_fatal-also-backtrace.patch b/0155-Make-grub_fatal-also-backtrace.patch index a6e57b1..39a83c7 100644 --- a/0155-Make-grub_fatal-also-backtrace.patch +++ b/0155-Make-grub_fatal-also-backtrace.patch @@ -1,4 +1,4 @@ -From 2bc3a40466e0175bd24343420c4ae3f3eb497abf Mon Sep 17 00:00:00 2001 +From 6cc2859f44543f71ff448c44e65a65d867687ae8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 27 Jan 2016 09:22:42 -0500 Subject: [PATCH 155/192] Make grub_fatal() also backtrace. diff --git a/0156-Rework-linux-command.patch b/0156-Rework-linux-command.patch index 36ac1e8..de222c9 100644 --- a/0156-Rework-linux-command.patch +++ b/0156-Rework-linux-command.patch @@ -1,4 +1,4 @@ -From c75fd7cc69873a8347a536aa760c019990b3c7a1 Mon Sep 17 00:00:00 2001 +From 8c04cd7ab27fadf834df9f2f4d767b100547c190 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:12:39 -0700 Subject: [PATCH 156/192] Rework linux command diff --git a/0157-Rework-linux16-command.patch b/0157-Rework-linux16-command.patch index e506967..95346ff 100644 --- a/0157-Rework-linux16-command.patch +++ b/0157-Rework-linux16-command.patch @@ -1,4 +1,4 @@ -From de0c8783e1177f81fe2ac90edbfdc282ae986803 Mon Sep 17 00:00:00 2001 +From 17f5bd6c5f9c7d9e7ec922852038dcdfe9f52e86 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:20:58 -0700 Subject: [PATCH 157/192] Rework linux16 command diff --git a/0158-Make-grub-editenv-build-again.patch b/0158-Make-grub-editenv-build-again.patch index f8eab56..cf72c4f 100644 --- a/0158-Make-grub-editenv-build-again.patch +++ b/0158-Make-grub-editenv-build-again.patch @@ -1,4 +1,4 @@ -From 4d8aa8cf3ae80f86fa99dbc69f4d44697b5f7ea3 Mon Sep 17 00:00:00 2001 +From 0102b5ffd55e96280fbbf67c823d52c4f913c3a5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Mar 2016 16:29:13 -0500 Subject: [PATCH 158/192] Make grub-editenv build again. diff --git a/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch index 62f49bf..be4193a 100644 --- a/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch +++ b/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch @@ -1,4 +1,4 @@ -From c50df5e0ea3ab065d373c91b408eb7bb48d824a6 Mon Sep 17 00:00:00 2001 +From 6c3247e1bcad21587e3ec5ace9a5cd3b717471cf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 23 Sep 2014 09:58:49 -0400 Subject: [PATCH 159/192] Fix up some man pages rpmdiff noticed. diff --git a/0160-Re-work-some-intricacies-of-PE-loading.patch b/0160-Re-work-some-intricacies-of-PE-loading.patch index e3efa64..a20f1d8 100644 --- a/0160-Re-work-some-intricacies-of-PE-loading.patch +++ b/0160-Re-work-some-intricacies-of-PE-loading.patch @@ -1,4 +1,4 @@ -From d0bac1cacf14200def2c4d00268b8f655fec7f16 Mon Sep 17 00:00:00 2001 +From 98f57101ba066e247c87b7b39b53df2e597805ee Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 9 Jun 2016 12:22:29 -0400 Subject: [PATCH 160/192] Re-work some intricacies of PE loading. diff --git a/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch b/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch index 168c65d..9de28b9 100644 --- a/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch +++ b/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch @@ -1,4 +1,4 @@ -From 341c267c6e2613b3fc5341578ee9ec3524fb7098 Mon Sep 17 00:00:00 2001 +From b25aeee879c5b5dc8bf642c11090feb9b3ed875f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 10 Jun 2016 14:06:15 -0400 Subject: [PATCH 161/192] Rework even more of efi chainload so non-sb cases @@ -80,7 +80,7 @@ index a41b6c5b8..d74778b0c 100644 if (*secure_boot && !*setup_mode) ret = 1; diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 450d1a1de..854971ae6 100644 +index 03ff83563..34f34e65a 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -248,6 +248,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), diff --git a/0162-linuxefi-fix-double-free-on-verification-failure.patch b/0162-linuxefi-fix-double-free-on-verification-failure.patch index 27c33f1..5a96a66 100644 --- a/0162-linuxefi-fix-double-free-on-verification-failure.patch +++ b/0162-linuxefi-fix-double-free-on-verification-failure.patch @@ -1,4 +1,4 @@ -From 18e355bbefe3dd75526da4b6b99046ea609d4c1b Mon Sep 17 00:00:00 2001 +From 174e79117b2996a9388c1cba6ac3bfbf053396c3 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jun 2016 09:50:25 -0400 Subject: [PATCH 162/192] linuxefi: fix double free on verification failure. diff --git a/0163-fix-machine-type-test-in-30_os-prober.in.patch b/0163-fix-machine-type-test-in-30_os-prober.in.patch index 16dab96..c16459c 100644 --- a/0163-fix-machine-type-test-in-30_os-prober.in.patch +++ b/0163-fix-machine-type-test-in-30_os-prober.in.patch @@ -1,4 +1,4 @@ -From e091c46338bf077d93e3b99d6e326e78afcf902f Mon Sep 17 00:00:00 2001 +From 5368a034f371af6614de303b057fdc092892611a Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 11 Jul 2016 13:36:45 -0400 Subject: [PATCH 163/192] fix machine type test in 30_os-prober.in diff --git a/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch b/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch index e316523..b0b5c83 100644 --- a/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch +++ b/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch @@ -1,4 +1,4 @@ -From 51618e3f04dbb8b9ea8d7c151bb09d527dcbd1c5 Mon Sep 17 00:00:00 2001 +From 7004abbe4fd446b9ad6b03b657397704009382af Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Mon, 21 Nov 2016 15:34:00 +0100 Subject: [PATCH 164/192] efi/chainloader: fix wrong sanity check in diff --git a/0165-efi-chainloader-truncate-overlong-relocation-section.patch b/0165-efi-chainloader-truncate-overlong-relocation-section.patch index c9b1fef..8a5ac5f 100644 --- a/0165-efi-chainloader-truncate-overlong-relocation-section.patch +++ b/0165-efi-chainloader-truncate-overlong-relocation-section.patch @@ -1,4 +1,4 @@ -From 48ee84721c03de835647bba063436d73238c5cf9 Mon Sep 17 00:00:00 2001 +From 0e2289b515d283b72ab86959a76d8a9ea2b608fc Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 23 Nov 2016 06:27:09 +0100 Subject: [PATCH 165/192] efi/chainloader: truncate overlong relocation section diff --git a/0166-linuxefi-minor-cleanups.patch b/0166-linuxefi-minor-cleanups.patch index 64bb0f3..c8a5ba6 100644 --- a/0166-linuxefi-minor-cleanups.patch +++ b/0166-linuxefi-minor-cleanups.patch @@ -1,4 +1,4 @@ -From 5eea84e1d48dcda4721ddc079f7edae55db544cb Mon Sep 17 00:00:00 2001 +From 7daabb17821b515b26c948275ee5aa8b2208c649 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Feb 2017 16:31:52 -0500 Subject: [PATCH 166/192] linuxefi: minor cleanups diff --git a/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch index 099c55e..bdfc7c9 100644 --- a/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch +++ b/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch @@ -1,4 +1,4 @@ -From de23e4dbf4ff4472b76f1ff2094bf62a1a99acbb Mon Sep 17 00:00:00 2001 +From 5a5ab4ce7f57bf2e18ba0f1cfb8ab478adf32676 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Feb 2017 16:18:54 -0500 Subject: [PATCH 167/192] Handle multi-arch (64-on-32) boot in linuxefi loader. diff --git a/0168-Fix-up-linux-params-usage.patch b/0168-Fix-up-linux-params-usage.patch index 930671e..a15c66b 100644 --- a/0168-Fix-up-linux-params-usage.patch +++ b/0168-Fix-up-linux-params-usage.patch @@ -1,4 +1,4 @@ -From 6ae54e020cecce28305756cc6b7e7e3729c48f17 Mon Sep 17 00:00:00 2001 +From 6b2eba692ce88288202c826e70d30164b7d7f606 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 30 May 2017 14:16:07 -0400 Subject: [PATCH 168/192] Fix up linux params usage... diff --git a/0169-Make-exit-take-a-return-code.patch b/0169-Make-exit-take-a-return-code.patch index 7a74277..aecf973 100644 --- a/0169-Make-exit-take-a-return-code.patch +++ b/0169-Make-exit-take-a-return-code.patch @@ -1,4 +1,4 @@ -From 056fa8b0acc08d135f5b93c79ed917fb039c2401 Mon Sep 17 00:00:00 2001 +From f06b7aa6c687bec98c237da8e63c4420fc46a7e5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 26 Feb 2014 21:49:12 -0500 Subject: [PATCH 169/192] Make "exit" take a return code. diff --git a/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch b/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch index ffd19bc..f1c16ee 100644 --- a/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch +++ b/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch @@ -1,4 +1,4 @@ -From 9365f56c0ff31b62a4334f583c04da8ddd5a3274 Mon Sep 17 00:00:00 2001 +From 8ed119f11ac2981a123f192ba9229c31d4ecb287 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 17 Apr 2017 08:44:29 -0400 Subject: [PATCH 170/192] arm64: make sure fdt has #address-cells and @@ -14,7 +14,7 @@ make sure they exist. 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 854971ae6..83f5a6de2 100644 +index 34f34e65a..530c4ba2d 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -79,7 +79,21 @@ finalize_params_linux (void) diff --git a/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch b/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch index 724266f..6d1b930 100644 --- a/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch +++ b/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch @@ -1,4 +1,4 @@ -From bb19df579a0b6eae01f440c295756258b027abfd Mon Sep 17 00:00:00 2001 +From d23b61bdbd200bfb6428dd1b36053614913c596b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 9 May 2016 14:15:17 -0400 Subject: [PATCH 171/192] Add some grub_dprintf() in the secure boot verify diff --git a/0172-Make-our-info-pages-say-grub2-where-appropriate.patch b/0172-Make-our-info-pages-say-grub2-where-appropriate.patch index d5a76ea..1db5065 100644 --- a/0172-Make-our-info-pages-say-grub2-where-appropriate.patch +++ b/0172-Make-our-info-pages-say-grub2-where-appropriate.patch @@ -1,4 +1,4 @@ -From 0d5dd185e24f202e6d647c4db3ea59a67b799909 Mon Sep 17 00:00:00 2001 +From c4a0a288ce09453a94c2e655094158338e20db6d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 6 May 2016 18:43:08 -0400 Subject: [PATCH 172/192] Make our info pages say "grub2" where appropriate. diff --git a/0173-print-more-debug-info-in-our-module-loader.patch b/0173-print-more-debug-info-in-our-module-loader.patch index 439d9eb..2b21f00 100644 --- a/0173-print-more-debug-info-in-our-module-loader.patch +++ b/0173-print-more-debug-info-in-our-module-loader.patch @@ -1,4 +1,4 @@ -From 15e52b061ea65d3baee2279b8e4e9fe85a252b4e Mon Sep 17 00:00:00 2001 +From c94146470358e5ba3b2047f8e0aa762f9357a15e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 1 May 2017 11:19:40 -0400 Subject: [PATCH 173/192] print more debug info in our module loader. diff --git a/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch index 872c956..7077e87 100644 --- a/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch +++ b/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch @@ -1,4 +1,4 @@ -From af947a9dfab90eff972d000a6a7506ce052d11ea Mon Sep 17 00:00:00 2001 +From 47b6acd4424c9e1dce694d1cc287fda2d3eca685 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 24 May 2017 12:42:32 -0400 Subject: [PATCH 174/192] macos: just build chainloader entries, don't try any diff --git a/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch index f51c2fb..0af5a24 100644 --- a/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch +++ b/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch @@ -1,4 +1,4 @@ -From 2820f28d209a67dda25b74527150be87bceb1efd Mon Sep 17 00:00:00 2001 +From a3eaa70d8fec7f0fc5c13c4886bc67d3eab8ba6e Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Wed, 18 Dec 2013 09:57:04 +0000 Subject: [PATCH 175/192] grub2/btrfs: Add ability to boot from subvolumes diff --git a/0176-export-btrfs_subvol-and-btrfs_subvolid.patch b/0176-export-btrfs_subvol-and-btrfs_subvolid.patch index 62e7105..854eaa5 100644 --- a/0176-export-btrfs_subvol-and-btrfs_subvolid.patch +++ b/0176-export-btrfs_subvol-and-btrfs_subvolid.patch @@ -1,4 +1,4 @@ -From 405a7c2f16f6ab331a853fed4bf26fa3ad561c4c Mon Sep 17 00:00:00 2001 +From 1dcd15bbf1da1839c6dfa3e475f185fb72e55332 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 18 Dec 2013 09:57:04 +0000 Subject: [PATCH 176/192] export btrfs_subvol and btrfs_subvolid diff --git a/0177-grub2-btrfs-03-follow_default.patch b/0177-grub2-btrfs-03-follow_default.patch index 1f4e922..7f41e99 100644 --- a/0177-grub2-btrfs-03-follow_default.patch +++ b/0177-grub2-btrfs-03-follow_default.patch @@ -1,4 +1,4 @@ -From ab593d129dd76437dc05e328852106e917d6fc7e Mon Sep 17 00:00:00 2001 +From c92dacf72b436c42f7a417b161852017bd95ac72 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 Subject: [PATCH 177/192] grub2-btrfs-03-follow_default diff --git a/0178-grub2-btrfs-04-grub2-install.patch b/0178-grub2-btrfs-04-grub2-install.patch index 70fe751..69057b1 100644 --- a/0178-grub2-btrfs-04-grub2-install.patch +++ b/0178-grub2-btrfs-04-grub2-install.patch @@ -1,4 +1,4 @@ -From 48c1105e0755c455c70b39eeb03e7d138a9205a6 Mon Sep 17 00:00:00 2001 +From 9501029137b4751b2cb0c84baf23f31a8ff1a4dd Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 Subject: [PATCH 178/192] grub2-btrfs-04-grub2-install diff --git a/0179-grub2-btrfs-05-grub2-mkconfig.patch b/0179-grub2-btrfs-05-grub2-mkconfig.patch index fd0b44f..36c22c5 100644 --- a/0179-grub2-btrfs-05-grub2-mkconfig.patch +++ b/0179-grub2-btrfs-05-grub2-mkconfig.patch @@ -1,4 +1,4 @@ -From 0d943cd642131e4f6d6ca9edde9d9373294ec1db Mon Sep 17 00:00:00 2001 +From d5f0e3cb0b3e038f35cdddf798e095cb1c9b8d00 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 Subject: [PATCH 179/192] grub2-btrfs-05-grub2-mkconfig diff --git a/0180-grub2-btrfs-06-subvol-mount.patch b/0180-grub2-btrfs-06-subvol-mount.patch index 9386081..a051d53 100644 --- a/0180-grub2-btrfs-06-subvol-mount.patch +++ b/0180-grub2-btrfs-06-subvol-mount.patch @@ -1,4 +1,4 @@ -From 8011b1d2b6e3f239bdee7ba22f9d08b613d24113 Mon Sep 17 00:00:00 2001 +From db75dad097b89491d1f2140a054a08c9a2975c40 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Fri, 22 May 2015 11:45:25 +0000 Subject: [PATCH 180/192] grub2-btrfs-06-subvol-mount diff --git a/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch b/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch index f073586..d442f7f 100644 --- a/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch +++ b/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch @@ -1,4 +1,4 @@ -From 9e5e9e44d13de2f297c60ddb956d838054c92578 Mon Sep 17 00:00:00 2001 +From dcccb8337cd0a5e7fdcaa32be83466430a4919dd Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Sat, 18 Jul 2015 15:38:08 +0000 Subject: [PATCH 181/192] No more "Bootable Snapshot" submenu in grub.cfg. diff --git a/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch index 33b9a5c..9a1f604 100644 --- a/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch +++ b/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch @@ -1,4 +1,4 @@ -From 88db0c4fb663e700115f88303b6aacd9a29a6ff1 Mon Sep 17 00:00:00 2001 +From 71e874b34e9af7a3cd92742064ff53356f30614c Mon Sep 17 00:00:00 2001 From: Andrei Borzenkov Date: Tue, 21 Jun 2016 16:44:17 +0000 Subject: [PATCH 182/192] Fallback to old subvol name scheme to support old diff --git a/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch index a71713e..27e49b8 100644 --- a/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch +++ b/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch @@ -1,4 +1,4 @@ -From f125fb3b2523e0d15d243f52c008503065c1d825 Mon Sep 17 00:00:00 2001 +From c7ef72a2a071bce0560483cb963ca4734b69ceee Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 11 May 2017 08:56:57 +0000 Subject: [PATCH 183/192] Grub not working correctly with btrfs snapshots diff --git a/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch index 8ed4507..361d340 100644 --- a/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch +++ b/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch @@ -1,4 +1,4 @@ -From dd0f61076714c4b63da8e780a3e4823e4af17833 Mon Sep 17 00:00:00 2001 +From 7775ed257814eff3867bd09a3156b7ca77bc0f6d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 09:59:56 -0400 Subject: [PATCH 184/192] Add grub_efi_allocate_pool() and grub_efi_free_pool() diff --git a/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch index 7520acb..0438d66 100644 --- a/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch +++ b/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch @@ -1,4 +1,4 @@ -From fdcd3314bf7570e459007efc2553991da0d35619 Mon Sep 17 00:00:00 2001 +From 8877b728ff3c33f0fc25a2bf6cda8dfbe30ef8c5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 10:06:38 -0400 Subject: [PATCH 185/192] Use grub_efi_...() memory helpers where reasonable. diff --git a/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch index 8e1d62d..7ad0c1e 100644 --- a/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch +++ b/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch @@ -1,4 +1,4 @@ -From 56174d5d4a91cc0df9421ef82613ec332011e826 Mon Sep 17 00:00:00 2001 +From 6ba24572ef934a14b56f32bd2cd9655d5e216d2e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 10:07:50 -0400 Subject: [PATCH 186/192] Add PRIxGRUB_EFI_STATUS and use it. diff --git a/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch b/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch index f6dc832..9a0e031 100644 --- a/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch +++ b/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch @@ -1,4 +1,4 @@ -From ea0790c19fc06366031390e39f70191499054a0a Mon Sep 17 00:00:00 2001 +From 94763d8eb1aeb0a1332f6e262dfc0bde4540b868 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:42:57 -0400 Subject: [PATCH 187/192] Don't use dynamic sized arrays since we don't build diff --git a/0188-don-t-ignore-const.patch b/0188-don-t-ignore-const.patch index fcd7969..12c8a26 100644 --- a/0188-don-t-ignore-const.patch +++ b/0188-don-t-ignore-const.patch @@ -1,4 +1,4 @@ -From da09d4c837884ccfbd51452f6af37044501de7d6 Mon Sep 17 00:00:00 2001 +From ba1843ecde7b5352aeebbe8ce0f7d9bfb95ec3fb Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:43:22 -0400 Subject: [PATCH 188/192] don't ignore const diff --git a/0189-don-t-use-int-for-efi-status.patch b/0189-don-t-use-int-for-efi-status.patch index 27ad516..68e4016 100644 --- a/0189-don-t-use-int-for-efi-status.patch +++ b/0189-don-t-use-int-for-efi-status.patch @@ -1,4 +1,4 @@ -From b80f9447368083bc90d2a2642e790fb0b8ae1010 Mon Sep 17 00:00:00 2001 +From 6711c5bb2641789ac5e24bf880283eef65532518 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:44:59 -0400 Subject: [PATCH 189/192] don't use int for efi status diff --git a/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch index a346814..2b93a39 100644 --- a/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +++ b/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch @@ -1,4 +1,4 @@ -From fb2c03f93456f934e090730589cf37495d613427 Mon Sep 17 00:00:00 2001 +From a80182d86a6a55413b5794a2eca80b4b7dfc9be5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:46:23 -0400 Subject: [PATCH 190/192] make GRUB_MOD_INIT() declare its function prototypes. diff --git a/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch b/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch index 9594a2d..f3d6dbd 100644 --- a/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch +++ b/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch @@ -1,4 +1,4 @@ -From 3baddd2a95ca1026951e2d8bb0b39b9e22471eb1 Mon Sep 17 00:00:00 2001 +From 7d1c68137a2c4c69e3b4407d9771ccb51f3341fe Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 24 May 2017 15:58:18 -0400 Subject: [PATCH 191/192] Clean up some errors in the linuxefi loader diff --git a/0192-editenv-handle-relative-symlinks.patch b/0192-editenv-handle-relative-symlinks.patch index b46732f..87dfeff 100644 --- a/0192-editenv-handle-relative-symlinks.patch +++ b/0192-editenv-handle-relative-symlinks.patch @@ -1,4 +1,4 @@ -From 9e2c8268c74edd473ecf684a2f0f0f050f112578 Mon Sep 17 00:00:00 2001 +From 54a01b15263a71dce51f4da826e1364780c45590 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 14 Aug 2017 14:37:20 -0400 Subject: [PATCH 192/192] editenv: handle relative symlinks From b50565e33ea67d83aebb59f9e22b111d2f1747e3 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 14 Aug 2017 18:03:55 -0400 Subject: [PATCH 02/20] Make ia32 work as well. - make it work with rpm-4.13.90 - split up the packages for various arch targets so ia32 can work Signed-off-by: Peter Jones --- .gitignore | 2 + grub.macros | 481 +++++++++++++++++++++++++++++++++++ grub2.spec | 708 +++++++++++++++++++++++----------------------------- 3 files changed, 793 insertions(+), 398 deletions(-) create mode 100644 grub.macros diff --git a/.gitignore b/.gitignore index 0b76f70..21193e9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ kojilogs /grub-*/ .build*.log .*.git/ +tmp/ +.*.sw? diff --git a/grub.macros b/grub.macros new file mode 100644 index 0000000..0241be7 --- /dev/null +++ b/grub.macros @@ -0,0 +1,481 @@ +# vim:filetype=spec +# Modules always contain just 32-bit code +%global _libdir %{_exec_prefix}/lib +%global _binaries_in_noarch_packages_terminate_build 0 +#%%undefine _missing_build_ids_terminate_build +%{expand:%%{!?buildsubdir:%%global buildsubdir grub-%{tarversion}}} +%{expand:%%{!?_licensedir:%%global license %%%%doc}} + +%if %{?_with_ccache: 1}%{?!_with_ccache: 0} +%global cc_equals CC=/usr/%{_lib}/ccache/gcc +%else +%global cc_equals %{nil} +%endif + +%global efi_cflags %(echo %{optflags} | \\\ + sed \\\ + -e 's/-O. //g' \\\ + -e 's/-g /-g3 /g' \\\ + -e 's/-fstack-protector[[:alpha:]-]\\+//g' \\\ + -e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]\\+//g' \\\ + -e 's/--param=ssp-buffer-size=4//g' \\\ + -e 's/-mregparm=3/-mregparm=4/g' \\\ + -e 's/-fexceptions//g' \\\ + -e 's/-fasynchronous-unwind-tables//g' \\\ + -e 's/$/ -I$(pwd)/' \\\ + -e 's/^/ -fno-strict-aliasing /' ) %{nil} +%global legacy_cflags %(echo %{efi_cflags} | \\\ + sed \\\ + -e 's/-m64//g' \\\ + -e 's/-mcpu=power[[:alnum:]]\\+/-mcpu=power6/g' \\\ + ) %{nil} + + +%global with_efi_arch 0 +%global with_alt_efi_arch 0 +%global with_legacy_arch 0 +%global grubefiarch %{nil} +%global grublegacyarch %{nil} + +# sparc is always compiled 64 bit +%ifarch %{sparc} +%global target_cpu_name sparc64 +%global _target_platform %{target_cpu_name}-%{_vendor}-%{_target_os}%{?_gnu} +%global legacy_target_cpu_name %{_arch} +%global legacy_package_arch ieee1275 +%global platform ieee1275 +%endif +# ppc is always compiled 64 bit +%ifarch ppc ppc64 ppc64le +%global target_cpu_name %{_arch} +%global legacy_target_cpu_name powerpc +%global legacy_package_arch %{_arch} +%global legacy_grub_dir powerpc-ieee1275 +%global _target_platform %{target_cpu_name}-%{_vendor}-%{_target_os}%{?_gnu} +%global platform ieee1275 +%endif + +%global efi_only aarch64 %{arm} +%global efi_arch x86_64 ia64 %{efi_only} +%ifarch %{efi_arch} +%global with_efi_arch 1 +%else +%global with_efi_arch 0 +%endif +%ifarch %{efi_only} +%global with_efi_only 1 +%else +%global with_efi_only 0 +%endif +%{!?with_efi_arch:%global without_efi_arch 0} +%{?with_efi_arch:%global without_efi_arch 1} +%{!?with_efi_only:%global without_efi_only 0} +%{?with_efi_only:%global without_efi_only 1} + +### fixme +%ifarch aarch64 %{arm} +%global efi_modules " http linux " +%else +%global efi_modules " backtrace http linuxefi usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug " +%endif + +%ifarch x86_64 +%global efiarch x64 +%global target_cpu_name %{_arch} +%global grub_target_name %{_arch}-efi +%global package_arch efi-x64 + +%global legacy_target_cpu_name i386 +%global legacy_package_arch pc +%global platform pc + +%global alt_efi_arch ia32 +%global alt_target_cpu_name i386 +%global alt_grub_target_name i386-efi +%global alt_platform efi +%global alt_package_arch efi-ia32 +%global alt_efi_cflags %(echo %{efi_cflags} | \\\ + sed \\\ + -e 's/-m64//g' \\\ + ) %{nil} +%endif + +%ifarch aarch64 +%global efiarch aa64 +%global target_cpu_name aarch64 +%global grub_target_name arm64-efi +%global package_arch efi-aa64 +%endif + +%ifarch %{arm} +%global efiarch arm +%global target_cpu_name arm +%global grub_target_name arm-efi +%global package_arch efi-arm +%endif + +%global _target_platform %{target_cpu_name}-%{_vendor}-%{_target_os}%{?_gnu} +%global _alt_target_platform %{alt_target_cpu_name}-%{_vendor}-%{_target_os}%{?_gnu} + +%ifarch %{efi_arch} +%global with_efi_arch 1 +%global grubefiname grub%{efiarch}.efi +%global grubeficdname gcd%{efiarch}.efi +%global grubefiarch %{target_cpu_name}-efi +%endif + +%if 0%{?alt_efi_arch:1} +%global with_alt_efi_arch 1 +%global grubaltefiname grub%{alt_efi_arch}.efi +%global grubalteficdname gcd%{alt_efi_arch}.efi +%global grubaltefiarch %{alt_target_cpu_name}-efi +%endif + +# Figure out the right file path to use +%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')) + +%ifnarch %{efi_only} +%global with_legacy_arch 1 +%global grublegacyarch %{legacy_target_cpu_name}-%{platform} +%global moduledir %{legacy_target_cpu_name}-%{platform} +%endif + +%global evr %{epoch}:%{version}-%{release} + +%if %{with_legacy_arch} +%global with_efi_common 0 +%global with_legacy_common 1 +%else +%global with_efi_common 1 +%global with_legacy_common 0 +%endif + +%define define_legacy_variant() \ +%{expand:%%package %%{1}} \ +Summary: Bootloader with support for Linux, Multiboot, and more \ +Group: System Environment/Base \ +Requires: %{name}-common = %{evr} \ +Requires: %{name}-tools-minimal = %{evr} \ +Requires: %{name}-%{1}-modules = %{evr} \ +Requires: gettext which file \ +Requires: %{name}-tools-extra = %{evr} \ +Requires: %{name}-tools = %{evr} \ +Requires(pre): dracut \ +Requires(post): dracut \ +%{expand:%%description %%{1}} \ +%{desc} \ +This subpackage provides support for %%{1} systems. \ + \ +%{expand:%%{?!buildsubdir:%%define buildsubdir grub-%%{1}-%{tarversion}}}\ +%{expand:%%package %%{1}-modules} \ +Summary: Modules used to build custom grub images \ +Group: System Environment/Base \ +BuildArch: noarch \ +Requires: %{name}-common = %{evr} \ +%{expand:%%description %%{1}-modules} \ +%{desc} \ +This subpackage provides support for rebuilding your own grub.efi. \ + \ +%{expand:%%{?!buildsubdir:%%define buildsubdir grub-%%{1}-%{tarversion}}}\ +%{expand:%%package %%{1}-tools} \ +Summary: Support tools for GRUB. \ +Group: System Environment/Base \ +Requires: gettext os-prober which file system-logos \ +Requires: %{name}-common = %{evr} \ +Requires: %{name}-tools-minimal = %{evr} \ +Requires: os-prober >= 1.58-11 \ +Requires: gettext which file \ + \ +%{expand:%%description %%{1}-tools} \ +%{desc} \ +This subpackage provides tools for support of %%{1} platforms. \ +%{nil} + +%define define_efi_variant(p) \ +%{expand:%%package %{1}} \ +Summary: GRUB for EFI systems. \ +Group: System Environment/Base \ +Requires: %{name}-common = %{evr} \ +Requires: %{name}-tools-minimal >= %{evr} \ +Requires: %{name}-tools-extra = %{evr} \ +Requires: %{name}-tools = %{evr} \ +%{-p:Provides: %{name}-efi = %{evr}} \ +%{-p:Obsoletes: %{name}-efi < %{evr}} \ + \ +%{expand:%%description %{1}} \ +%{desc} \ +This subpackage provides support for %{1} systems. \ + \ +%{expand:%%{?!buildsubdir:%%define buildsubdir grub-%{1}-%{tarversion}}}\ +%{expand:%%package %{1}-modules} \ +Summary: Modules used to build custom grub.efi images \ +Group: System Environment/Base \ +BuildArch: noarch \ +Requires: %{name}-common = %{evr} \ +%{-p:Provides: %{name}-efi-modules = %{evr}} \ +%{-p:Obsoletes: %{name}-efi-modules < %{evr}} \ +%{expand:%%description %{1}-modules} \ +%{desc} \ +This subpackage provides support for rebuilding your own grub.efi. \ + \ +%{expand:%%package %{1}-cdboot} \ +Summary: Files used to boot removeable media with EFI \ +Group: System Environment/Base \ +Requires: %{name}-common = %{evr} \ +%{expand:%%description %{1}-cdboot} \ +%{desc} \ +This subpackage provides optional components of grub used with removeable media on %{1} systems.\ +%{nil} + +%global do_common_setup() \ +%setup -q -n grub-%{tarversion} \ +rm -fv docs/*.info \ +cp %{SOURCE6} .gitignore \ +cp %{SOURCE8} ./grub-core/tests/strtoull_test.c \ +git init \ +echo '![[:digit:]][[:digit:]]_*.in' > util/grub.d/.gitignore \ +echo '!*.[[:digit:]]' > util/.gitignore \ +echo '!config.h' > include/grub/emu/.gitignore \ +./autogen.sh \ +git config user.email "%{name}-owner@fedoraproject.org" \ +git config user.name "Fedora Ninjas" \ +git config gc.auto 0 \ +git add . \ +git commit -a -q -m "%{tarversion} baseline." \ +git am %%{patches} = 0.99-8 %endif +%if %{?_with_ccache: 1}%{?!_with_ccache: 0} +BuildRequires: ccache %endif -Provides: grub2-base = %{epoch}:%{version}-%{release} -ExcludeArch: s390 s390x %{arm} -Obsoletes: grub2 <= 1:2.00-20%{?dist} -Requires: %{name}-tools = %{epoch}:%{version}-%{release} +ExcludeArch: s390 s390x %{arm} %{?ix86} +Obsoletes: %{name} <= %{evr} + +%if 0%{with_legacy_arch} +Requires: %{name}-%{legacy_package_arch} = %{evr} +%else +Requires: %{name}-%{package_arch} = %{evr} +%endif + +%global desc \ +The GRand Unified Bootloader (GRUB) is a highly configurable and \ +customizable bootloader with modular architecture. It supports a rich \ +variety of kernel formats, file systems, computer architectures and \ +hardware devices.\ +%{nil} %description -The GRand Unified Bootloader (GRUB) is a highly configurable and customizable -bootloader with modular architecture. It support rich varietyof kernel formats, -file systems, computer architectures and hardware devices. This subpackage -provides support for PC BIOS systems. +%{desc} -%ifarch %{efiarchs} -%package efi -Summary: GRUB for EFI systems. +%package common +Summary: grub2 common layout Group: System Environment/Base -Requires: %{name}-tools = %{epoch}:%{version}-%{release} -Obsoletes: grub2-efi <= 1:2.00-20%{?dist} -Provides: grub2-base = %{epoch}:%{version}-%{release} +BuildArch: noarch -%description efi -The GRand Unified Bootloader (GRUB) is a highly configurable and customizable -bootloader with modular architecture. It support rich varietyof kernel formats, -file systems, computer architectures and hardware devices. This subpackage -provides support for EFI systems. - -%package efi-modules -Summary: Modules used to build custom grub.efi images -Group: System Environment/Base -Requires: %{name}-tools = %{epoch}:%{version}-%{release} -Obsoletes: grub2-efi <= 1:2.00-20%{?dist} - -%description efi-modules -The GRand Unified Bootloader (GRUB) is a highly configurable and customizable -bootloader with modular architecture. It support rich varietyof kernel formats, -file systems, computer architectures and hardware devices. This subpackage -provides support for rebuilding your own grub.efi on EFI systems. -%endif +%description common +This package provides some directories which are required by various grub2 +subpackages. %package tools Summary: Support tools for GRUB. Group: System Environment/Base -Requires: gettext which file system-logos -Requires: os-prober >= 1.58-11 -Requires: grub2-base -Requires(pre): dracut -Requires(post): dracut +Obsoletes: %{name}-tools < %{evr} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: gettext os-prober which file +Requires(pre): dracut +Requires(post): dracut %description tools -The GRand Unified Bootloader (GRUB) is a highly configurable and customizable -bootloader with modular architecture. It support rich varietyof kernel formats, -file systems, computer architectures and hardware devices. This subpackage -provides tools for support of all platforms. +%{desc} +This subpackage provides tools for support of all platforms. -%package starfield-theme -Summary: An example theme for GRUB. +%ifarch x86_64 +%package tools-efi +Summary: Support tools for GRUB. Group: System Environment/Base -Requires: system-logos -Obsoletes: grub2 <= 1:2.00-20%{?dist} -Obsoletes: grub2-efi <= 1:2.00-20%{?dist} +Requires: gettext os-prober which file +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Obsoletes: %{name}-tools < %{evr} -%description starfield-theme -The GRand Unified Bootloader (GRUB) is a highly configurable and customizable -bootloader with modular architecture. It support rich varietyof kernel formats, -file systems, computer architectures and hardware devices. This subpackage -provides an example theme for the grub screen. - -%prep -%setup -T -c -n grub-%{tarversion} -%ifarch %{efiarchs} -%setup -D -q -T -a 0 -n grub-%{tarversion} -cd grub-%{tarversion} -# place unifont in the '.' from which configure is run -cp %{SOURCE4} unifont.pcf.gz -cp %{SOURCE6} .gitignore -cp %{SOURCE8} ./grub-core/tests/strtoull_test.c -git init -echo '![[:digit:]][[:digit:]]_*.in' > util/grub.d/.gitignore -echo '!*.[[:digit:]]' > util/.gitignore -echo '!config.h' > grub-core/efiemu/runtime/.gitignore -echo '!config.h' > include/grub/emu/.gitignore -git config user.email "%{name}-owner@fedoraproject.org" -git config user.name "Fedora Ninjas" -git config gc.auto 0 -git add . -git commit -a -q -m "%{tarversion} baseline." -git am %{patches} util/grub.d/.gitignore -echo '!*.[[:digit:]]' > util/.gitignore -echo '!config.h' > grub-core/efiemu/runtime/.gitignore -echo '!config.h' > include/grub/emu/.gitignore -git config user.email "%{name}-owner@fedoraproject.org" -git config user.name "Fedora Ninjas" -git config gc.auto 0 -git add . -git commit -a -q -m "%{tarversion} baseline." -git am %{patches} ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/grub2.conf @@ -375,27 +212,28 @@ cat << EOF > ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/grub2.conf -b /usr/sbin/grub2-sparc64-setup EOF -%ifarch %{efiarchs} -mkdir -p boot/efi/EFI/%{efidir}/ -ln -s ../efi/EFI/%{efidir}/grubenv boot/grub2/grubenv -%endif - # Don't run debuginfo on all the grub modules and whatnot; it just # rejects them, complains, and slows down extraction. %global finddebugroot "%{_builddir}/%{?buildsubdir}/debug" -mkdir -p %{finddebugroot}/usr -cp -a ${RPM_BUILD_ROOT}/usr/bin %{finddebugroot}/usr/bin -cp -a ${RPM_BUILD_ROOT}/usr/sbin %{finddebugroot}/usr/sbin %global dip RPM_BUILD_ROOT=%{finddebugroot} %{__debug_install_post} -%define __debug_install_post ( %{dip} \ +%define __debug_install_post ( \ + mkdir -p %{finddebugroot}/usr \ + mv ${RPM_BUILD_ROOT}/usr/bin %{finddebugroot}/usr/bin \ + mv ${RPM_BUILD_ROOT}/usr/sbin %{finddebugroot}/usr/sbin \ + %{dip} \ install -m 0755 -d %{buildroot}/usr/lib/ %{buildroot}/usr/src/ \ cp -al %{finddebugroot}/usr/lib/debug/ \\\ %{buildroot}/usr/lib/debug/ \ cp -al %{finddebugroot}/usr/src/debug/ \\\ - %{buildroot}/usr/src/debug/ ) + %{buildroot}/usr/src/debug/ ) \ + mv %{finddebugroot}/usr/bin %{buildroot}/usr/bin \ + mv %{finddebugroot}/usr/sbin %{buildroot}/usr/sbin \ + %{nil} -%clean +%undefine buildsubdir + +%clean rm -rf $RPM_BUILD_ROOT %pre tools @@ -463,102 +301,176 @@ if [ "$1" = 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/%{name}-dev.info.gz || : fi -%ifnarch %{efi_only} -%files -f grub.lang -%defattr(-,root,root,-) -%{_libdir}/grub/*-%{platform}/ -%config(noreplace) %{_sysconfdir}/%{name}.cfg -%ghost %config(noreplace) /boot/%{name}/grub.cfg -%license grub-%{tarversion}/COPYING -%config(noreplace) %ghost /boot/grub2/grubenv -%endif +%files -%ifarch %{efiarchs} -%files efi -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name}-efi.cfg -%attr(0755,root,root)/boot/efi/EFI/%{efidir} -%attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts -%ghost %config(noreplace) /boot/efi/EFI/%{efidir}/grub.cfg -%license grub-%{tarversion}/COPYING -/boot/grub2/grubenv -# I know 0700 seems strange, but it lives on FAT so that's what it'll -# get no matter what we do. -%config(noreplace) %ghost %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grubenv - -%files efi-modules -%defattr(-,root,root,-) -%{_libdir}/grub/%{grubefiarch} -%endif - -%files tools -f grub.lang -%defattr(-,root,root,-) +%files common -f grub.lang %dir %{_libdir}/grub/ %dir %{_datarootdir}/grub/ -%dir %{_datarootdir}/grub/themes -%{_datarootdir}/grub/* -%{_sbindir}/%{name}-bios-setup -%{_sbindir}/%{name}-install -%{_sbindir}/%{name}-get-kernel-settings -%{_sbindir}/%{name}-macbless -%{_sbindir}/%{name}-mkconfig -%{_sbindir}/%{name}-ofpathname -%{_sbindir}/%{name}-probe -%{_sbindir}/%{name}-reboot -%{_sbindir}/%{name}-rpm-sort -%{_sbindir}/%{name}-set-default -%{_sbindir}/%{name}-setpassword -%{_sbindir}/%{name}-sparc64-setup -%{_bindir}/%{name}-editenv -%{_bindir}/%{name}-file -%{_bindir}/%{name}-fstest -%{_bindir}/%{name}-glue-efi -%{_bindir}/%{name}-kbdcomp -%{_bindir}/%{name}-menulst2cfg -%{_bindir}/%{name}-mkfont -%{_bindir}/%{name}-mkimage -%{_bindir}/%{name}-mklayout -%{_bindir}/%{name}-mknetdir -%{_bindir}/%{name}-mkpasswd-pbkdf2 -%{_bindir}/%{name}-mkrelpath -%ifnarch %{sparc} -%{_bindir}/%{name}-mkrescue -%endif -%{_bindir}/%{name}-mkstandalone -%{_bindir}/%{name}-render-label -%{_bindir}/%{name}-script-check -%{_bindir}/%{name}-syslinux2cfg -%{_datarootdir}/bash-completion/completions/grub -%{_sysconfdir}/prelink.conf.d/grub2.conf +%dir %{_datarootdir}/grub/themes/ +%exclude %{_datarootdir}/grub/themes/* %attr(0700,root,root) %dir %{_sysconfdir}/grub.d -%config %{_sysconfdir}/grub.d/??_* -%{_sysconfdir}/grub.d/README -%attr(0644,root,root) %ghost %config(noreplace) %{_sysconfdir}/default/grub -%{_sysconfdir}/sysconfig/grub +%dir %{_datarootdir}/grub +%exclude %{_datarootdir}/grub/* %dir /boot/%{name} %dir /boot/%{name}/themes/ %dir /boot/%{name}/themes/system %exclude /boot/%{name}/themes/system/* -%exclude %{_datarootdir}/grub/themes/ -%{_infodir}/%{name}* -%{_datadir}/man/man?/* -%license grub-%{tarversion}/COPYING -%doc grub-%{tarversion}/INSTALL -%doc grub-%{tarversion}/NEWS grub-%{tarversion}/README -%doc grub-%{tarversion}/THANKS grub-%{tarversion}/TODO -%doc grub-%{tarversion}/%{name}.html -%doc grub-%{tarversion}/%{name}-dev.html -%doc grub-%{tarversion}/font_char_metrics.png -%license grub-%{tarversion}/themes/starfield/COPYING.CC-BY-SA-3.0 +%attr(0700,root,root) %dir /boot/grub2 +%exclude /boot/grub2/* +%dir %attr(0755,root,root) /boot/efi/EFI/%{efidir} +%exclude /boot/efi/EFI/%{efidir}/* +%license COPYING +%ghost %config(noreplace) /boot/grub2/grubenv +%doc INSTALL +%doc NEWS +%doc README +%doc THANKS +%doc TODO +%doc docs/grub.html +%doc docs/grub-dev.html +%doc docs/font_char_metrics.png +%ifnarch x86_64 %{ix86} +%exclude %{_bindir}/%{name}-render-label +%exclude %{_sbindir}/%{name}-bios-setup +%exclude %{_sbindir}/%{name}-macbless +%endif -%files starfield-theme -%dir /boot/%{name}/themes/ -/boot/%{name}/themes/system -%dir %{_datarootdir}/grub/themes -%{_datarootdir}/grub/themes/starfield +%files tools-minimal +%defattr(-,root,root,-) +%{_sysconfdir}/prelink.conf.d/grub2.conf +%{_sbindir}/%{name}-get-kernel-settings +%{_sbindir}/%{name}-set-default +%{_sbindir}/%{name}-setpassword +%{_bindir}/%{name}-editenv +%{_bindir}/%{name}-mkpasswd-pbkdf2 + +%{_datadir}/man/man3/%{name}-get-kernel-settings* +%{_datadir}/man/man8/%{name}-set-default* +%{_datadir}/man/man8/%{name}-setpassword* +%{_datadir}/man/man1/%{name}-editenv* +%{_datadir}/man/man1/%{name}-mkpasswd-* + +%ifarch x86_64 %{ix86} +%files tools-efi +%defattr(-,root,root,-) +%{_sbindir}/%{name}-macbless +%{_bindir}/%{name}-render-label +%{_datadir}/man/man8/%{name}-macbless* +%{_datadir}/man/man1/%{name}-render-label* +%endif + +%files tools +%defattr(-,root,root,-) +%attr(0644,root,root) %ghost %config(noreplace) %{_sysconfdir}/default/grub +%config %{_sysconfdir}/grub.d/??_* +%{_sysconfdir}/grub.d/README +%{_infodir}/%{name}* +%{_datarootdir}/grub/* +%{_sbindir}/%{name}-install +%exclude %{_datarootdir}/grub/themes +%exclude %{_datarootdir}/grub/*.h +%{_datarootdir}/bash-completion/completions/grub +%{_sbindir}/%{name}-mkconfig +%{_sbindir}/%{name}-probe +%{_sbindir}/%{name}-rpm-sort +%{_sbindir}/%{name}-reboot +%{_bindir}/%{name}-file +%{_bindir}/%{name}-menulst2cfg +%{_bindir}/%{name}-mkrelpath +%{_bindir}/%{name}-script-check +%{_datadir}/man/man?/* + +# exclude man pages from tools-extra +%exclude %{_datadir}/man/man8/%{name}-sparc64-setup* +%exclude %{_datadir}/man/man8/%{name}-install* +%exclude %{_datadir}/man/man1/%{name}-fstest* +%exclude %{_datadir}/man/man1/%{name}-glue-efi* +%exclude %{_datadir}/man/man1/%{name}-kbdcomp* +%exclude %{_datadir}/man/man1/%{name}-mkfont* +%exclude %{_datadir}/man/man1/%{name}-mkimage* +%exclude %{_datadir}/man/man1/%{name}-mklayout* +%exclude %{_datadir}/man/man1/%{name}-mknetdir* +%exclude %{_datadir}/man/man1/%{name}-mkrescue* +%exclude %{_datadir}/man/man1/%{name}-mkstandalone* +%exclude %{_datadir}/man/man1/%{name}-syslinux2cfg* + +# exclude man pages from tools-minimal +%exclude %{_datadir}/man/man3/%{name}-get-kernel-settings* +%exclude %{_datadir}/man/man8/%{name}-set-default* +%exclude %{_datadir}/man/man8/%{name}-setpassword* +%exclude %{_datadir}/man/man1/%{name}-editenv* +%exclude %{_datadir}/man/man1/%{name}-mkpasswd-* +%exclude %{_datadir}/man/man8/%{name}-macbless* +%exclude %{_datadir}/man/man1/%{name}-render-label* + +%if %{with_legacy_arch} +%{_sbindir}/%{name}-install +%ifarch %{ix86} x86_64 +%{_sbindir}/%{name}-bios-setup +%else +%exclude %{_sbindir}/%{name}-bios-setup +%exclude %{_datadir}/man/man8/%{name}-bios-setup* +%endif +%ifarch %{sparc} +%{_sbindir}/%{name}-sparc64-setup +%else +%exclude %{_sbindir}/%{name}-sparc64-setup +%exclude %{_datadir}/man/man8/%{name}-sparc64-setup* +%endif +%ifarch %{sparc} ppc ppc64 ppc64le +%{_sbindir}/%{name}-ofpathname +%else +%exclude %{_sbindir}/%{name}-ofpathname +%exclude %{_datadir}/man/man8/%{name}-ofpathname* +%endif +%endif + +%files tools-extra +%{_sbindir}/%{name}-sparc64-setup +%{_sbindir}/%{name}-ofpathname +%{_bindir}/%{name}-fstest +%{_bindir}/%{name}-glue-efi +%{_bindir}/%{name}-kbdcomp +%{_bindir}/%{name}-mkfont +%{_bindir}/%{name}-mkimage +%{_bindir}/%{name}-mklayout +%{_bindir}/%{name}-mknetdir +%ifnarch %{sparc} +%{_bindir}/%{name}-mkrescue +%endif +%{_bindir}/%{name}-mkstandalone +%{_bindir}/%{name}-syslinux2cfg +%{_sysconfdir}/sysconfig/grub +%{_datadir}/man/man8/%{name}-sparc64-setup* +%{_datadir}/man/man8/%{name}-install* +%{_datadir}/man/man1/%{name}-fstest* +%{_datadir}/man/man1/%{name}-glue-efi* +%{_datadir}/man/man1/%{name}-kbdcomp* +%{_datadir}/man/man1/%{name}-mkfont* +%{_datadir}/man/man1/%{name}-mkimage* +%{_datadir}/man/man1/%{name}-mklayout* +%{_datadir}/man/man1/%{name}-mknetdir* +%{_datadir}/man/man1/%{name}-mkrescue* +%{_datadir}/man/man1/%{name}-mkstandalone* +%{_datadir}/man/man8/%{name}-ofpathname* +%{_datadir}/man/man1/%{name}-syslinux2cfg* +%exclude %{_datarootdir}/grub/themes/starfield + +%if 0%{with_efi_arch} +%{expand:%define_efi_variant_files %%{package_arch} %%{grubefiname} %%{grubeficdname} %%{grubefiarch} %%{target_cpu_name} %%{grub_target_name}} +%endif +%if 0%{with_alt_efi_arch} +%{expand:%define_efi_variant_files %%{alt_package_arch} %%{grubaltefiname} %%{grubalteficdname} %%{grubaltefiarch} %%{alt_target_cpu_name} %%{alt_grub_target_name}} +%endif +%if 0%{with_legacy_arch} +%{expand:%define_legacy_variant_files %%{legacy_package_arch} %%{grublegacyarch}} +%endif %changelog -* Wed Aug 16 2017 pjones - 1:2.02-8 +* Wed Aug 16 2017 Peter Jones - 2.02-9 +- Re-work for ia32-efi. + +* Wed Aug 16 2017 pjones - 2.02-8 - Rebased to newer upstream for fedora-27 * Tue Aug 15 2017 Peter Jones - 2.02-7 From 9d2fddcf46fc409ffb79ddf5bc9a96288848d1ea Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 16 Aug 2017 11:27:51 -0400 Subject: [PATCH 03/20] Fix a merge error that dropped the grub.macros and grub.patches sources Signed-off-by: Peter Jones --- grub2.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/grub2.spec b/grub2.spec index 376b264..e5c42b7 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,6 +14,8 @@ URL: http://www.gnu.org/software/grub/ Obsoletes: grub < 1:0.98 Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz #Source0: ftp://ftp.gnu.org/gnu/grub/grub-%%{tarversion}.tar.xz +Source1: grub.macros +Source2: grub.patches Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source5: theme.tar.bz2 Source6: gitignore From 345233e0e57523e24d9256f40718043df830e9f6 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 16 Aug 2017 13:00:56 -0400 Subject: [PATCH 04/20] fix grubenv once more... --- grub.macros | 6 ++---- grub2.spec | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/grub.macros b/grub.macros index 0241be7..b2374c7 100644 --- a/grub.macros +++ b/grub.macros @@ -395,9 +395,6 @@ install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \ install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \ install -D -m 644 unicode.pf2 \\\ $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/fonts/unicode.pf2\ -ln -sf ../efi/EFI/%{efidir}/grubenv \\\ - $RPM_BUILD_ROOT/boot/grub2/grubenv \ -./grub-editenv ${RPM_BUILD_ROOT}/boot/grub2/grubenv create \ cd .. \ %{nil} @@ -412,7 +409,6 @@ if [ -f $RPM_BUILD_ROOT%{_infodir}/grub-dev.info ]; then \ fi \ ln -s ../boot/%{name}/grub.cfg \\\ ${RPM_BUILD_ROOT}%{_sysconfdir}/grub2.cfg \ -./grub-editenv ${RPM_BUILD_ROOT}/boot/grub2/grubenv create \ cd .. \ if [ -f $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/grub2.chrp ]; then \ mv $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/grub2.chrp \\\ @@ -439,6 +435,8 @@ install -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig \ touch ${RPM_BUILD_ROOT}%{_sysconfdir}/default/grub \ ln -sf ../default/grub \\\ ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/grub \ +ln -sf ../efi/EFI/%{efidir}/grubenv \\\ + $RPM_BUILD_ROOT/boot/grub2/grubenv \ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \ %{nil} diff --git a/grub2.spec b/grub2.spec index e5c42b7..687fd29 100644 --- a/grub2.spec +++ b/grub2.spec @@ -198,6 +198,7 @@ rm -fr $RPM_BUILD_ROOT %if 0%{with_legacy_arch} %{expand:%do_legacy_install %%{grublegacyarch} %%{alt_grub_target_name}} %endif +${RPM_BUILD_ROOT}/%{_bindir}/%{name}-editenv ${RPM_BUILD_ROOT}/boot/efi/EFI/%{efidir}/grubenv create rm -f $RPM_BUILD_ROOT%{_infodir}/dir %find_lang grub From 35d1684777f3378a585421958dabbcf0ffe8400e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 16 Aug 2017 15:03:09 -0400 Subject: [PATCH 05/20] Make a temporary grub2-efi package on 64-bit efi arches. This makes it so we can build grub2 with the changes before anaconda and lorax are fixed. Signed-off-by: Peter Jones --- grub2.spec | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/grub2.spec b/grub2.spec index 687fd29..787a299 100644 --- a/grub2.spec +++ b/grub2.spec @@ -91,6 +91,20 @@ hardware devices.\ %description %{desc} +# temporary +%ifarch x86_64 aarch64 +%package efi +Summary: Bootloader with support for Linux, Multiboot, and more +Group: System Environment/Base +Requires: %{name}-tools-minimal = %{evr} +Requires: %{name}-tools-extra = %{evr} +Requires: %{name}-tools = %{evr} + +%description efi +%{desc} +This subpackage provides support for %{_arch} EFI systems +%endif + %package common Summary: grub2 common layout Group: System Environment/Base @@ -306,6 +320,23 @@ fi %files +# temporary +%ifarch x86_64 aarch64 +%files efi +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/%{name}-efi.cfg +%dir %attr(0755,root,root)/boot/efi/EFI/%{efidir} +%dir %attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts +%ghost %config(noreplace) /boot/efi/EFI/%{efidir}/grub.cfg +/boot/grub2/grubenv +%ghost %config(noreplace) %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grubenv +/boot/efi/EFI/%{efidir}/fonts/unicode.pf2 +/boot/efi/EFI/%{efidir}/gcd%{efiarch}.efi +/boot/efi/EFI/%{efidir}/grub%{efiarch}.efi +/boot/grub2/grubenv +%license COPYING +%endif + %files common -f grub.lang %dir %{_libdir}/grub/ %dir %{_datarootdir}/grub/ From dcee992d1cd3a8d9bbb3d872f1fd024d70543a5d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 16 Aug 2017 17:04:58 -0400 Subject: [PATCH 06/20] Fix some build failures. Signed-off-by: Peter Jones --- grub.macros | 35 ++++++++++++++++++++--------------- grub2.spec | 18 +++++++++--------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/grub.macros b/grub.macros index b2374c7..2ec5a80 100644 --- a/grub.macros +++ b/grub.macros @@ -12,7 +12,7 @@ %global cc_equals %{nil} %endif -%global efi_cflags %(echo %{optflags} | \\\ +%global cflags_sed \\\ sed \\\ -e 's/-O. //g' \\\ -e 's/-g /-g3 /g' \\\ @@ -22,14 +22,18 @@ -e 's/-mregparm=3/-mregparm=4/g' \\\ -e 's/-fexceptions//g' \\\ -e 's/-fasynchronous-unwind-tables//g' \\\ - -e 's/$/ -I$(pwd)/' \\\ - -e 's/^/ -fno-strict-aliasing /' ) %{nil} -%global legacy_cflags %(echo %{efi_cflags} | \\\ - sed \\\ + -e 's/^/ -fno-strict-aliasing /' \\\ + %{nil} + +%global efi_cflags \\\ + %{expand:%%(echo %{optflags} | %{cflags_sed})} + +%global legacy_cflags \\\ + %{expand:%%(echo %{optflags} | \\\ + %{cflags_sed} \\\ -e 's/-m64//g' \\\ -e 's/-mcpu=power[[:alnum:]]\\+/-mcpu=power6/g' \\\ - ) %{nil} - + )} %global with_efi_arch 0 %global with_alt_efi_arch 0 @@ -94,10 +98,11 @@ %global alt_grub_target_name i386-efi %global alt_platform efi %global alt_package_arch efi-ia32 -%global alt_efi_cflags %(echo %{efi_cflags} | \\\ - sed \\\ - -e 's/-m64//g' \\\ - ) %{nil} +%global alt_efi_cflags \\\ + %{expand:%%(echo %{optflags} | \\\ + %{cflags_sed} \\\ + -e 's/-m64//g' \\\ + )} %endif %ifarch aarch64 @@ -267,7 +272,7 @@ makeinfo --html --no-split -I docs -o docs/grub.html \\\ %define do_efi_configure() \ %configure \\\ %{cc_equals} \\\ - CFLAGS="%{2}" \\\ + CFLAGS="%{2} -I$(pwd)" \\\ TARGET_LDFLAGS=-static \\\ --with-platform=efi \\\ --target=%{1} \\\ @@ -345,7 +350,7 @@ cd .. \ cd grub-%{1}-%{tarversion} \ %configure \\\ %{cc_equals} \\\ - CFLAGS="%{legacy_cflags}" \\\ + CFLAGS="%{legacy_cflags} -I$(pwd)" \\\ TARGET_LDFLAGS=-static \\\ --with-platform=%{platform} \\\ --target=%{_target_platform} \\\ @@ -409,11 +414,11 @@ if [ -f $RPM_BUILD_ROOT%{_infodir}/grub-dev.info ]; then \ fi \ ln -s ../boot/%{name}/grub.cfg \\\ ${RPM_BUILD_ROOT}%{_sysconfdir}/grub2.cfg \ -cd .. \ if [ -f $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/grub2.chrp ]; then \ mv $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/grub2.chrp \\\ $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/grub.chrp \ fi \ +cd .. \ %{nil} %define do_common_install() \ @@ -451,7 +456,7 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \ %dir %{_libdir}/grub/%{2}/ \ %{_libdir}/grub/%{2}/* \ %exclude %{_libdir}/grub/%{2}/*.module \ -%exclude %{_libdir}/grub/%{2}/{boot,boot_hybrid,cdboot,diskboot,lzma_decompress,pxeboot}.{image,img} \ +%exclude %{_libdir}/grub/%{2}/{boot,boot_hybrid,cdboot,diskboot,lzma_decompress,pxeboot}.{image,img} \ %exclude %{_libdir}/grub/%{2}/*.o \ %{nil} diff --git a/grub2.spec b/grub2.spec index 787a299..8c39b83 100644 --- a/grub2.spec +++ b/grub2.spec @@ -52,8 +52,8 @@ BuildRequires: /usr/lib64/crt1.o glibc-static(x86-64) glibc-devel(x86-64) %if 0%{?centos}%{?mock} BuildRequires: /usr/lib/crt1.o glibc-static(x86-32) glibc-devel(x86-32) %else -# BuildRequires: /usr/lib/crt1.o glibc32 -BuildRequires: /usr/lib/crt1.o glibc-static(x86-32) +BuildRequires: /usr/lib/crt1.o glibc32 +#BuildRequires: /usr/lib/crt1.o glibc-static(x86-32) %endif %else # ppc64 builds need the ppc crt1.o @@ -197,6 +197,11 @@ This subpackage provides tools for support of all platforms. %{expand:%do_legacy_build %%{grublegacyarch}} %endif %do_common_build +%ifnarch x86_64 +rm -vf %{_bindir}/%{name}-render-label %{_sbindir}/%{name}-bios-setup %{_sbindir}/%{name}-macbless +%endif + + %install set -e @@ -363,11 +368,6 @@ fi %doc docs/grub.html %doc docs/grub-dev.html %doc docs/font_char_metrics.png -%ifnarch x86_64 %{ix86} -%exclude %{_bindir}/%{name}-render-label -%exclude %{_sbindir}/%{name}-bios-setup -%exclude %{_sbindir}/%{name}-macbless -%endif %files tools-minimal %defattr(-,root,root,-) @@ -384,7 +384,7 @@ fi %{_datadir}/man/man1/%{name}-editenv* %{_datadir}/man/man1/%{name}-mkpasswd-* -%ifarch x86_64 %{ix86} +%ifarch x86_64 %files tools-efi %defattr(-,root,root,-) %{_sbindir}/%{name}-macbless @@ -439,7 +439,7 @@ fi %if %{with_legacy_arch} %{_sbindir}/%{name}-install -%ifarch %{ix86} x86_64 +%ifarch x86_64 %{_sbindir}/%{name}-bios-setup %else %exclude %{_sbindir}/%{name}-bios-setup From 6247ff55d95e61fc152c151708ba3b9cb79ff933 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 16 Aug 2017 17:20:57 -0400 Subject: [PATCH 07/20] try to fix broken ppc build Signed-off-by: Peter Jones --- grub.macros | 1 + 1 file changed, 1 insertion(+) diff --git a/grub.macros b/grub.macros index 2ec5a80..7dbc91a 100644 --- a/grub.macros +++ b/grub.macros @@ -351,6 +351,7 @@ cd grub-%{1}-%{tarversion} \ %configure \\\ %{cc_equals} \\\ CFLAGS="%{legacy_cflags} -I$(pwd)" \\\ + CPPFLAGS="%{legacy_cflags} -I$(pwd)" \\\ TARGET_LDFLAGS=-static \\\ --with-platform=%{platform} \\\ --target=%{_target_platform} \\\ From cd4f64667294c819b45ef365a9976aecbce9388d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 16 Aug 2017 17:32:06 -0400 Subject: [PATCH 08/20] nope. --- grub.macros | 1 - 1 file changed, 1 deletion(-) diff --git a/grub.macros b/grub.macros index 7dbc91a..2ec5a80 100644 --- a/grub.macros +++ b/grub.macros @@ -351,7 +351,6 @@ cd grub-%{1}-%{tarversion} \ %configure \\\ %{cc_equals} \\\ CFLAGS="%{legacy_cflags} -I$(pwd)" \\\ - CPPFLAGS="%{legacy_cflags} -I$(pwd)" \\\ TARGET_LDFLAGS=-static \\\ --with-platform=%{platform} \\\ --target=%{_target_platform} \\\ From 31ca1450fc921273e123c707e35b869dd7ed124c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 16 Aug 2017 17:46:08 -0400 Subject: [PATCH 09/20] Try harder to avoid configure blowing up... Signed-off-by: Peter Jones --- grub.macros | 2 ++ 1 file changed, 2 insertions(+) diff --git a/grub.macros b/grub.macros index 2ec5a80..a49208b 100644 --- a/grub.macros +++ b/grub.macros @@ -6,6 +6,8 @@ %{expand:%%{!?buildsubdir:%%global buildsubdir grub-%{tarversion}}} %{expand:%%{!?_licensedir:%%global license %%%%doc}} +%global _configure_gnuconfig_hack 0 + %if %{?_with_ccache: 1}%{?!_with_ccache: 0} %global cc_equals CC=/usr/%{_lib}/ccache/gcc %else From 41c1671979e255203747a435c9ad830eb6bf77d1 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 17 Aug 2017 12:30:35 -0400 Subject: [PATCH 10/20] Actually fix the configure usage and the gcc -E weirdness. Signed-off-by: Peter Jones --- grub.macros | 2 +- grub2.spec | 30 ++++++------------------------ 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/grub.macros b/grub.macros index a49208b..b4c1877 100644 --- a/grub.macros +++ b/grub.macros @@ -6,7 +6,6 @@ %{expand:%%{!?buildsubdir:%%global buildsubdir grub-%{tarversion}}} %{expand:%%{!?_licensedir:%%global license %%%%doc}} -%global _configure_gnuconfig_hack 0 %if %{?_with_ccache: 1}%{?!_with_ccache: 0} %global cc_equals CC=/usr/%{_lib}/ccache/gcc @@ -275,6 +274,7 @@ makeinfo --html --no-split -I docs -o docs/grub.html \\\ %configure \\\ %{cc_equals} \\\ CFLAGS="%{2} -I$(pwd)" \\\ + CPPFLAGS="${CPPFLAGS} -I$(pwd)" \\\ TARGET_LDFLAGS=-static \\\ --with-platform=efi \\\ --target=%{1} \\\ diff --git a/grub2.spec b/grub2.spec index 8c39b83..a3c6d02 100644 --- a/grub2.spec +++ b/grub2.spec @@ -2,6 +2,7 @@ %global tarversion 2.02 %undefine _missing_build_ids_terminate_build +%global _configure_gnuconfig_hack 0 Name: grub2 Epoch: 1 @@ -41,25 +42,6 @@ BuildRequires: ncurses-devel xz-devel bzip2-devel BuildRequires: freetype-devel libusb-devel BuildRequires: rpm-devel BuildRequires: rpm-devel rpm-libs -%ifarch %{sparc} aarch64 ppc64le -# sparc builds need 64 bit glibc-devel - also for 32 bit userland -BuildRequires: /usr/lib64/crt1.o glibc-static -%else -%ifarch x86_64 -BuildRequires: /usr/lib64/crt1.o glibc-static(x86-64) glibc-devel(x86-64) -# glibc32 is what will be in the buildroots, but glibc-static(x86-32) is what -# will be in an epel-7 (i.e. centos) mock root. I think. -%if 0%{?centos}%{?mock} -BuildRequires: /usr/lib/crt1.o glibc-static(x86-32) glibc-devel(x86-32) -%else -BuildRequires: /usr/lib/crt1.o glibc32 -#BuildRequires: /usr/lib/crt1.o glibc-static(x86-32) -%endif -%else -# ppc64 builds need the ppc crt1.o -BuildRequires: /usr/lib/crt1.o glibc-static glibc-devel -%endif -%endif BuildRequires: autoconf automake autogen device-mapper-devel BuildRequires: freetype-devel gettext-devel git BuildRequires: texinfo @@ -197,11 +179,6 @@ This subpackage provides tools for support of all platforms. %{expand:%do_legacy_build %%{grublegacyarch}} %endif %do_common_build -%ifnarch x86_64 -rm -vf %{_bindir}/%{name}-render-label %{_sbindir}/%{name}-bios-setup %{_sbindir}/%{name}-macbless -%endif - - %install set -e @@ -219,6 +196,11 @@ rm -fr $RPM_BUILD_ROOT %endif ${RPM_BUILD_ROOT}/%{_bindir}/%{name}-editenv ${RPM_BUILD_ROOT}/boot/efi/EFI/%{efidir}/grubenv create rm -f $RPM_BUILD_ROOT%{_infodir}/dir +%ifnarch x86_64 +rm -vf ${RPM_BUILD_ROOT}/%{_bindir}/%{name}-render-label +rm -vf ${RPM_BUILD_ROOT}/%{_sbindir}/%{name}-bios-setup +rm -vf ${RPM_BUILD_ROOT}/%{_sbindir}/%{name}-macbless +%endif %find_lang grub From 3619a3f5457d13a74d6ca03e51fbd6aa627e1bb5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 17 Aug 2017 12:48:25 -0400 Subject: [PATCH 11/20] Simplify some of the macros a bit. Signed-off-by: Peter Jones --- grub.macros | 18 +----------------- grub2.spec | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/grub.macros b/grub.macros index b4c1877..86bca62 100644 --- a/grub.macros +++ b/grub.macros @@ -6,6 +6,7 @@ %{expand:%%{!?buildsubdir:%%global buildsubdir grub-%{tarversion}}} %{expand:%%{!?_licensedir:%%global license %%%%doc}} +%global _configure ../configure %if %{?_with_ccache: 1}%{?!_with_ccache: 0} %global cc_equals CC=/usr/%{_lib}/ccache/gcc @@ -251,23 +252,6 @@ git commit -a -q -m "%{tarversion} baseline." \ git am %%{patches} Date: Fri, 18 Aug 2017 17:34:33 -0400 Subject: [PATCH 12/20] Add the .img files into grub2-pc-modules (and all legacy variants) autoqa is seeing a failure that looks like: 13:50:17,909 INF program: grub2-install: error: cannot open `/usr/lib/grub/i386-pc/lzma_decompress.img': No such file or directory. And it's because the .img files are currently excluded. So put them back. Signed-off-by: Peter Jones --- grub.macros | 2 +- grub2.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/grub.macros b/grub.macros index 86bca62..f23cf78 100644 --- a/grub.macros +++ b/grub.macros @@ -442,7 +442,7 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \ %dir %{_libdir}/grub/%{2}/ \ %{_libdir}/grub/%{2}/* \ %exclude %{_libdir}/grub/%{2}/*.module \ -%exclude %{_libdir}/grub/%{2}/{boot,boot_hybrid,cdboot,diskboot,lzma_decompress,pxeboot}.{image,img} \ +%exclude %{_libdir}/grub/%{2}/{boot,boot_hybrid,cdboot,diskboot,lzma_decompress,pxeboot}.image \ %exclude %{_libdir}/grub/%{2}/*.o \ %{nil} diff --git a/grub2.spec b/grub2.spec index d17b056..702ceeb 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -492,6 +492,9 @@ fi %endif %changelog +* Fri Aug 18 2017 Peter Jones - 2.02-10 +- Add the .img files into grub2-pc-modules (and all legacy variants) + * Wed Aug 16 2017 Peter Jones - 2.02-9 - Re-work for ia32-efi. From 71e0fb4ea646071ec86e4a65bb24241e31c156bb Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 22 Aug 2017 11:13:52 -0400 Subject: [PATCH 13/20] Put grub2-mkimage in -tools, not -tools-extra. Signed-off-by: Peter Jones --- grub2.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/grub2.spec b/grub2.spec index 702ceeb..c9a24db 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -401,6 +401,7 @@ fi %{_sbindir}/%{name}-reboot %{_bindir}/%{name}-file %{_bindir}/%{name}-menulst2cfg +%{_bindir}/%{name}-mkimage %{_bindir}/%{name}-mkrelpath %{_bindir}/%{name}-script-check %{_datadir}/man/man?/* @@ -412,7 +413,6 @@ fi %exclude %{_datadir}/man/man1/%{name}-glue-efi* %exclude %{_datadir}/man/man1/%{name}-kbdcomp* %exclude %{_datadir}/man/man1/%{name}-mkfont* -%exclude %{_datadir}/man/man1/%{name}-mkimage* %exclude %{_datadir}/man/man1/%{name}-mklayout* %exclude %{_datadir}/man/man1/%{name}-mknetdir* %exclude %{_datadir}/man/man1/%{name}-mkrescue* @@ -457,7 +457,6 @@ fi %{_bindir}/%{name}-glue-efi %{_bindir}/%{name}-kbdcomp %{_bindir}/%{name}-mkfont -%{_bindir}/%{name}-mkimage %{_bindir}/%{name}-mklayout %{_bindir}/%{name}-mknetdir %ifnarch %{sparc} @@ -472,7 +471,6 @@ fi %{_datadir}/man/man1/%{name}-glue-efi* %{_datadir}/man/man1/%{name}-kbdcomp* %{_datadir}/man/man1/%{name}-mkfont* -%{_datadir}/man/man1/%{name}-mkimage* %{_datadir}/man/man1/%{name}-mklayout* %{_datadir}/man/man1/%{name}-mknetdir* %{_datadir}/man/man1/%{name}-mkrescue* @@ -492,6 +490,9 @@ fi %endif %changelog +* Tue Aug 22 2017 Peter Jones - 2.02-11 +- Put grub2-mkimage in -tools, not -tools-extra. + * Fri Aug 18 2017 Peter Jones - 2.02-10 - Add the .img files into grub2-pc-modules (and all legacy variants) From 53a4172ac476e33bed92c0b7889d59aed0a44f60 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 23 Aug 2017 16:50:11 -0400 Subject: [PATCH 14/20] Various fixups - Put grub2-mkimage in -tools, not -tools-extra. - Fix i686 building - Fix ppc HFS+ usage due to /boot/efi's presence. Signed-off-by: Peter Jones --- ...e-libgrub.pp-depend-on-config-util.h.patch | 48 +++++++++++++++++++ ...-efi-as-HFS-on-ppc-machines-in-grub-.patch | 44 +++++++++++++++++ grub.macros | 32 +++++++++---- grub.patches | 2 + grub2.spec | 6 ++- 5 files changed, 122 insertions(+), 10 deletions(-) create mode 100644 0193-Make-libgrub.pp-depend-on-config-util.h.patch create mode 100644 0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch diff --git a/0193-Make-libgrub.pp-depend-on-config-util.h.patch b/0193-Make-libgrub.pp-depend-on-config-util.h.patch new file mode 100644 index 0000000..332fb06 --- /dev/null +++ b/0193-Make-libgrub.pp-depend-on-config-util.h.patch @@ -0,0 +1,48 @@ +From 270c98a14f04ec48e93a67b32a66442773689ff4 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 23 Aug 2017 10:37:27 -0400 +Subject: [PATCH] Make libgrub.pp depend on config-util.h + +If you build with "make -j48" a lot, sometimes you see: + +gcc -E -DHAVE_CONFIG_H -I. -I.. -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub_script.tab.h\" -I. -I.. -I. -I.. -I../include -I./include -I../grub-core/lib/libgcrypt-grub/src/ -I../grub-core/lib/minilzo -I../grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub_script.tab.h\" -I. -I.. -I. -I.. -I../include -I./include -I../grub-core/lib/libgcrypt-grub/src/ -I./grub-core/gnulib -I../grub-core/gnulib -I/builddir/build/BUILD/grub-2.02/grub-aarch64-efi-2.02 -D_FILE_OFFSET_BITS=64 \ + -D'GRUB_MOD_INIT(x)=@MARKER@x@' grub_script.tab.h grub_script.yy.h ../grub-core/commands/blocklist.c ../grub-core/commands/macbless.c ../grub-core/commands/xnu_uuid.c ../grub-core/commands/testload.c ../grub-core/commands/ls.c ../grub-core/disk/dmraid_nvidia.c ../grub-core/disk/loopback.c ../grub-core/disk/lvm.c ../grub-core/disk/mdraid_linux.c ../grub-core/disk/mdraid_linux_be.c ../grub-core/disk/mdraid1x_linux.c ../grub-core/disk/raid5_recover.c ../grub-core/disk/raid6_recover.c ../grub-core/font/font.c ../grub-core/gfxmenu/font.c ../grub-core/normal/charset.c ../grub-core/video/fb/fbblit.c ../grub-core/video/fb/fbutil.c ../grub-core/video/fb/fbfill.c ../grub-core/video/fb/video_fb.c ../grub-core/video/video.c ../grub-core/video/capture.c ../grub-core/video/colors.c ../grub-core/unidata.c ../grub-core/io/bufio.c ../grub-core/fs/affs.c ../grub-core/fs/afs.c ../grub-core/fs/bfs.c ../grub-core/fs/btrfs.c ../grub-core/fs/cbfs.c ../grub-core/fs/cpio.c ../grub-core/fs/cpio_be.c ../grub-core/fs/odc.c ../grub-core/fs/newc.c ../grub-core/fs/ext2.c ../grub-core/fs/fat.c ../grub-core/fs/exfat.c ../grub-core/fs/fshelp.c ../grub-core/fs/hfs.c ../grub-core/fs/hfsplus.c ../grub-core/fs/hfspluscomp.c ../grub-core/fs/iso9660.c ../grub-core/fs/jfs.c ../grub-core/fs/minix.c ../grub-core/fs/minix2.c ../grub-core/fs/minix3.c ../grub-core/fs/minix_be.c ../grub-core/fs/minix2_be.c ../grub-core/fs/minix3_be.c ../grub-core/fs/nilfs2.c ../grub-core/fs/ntfs.c ../grub-core/fs/ntfscomp.c ../grub-core/fs/reiserfs.c ../grub-core/fs/romfs.c ../grub-core/fs/sfs.c ../grub-core/fs/squash4.c ../grub-core/fs/tar.c ../grub-core/fs/udf.c ../grub-core/fs/ufs2.c ../grub-core/fs/ufs.c ../grub-core/fs/ufs_be.c ../grub-core/fs/xfs.c ../grub-core/fs/zfs/zfscrypt.c ../grub-core/fs/zfs/zfs.c ../grub-core/fs/zfs/zfsinfo.c ../grub-core/fs/zfs/zfs_lzjb.c ../grub-core/fs/zfs/zfs_lz4.c ../grub-core/fs/zfs/zfs_sha256.c ../grub-core/fs/zfs/zfs_fletcher.c ../grub-core/lib/envblk.c ../grub-core/lib/hexdump.c ../grub-core/lib/LzFind.c ../grub-core/lib/LzmaEnc.c ../grub-core/lib/crc.c ../grub-core/lib/adler32.c ../grub-core/lib/crc64.c ../grub-core/normal/datetime.c ../grub-core/normal/misc.c ../grub-core/partmap/acorn.c ../grub-core/partmap/amiga.c ../grub-core/partmap/apple.c ../grub-core/partmap/sun.c ../grub-core/partmap/plan.c ../grub-core/partmap/dvh.c ../grub-core/partmap/sunpc.c ../grub-core/partmap/bsdlabel.c ../grub-core/partmap/dfly.c ../grub-core/script/function.c ../grub-core/script/lexer.c ../grub-core/script/main.c ../grub-core/script/script.c ../grub-core/script/argv.c ../grub-core/io/gzio.c ../grub-core/io/xzio.c ../grub-core/io/lzopio.c ../grub-core/kern/ia64/dl_helper.c ../grub-core/kern/arm/dl_helper.c ../grub-core/kern/arm64/dl_helper.c ../grub-core/lib/minilzo/minilzo.c ../grub-core/lib/xzembed/xz_dec_bcj.c ../grub-core/lib/xzembed/xz_dec_lzma2.c ../grub-core/lib/xzembed/xz_dec_stream.c ../util/misc.c ../grub-core/kern/command.c ../grub-core/kern/device.c ../grub-core/kern/disk.c ../grub-core/lib/disk.c ../util/getroot.c ../grub-core/osdep/unix/getroot.c ../grub-core/osdep/getroot.c ../grub-core/osdep/devmapper/getroot.c ../grub-core/osdep/relpath.c ../grub-core/kern/emu/hostdisk.c ../grub-core/osdep/devmapper/hostdisk.c ../grub-core/osdep/hostdisk.c ../grub-core/osdep/unix/hostdisk.c ../grub-core/osdep/exec.c ../grub-core/osdep/sleep.c ../grub-core/osdep/password.c ../grub-core/kern/emu/misc.c ../grub-core/kern/emu/mm.c ../grub-core/kern/env.c ../grub-core/kern/err.c ../grub-core/kern/file.c ../grub-core/kern/fs.c ../grub-core/kern/list.c ../grub-core/kern/misc.c ../grub-core/kern/partition.c ../grub-core/lib/crypto.c ../grub-core/disk/luks.c ../grub-core/disk/geli.c ../grub-core/disk/cryptodisk.c ../grub-core/disk/AFSplitter.c ../grub-core/lib/pbkdf2.c ../grub-core/commands/extcmd.c ../grub-core/lib/arg.c ../grub-core/disk/ldm.c ../grub-core/disk/diskfilter.c ../grub-core/partmap/gpt.c ../grub-core/partmap/msdos.c ../grub-core/fs/proc.c ../grub-core/fs/archelp.c > libgrub.pp || (rm -f libgrub.pp; exit 1) +rm -f stamp-h1 +touch ../config-util.h.in +cd . && /bin/sh ./config.status config-util.h +config.status: creating config-util.h +In file included from ../include/grub/mm.h:25:0, + from ../include/grub/disk.h:29, + from ../include/grub/file.h:26, + from ../grub-core/fs/btrfs.c:21: +./config.h:38:10: fatal error: ./config-util.h: No such file or directory + #include + ^~~~~~~~~~~~~~~ +compilation terminated. +make: *** [Makefile:13098: libgrub.pp] Error 1 + +This is because libgrub.pp is built with -DGRUB_UTIL=1, which means +it'll try to include config-util.h, but a parallel make is actually +building that file. I think. + +Signed-off-by: Peter Jones +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 7795baeb6..c7b0e6a9c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -37,7 +37,7 @@ grub_script.yy.c: grub_script.yy.h + CLEANFILES += grub_script.yy.c grub_script.yy.h + + # For libgrub.a +-libgrub.pp: grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES) ++libgrub.pp: config-util.h grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES) + $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgrubmods_a_CPPFLAGS) $(libgrubkern_a_CPPFLAGS) $(CPPFLAGS) \ + -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1) + CLEANFILES += libgrub.pp +-- +2.13.5 + diff --git a/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch new file mode 100644 index 0000000..fcf0496 --- /dev/null +++ b/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch @@ -0,0 +1,44 @@ +From fafbdc268d3ea0fbebd2589083088adc1a3e8004 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 20 Apr 2017 13:29:06 -0400 +Subject: [PATCH] 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 +grubenv to always be on /boot/efi/EFI/fedora/, this code causes it to +always make the wrong decision. + +Resolves: rhbz#1484474 + +Signed-off-by: Peter Jones +--- + util/grub-install.c | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/util/grub-install.c b/util/grub-install.c +index cd84a72b9..48f2abc3e 100644 +--- a/util/grub-install.c ++++ b/util/grub-install.c +@@ -1159,18 +1159,8 @@ main (int argc, char *argv[]) + char *d; + + is_guess = 1; +- d = grub_util_path_concat (2, bootdir, "macppc"); +- if (!grub_util_is_directory (d)) +- { +- free (d); +- d = grub_util_path_concat (2, bootdir, "efi"); +- } + /* Find the Mac HFS(+) System Partition. */ +- if (!grub_util_is_directory (d)) +- { +- free (d); +- d = grub_util_path_concat (2, bootdir, "EFI"); +- } ++ d = grub_util_path_concat (2, bootdir, "macppc"); + if (!grub_util_is_directory (d)) + { + free (d); +-- +2.13.5 + diff --git a/grub.macros b/grub.macros index f23cf78..f190f48 100644 --- a/grub.macros +++ b/grub.macros @@ -61,6 +61,13 @@ %global platform ieee1275 %endif +%ifarch %{ix86} +%global target_cpu_name %{_arch} +%global legacy_target_cpu_name i386 +%global legacy_package_arch pc +%global platform pc +%endif + %global efi_only aarch64 %{arm} %global efi_arch x86_64 ia64 %{efi_only} %ifarch %{efi_arch} @@ -149,12 +156,14 @@ %global evr %{epoch}:%{version}-%{release} -%if %{with_legacy_arch} +%ifarch x86_64 +%global with_efi_common 1 +%global with_legacy_modules 0 +%global with_legacy_common 0 +%else %global with_efi_common 0 %global with_legacy_common 1 -%else -%global with_efi_common 1 -%global with_legacy_common 0 +%global with_legacy_modules 1 %endif %define define_legacy_variant() \ @@ -174,14 +183,17 @@ Requires(post): dracut \ This subpackage provides support for %%{1} systems. \ \ %{expand:%%{?!buildsubdir:%%define buildsubdir grub-%%{1}-%{tarversion}}}\ -%{expand:%%package %%{1}-modules} \ +%{expand:%%if 0%%{with_legacy_modules} \ +%%package %%{1}-modules \ Summary: Modules used to build custom grub images \ Group: System Environment/Base \ BuildArch: noarch \ -Requires: %{name}-common = %{evr} \ -%{expand:%%description %%{1}-modules} \ -%{desc} \ +Requires: %%{name}-common = %%{evr} \ +%%description %%{1}-modules \ +%%{desc} \ This subpackage provides support for rebuilding your own grub.efi. \ +%%endif \ +} \ \ %{expand:%%{?!buildsubdir:%%define buildsubdir grub-%%{1}-%{tarversion}}}\ %{expand:%%package %%{1}-tools} \ @@ -437,6 +449,7 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \ %config(noreplace) %{_sysconfdir}/%{name}.cfg \ %ghost %config(noreplace) /boot/%{name}/grub.cfg \ \ +%{expand:%if 0%{?with_legacy_modules} \ %{expand:%%files %{1}-modules} \ %defattr(-,root,root) \ %dir %{_libdir}/grub/%{2}/ \ @@ -444,6 +457,9 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \ %exclude %{_libdir}/grub/%{2}/*.module \ %exclude %{_libdir}/grub/%{2}/{boot,boot_hybrid,cdboot,diskboot,lzma_decompress,pxeboot}.image \ %exclude %{_libdir}/grub/%{2}/*.o \ +%else \ +%%exclude %%{_libdir}/grub/%%{grublegacyarch}/* \ +%endif} \ %{nil} %define define_efi_variant_files() \ diff --git a/grub.patches b/grub.patches index f3ee6e1..aac5386 100644 --- a/grub.patches +++ b/grub.patches @@ -190,3 +190,5 @@ Patch0189: 0189-don-t-use-int-for-efi-status.patch Patch0190: 0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch Patch0191: 0191-Clean-up-some-errors-in-the-linuxefi-loader.patch Patch0192: 0192-editenv-handle-relative-symlinks.patch +Patch0193: 0193-Make-libgrub.pp-depend-on-config-util.h.patch +Patch0194: 0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch diff --git a/grub2.spec b/grub2.spec index c9a24db..ae52d6c 100644 --- a/grub2.spec +++ b/grub2.spec @@ -54,7 +54,7 @@ BuildRequires: pesign >= 0.99-8 BuildRequires: ccache %endif -ExcludeArch: s390 s390x %{arm} %{?ix86} +ExcludeArch: s390 s390x %{arm} Obsoletes: %{name} <= %{evr} %if 0%{with_legacy_arch} @@ -490,8 +490,10 @@ fi %endif %changelog -* Tue Aug 22 2017 Peter Jones - 2.02-11 +* Wed Aug 23 2017 Peter Jones - 2.02-11 - Put grub2-mkimage in -tools, not -tools-extra. +- Fix i686 building +- Fix ppc HFS+ usage due to /boot/efi's presence. * Fri Aug 18 2017 Peter Jones - 2.02-10 - Add the .img files into grub2-pc-modules (and all legacy variants) From 1300d7b6333c371609bb59171ff3a083d7b83aa9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 24 Aug 2017 14:10:08 -0400 Subject: [PATCH 15/20] Fix arm kernel command line allocation Resolves: rhbz#1484609 Get rid of the temporary extra efi packages hack. Signed-off-by: Peter Jones --- 0001-Bump-version-to-2.03.patch | 4 +- 0002-Remove-bashisms-from-tests.patch | 4 +- 0003-fs-tester-make-sh-compatible.patch | 4 +- 0004-support-busybox-date.patch | 4 +- ...retrieve-fstime-when-it-s-not-useful.patch | 4 +- 0006-Support-lseek64.patch | 4 +- 0007-Use-SHELL-rather-than-bin-sh.patch | 4 +- 0008-po-Use-SHELL-rather-than-bin-sh.patch | 4 +- 0009-Add-termux-path-to-dict.patch | 4 +- 0010-Fix-shebang-for-termux.patch | 4 +- 0011-Add-strtoull-test.patch | 4 +- ...x-behaviour-on-chars-between-9-and-a.patch | 4 +- 0013-Add-Virtual-LAN-support.patch | 4 +- ...out-to-mkimage_generate_elfXX-rather.patch | 4 +- ...r-arm-uboot-code-to-make-it-genereic.patch | 4 +- ...-parts-that-are-platform-independent.patch | 4 +- ...-Rename-uboot-halt.c-to-dummy-halt.c.patch | 4 +- ...ame-uboot-datetime-to-dummy-datetime.patch | 4 +- 0019-arm-coreboot-Start-new-port.patch | 4 +- ...upport-for-device-tree-based-drivers.patch | 4 +- ...-coreboot-Support-for-vexpress-timer.patch | 4 +- 0022-arm-coreboot-Export-FDT-routines.patch | 4 +- ...-Split-protocol-from-controller-code.patch | 4 +- ...reboot-Support-keyboard-for-vexpress.patch | 4 +- ...m_coreboot-Support-grub-mkstandalone.patch | 4 +- ...oreboot-Support-loading-linux-images.patch | 4 +- 0027-arm_coreboot-Support-DMA.patch | 4 +- 0028-ehci-Split-core-code-from-PCI-part.patch | 4 +- 0029-arm_coreboot-Support-EHCI.patch | 4 +- ...n-FDT-nodes-with-compatible-property.patch | 4 +- ...ty-to-send-receive-messages-on-paren.patch | 4 +- 0032-rk3288_spi-Add-SPI-driver.patch | 4 +- ...eboot-Add-Chromebook-keyboard-driver.patch | 4 +- 0034-Missing-parts-of-previous-commit.patch | 4 +- ...-cbmemc-to-support-updated-console-f.patch | 4 +- ...t_keyboard-Fix-falco-chromebook-case.patch | 4 +- 0037-sparc64-Close-cdboot-ihandle.patch | 4 +- ...-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch | 4 +- ...p-option-support-in-xen_module-comma.patch | 4 +- ...inux_xen.in-Add-xen_boot-command-sup.patch | 4 +- ...-introduction-of-Xen-boot-commands-i.patch | 4 +- ...se-devspec-to-determine-the-OBP-path.patch | 4 +- ...unt-ext2-3-4-filesystems-that-have-t.patch | 4 +- 0044-ehci-Fix-compilation-for-amd64.patch | 4 +- ...-compilation-for-ppc-sparc-and-arm64.patch | 4 +- 0046-ehci-Fix-compilation-on-i386.patch | 4 +- 0047-crypto-Fix-use-after-free.patch | 4 +- 0048-arm-efi-Fix-compilation.patch | 4 +- 0049-fdt-silence-clang-warning.patch | 4 +- 0050-Fix-a-segfault-in-lsefi.patch | 4 +- ...t-typedef-and-use-grub_size_t-instea.patch | 4 +- ...x-reading-label-lvd.ident-is-dstring.patch | 4 +- ...b-core-fs-udf.c-Add-support-for-UUID.patch | 4 +- ...orriso-presence-before-doing-anythin.patch | 4 +- 0055-Fail-if-xorriso-failed.patch | 4 +- ...efi-refactor-grub_efi_allocate_pages.patch | 4 +- 0057-Remove-grub_efi_allocate_pages.patch | 4 +- 0058-efi-move-fdt-helper-library.patch | 4 +- 0059-efi-Add-GRUB_PE32_MAGIC-definition.patch | 4 +- ...inux-loader-improve-type-portability.patch | 4 +- ...allocation-type-to-GRUB_EFI_LOADER_C.patch | 4 +- ...RM_-definitions-when-handling-term-c.patch | 4 +- ...B_GZ-prefix-to-gzio-specific-defines.patch | 4 +- 0064-info-in-builddir.patch | 4 +- 0065-re-write-.gitignore.patch | 4 +- ...ient-architecture-CAS-reboot-support.patch | 4 +- ...nsole-display-attr-when-clear-screen.patch | 4 +- ...video-support-for-IBM-power-machines.patch | 4 +- ...when-generating-configuration-by-gru.patch | 4 +- 0070-Move-bash-completion-script-922997.patch | 4 +- 0071-Update-to-minilzo-2.08.patch | 4 +- ...o-include-entries-by-title-not-just-.patch | 4 +- 0073-Add-GRUB_DISABLE_UUID.patch | 4 +- 0074-Make-exit-take-a-return-code.patch | 4 +- ...pot-as-binary-so-git-won-t-try-to-di.patch | 4 +- ...es-load-an-env-block-from-a-variable.patch | 4 +- ...HCP-client-ID-and-UUID-options-added.patch | 4 +- ...-trim-arp-packets-with-abnormal-size.patch | 10 ++--- ...Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch | 6 +-- ...UEFI-operating-systems-returned-by-o.patch | 6 +-- 0081-Migrate-PPC-from-Yaboot-to-Grub2.patch | 6 +-- 0082-Add-fw_path-variable-revised.patch | 6 +-- 0083-Add-support-for-linuxefi.patch | 6 +-- ...xefi-and-initrdefi-where-appropriate.patch | 6 +-- ...w-insmod-when-secure-boot-is-enabled.patch | 6 +-- ...-hex-hex-straight-through-unmolested.patch | 6 +-- 0087-Add-X-option-to-printf-functions.patch | 6 +-- ...for-specific-config-file-for-netboot.patch | 6 +-- ...g-module-to-parse-Boot-Loader-Specif.patch | 6 +-- 0090-Don-t-write-messages-to-the-screen.patch | 6 +-- 0091-Don-t-print-GNU-GRUB-header.patch | 6 +-- 0092-Don-t-add-to-highlighted-row.patch | 6 +-- 0093-Message-string-cleanups.patch | 6 +-- ...ing-now-that-we-aren-t-displaying-it.patch | 6 +-- ...t-indentation-for-the-term-help-text.patch | 6 +-- 0096-Indent-menu-entries.patch | 6 +-- 0097-Fix-margins.patch | 6 +-- ...-1-for-our-right-hand-margin-so-line.patch | 6 +-- ...-Use-linux16-when-appropriate-880840.patch | 6 +-- 0100-Enable-pager-by-default.-985860.patch | 6 +-- ...-on-serial-so-don-t-tell-the-user-to.patch | 6 +-- ...n-t-say-GNU-Linux-in-generated-menus.patch | 6 +-- ...-Don-t-draw-a-border-around-the-menu.patch | 6 +-- ...andard-margin-for-the-timeout-string.patch | 6 +-- ...rame-to-list-of-relocations-stripped.patch | 6 +-- ...rk-with-our-changes-for-linux16-and-.patch | 6 +-- ...on-t-print-during-fdt-loading-method.patch | 6 +-- ...spaces-when-we-re-doing-our-cmdline-.patch | 6 +-- ...password-to-boot-entries-generated-b.patch | 6 +-- 0110-Don-t-emit-Booting-.-message.patch | 6 +-- ...f-man-pages-with-slightly-nicer-ones.patch | 6 +-- ...ix-when-fallback-searching-for-grub-.patch | 6 +-- ...-before-grub.cfg-on-tftp-config-file.patch | 6 +-- ...ert-function-to-support-NVMe-devices.patch | 6 +-- ...M-Mustang-device-tree-for-hardware-t.patch | 6 +-- ...device-tree-from-the-grub-default-fi.patch | 6 +-- ...P-protocol-for-exclusive-use-by-grub.patch | 6 +-- ...P-protocol-for-exclusive-use-by-grub.patch | 6 +-- 0119-Add-grub_util_readlink.patch | 6 +-- ...se-symlinks-including-those-across-d.patch | 6 +-- ...CLASS-in-10_linux-from-etc-os-releas.patch | 6 +-- ...t-ordering-for-.debug-and-rescue-ker.patch | 6 +-- 0123-Load-arm-with-SB-enabled.patch | 23 ++++++----- 0124-Try-prefix-if-fw_path-doesn-t-work.patch | 6 +-- ...-grub.cfg-netboot-selection-order-11.patch | 6 +-- ...-Package-Sort-for-grub2-mkconfig-112.patch | 6 +-- 0127-Handle-rssd-storage-devices.patch | 6 +-- ...x16-initrd16-and-linuxefi-initrdefi-.patch | 6 +-- ...fig-construct-titles-that-look-like-.patch | 6 +-- ...ly-grub2-password-config-tool-985962.patch | 6 +-- ...e-the-Stall-EFI-boot-service-on-GRUB.patch | 20 ++++++---- ...fig-construct-titles-that-look-like-.patch | 6 +-- ...-configure.ac-and-grub-rpm-sort-play.patch | 6 +-- 0134-tcp-add-window-scaling-support.patch | 6 +-- ...net-retransmit-if-our-device-is-busy.patch | 6 +-- ...out-actually-using-the-configured-ne.patch | 6 +-- ...r-for-the-first-exclusive-reopen-of-.patch | 6 +-- ...ue-when-reading-username-and-passwor.patch | 6 +-- ...ub-password-will-not-be-read-1290803.patch | 6 +-- ...ub-setpassword-documentation-1290799.patch | 6 +-- ...le-issue-in-grub-setpassword-1294243.patch | 6 +-- ...rsistent-RAM-and-unknown-possible-fu.patch | 6 +-- 0143-efiemu-Fix-compilation-failure.patch | 6 +-- ...P-protocol-for-exclusive-use-by-grub.patch | 6 +-- 0145-Add-a-url-parser.patch | 6 +-- ...net-and-bootp-add-support-for-dhcpv6.patch | 6 +-- ...rnel-settings-and-use-it-in-10_linux.patch | 6 +-- 0148-Normalize-slashes-in-tftp-paths.patch | 6 +-- 0149-Fix-malformed-tftp-packets.patch | 6 +-- 0150-Fix-race-in-EFI-validation.patch | 6 +-- ...1374141-fix-incorrect-mask-for-ppc64.patch | 6 +-- ...art-of-chainloader-target-if-present.patch | 6 +-- ...ecureboot-support-on-efi-chainloader.patch | 6 +-- ...loaders-that-link-in-efi-mode-honor-.patch | 6 +-- 0155-Make-grub_fatal-also-backtrace.patch | 6 +-- 0156-Rework-linux-command.patch | 6 +-- 0157-Rework-linux16-command.patch | 6 +-- 0158-Make-grub-editenv-build-again.patch | 6 +-- ...ix-up-some-man-pages-rpmdiff-noticed.patch | 6 +-- ...-work-some-intricacies-of-PE-loading.patch | 6 +-- ...-of-efi-chainload-so-non-sb-cases-wo.patch | 12 +++--- ...-double-free-on-verification-failure.patch | 6 +-- ...machine-type-test-in-30_os-prober.in.patch | 6 +-- ...fix-wrong-sanity-check-in-relocate_c.patch | 6 +-- ...truncate-overlong-relocation-section.patch | 6 +-- 0166-linuxefi-minor-cleanups.patch | 6 +-- ...rch-64-on-32-boot-in-linuxefi-loader.patch | 6 +-- 0168-Fix-up-linux-params-usage.patch | 6 +-- 0169-Make-exit-take-a-return-code.patch | 6 +-- ...fdt-has-address-cells-and-size-cells.patch | 8 ++-- ...rintf-in-the-secure-boot-verify-code.patch | 6 +-- ...fo-pages-say-grub2-where-appropriate.patch | 6 +-- ...more-debug-info-in-our-module-loader.patch | 6 +-- ...-chainloader-entries-don-t-try-any-x.patch | 6 +-- ...-Add-ability-to-boot-from-subvolumes.patch | 6 +-- ...port-btrfs_subvol-and-btrfs_subvolid.patch | 6 +-- 0177-grub2-btrfs-03-follow_default.patch | 6 +-- 0178-grub2-btrfs-04-grub2-install.patch | 6 +-- 0179-grub2-btrfs-05-grub2-mkconfig.patch | 6 +-- 0180-grub2-btrfs-06-subvol-mount.patch | 6 +-- ...ootable-Snapshot-submenu-in-grub.cfg.patch | 6 +-- ...subvol-name-scheme-to-support-old-sn.patch | 6 +-- ...-correctly-with-btrfs-snapshots-bsc-.patch | 6 +-- ...ocate_pool-and-grub_efi_free_pool-wr.patch | 6 +-- ...fi_.-memory-helpers-where-reasonable.patch | 6 +-- 0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch | 6 +-- ...c-sized-arrays-since-we-don-t-build-.patch | 6 +-- 0188-don-t-ignore-const.patch | 6 +-- 0189-don-t-use-int-for-efi-status.patch | 6 +-- ...INIT-declare-its-function-prototypes.patch | 6 +-- ...p-some-errors-in-the-linuxefi-loader.patch | 6 +-- 0192-editenv-handle-relative-symlinks.patch | 6 +-- ...e-libgrub.pp-depend-on-config-util.h.patch | 4 +- ...-efi-as-HFS-on-ppc-machines-in-grub-.patch | 4 +- grub2.spec | 38 +++---------------- 195 files changed, 532 insertions(+), 555 deletions(-) diff --git a/0001-Bump-version-to-2.03.patch b/0001-Bump-version-to-2.03.patch index 655a81f..fb90090 100644 --- a/0001-Bump-version-to-2.03.patch +++ b/0001-Bump-version-to-2.03.patch @@ -1,7 +1,7 @@ From b0bad6fd9449d3333fe1ab58953c0e6c1ce12c0d Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 3 May 2017 11:55:52 +0200 -Subject: [PATCH 001/192] Bump version to 2.03 +Subject: [PATCH 001/194] Bump version to 2.03 --- configure.ac | 2 +- @@ -226,5 +226,5 @@ index 68d8ce7c7..921e57ff4 100644 { "videotest", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0x7033079c, 0x7033079c, 0x7033079c, 0x7033079c, 0x7033079c, }, 5 }, { "videotest", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xff583fbf, 0xff583fbf, 0xff583fbf, 0xff583fbf, 0xff583fbf, }, 5 }, -- -2.13.4 +2.13.5 diff --git a/0002-Remove-bashisms-from-tests.patch b/0002-Remove-bashisms-from-tests.patch index f276dfc..6cfeef8 100644 --- a/0002-Remove-bashisms-from-tests.patch +++ b/0002-Remove-bashisms-from-tests.patch @@ -1,7 +1,7 @@ From 5a0c548ba388b343b0bb6d2a38888e7eac5bbb96 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 03:47:13 +0300 -Subject: [PATCH 002/192] Remove bashisms from tests. +Subject: [PATCH 002/194] Remove bashisms from tests. Those tests don't actually need bash. Just use common shebang. --- @@ -129,5 +129,5 @@ index d5ef7f9ea..80ebdc59f 100644 # create a randome file file="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1 -- -2.13.4 +2.13.5 diff --git a/0003-fs-tester-make-sh-compatible.patch b/0003-fs-tester-make-sh-compatible.patch index a786c2c..133c87a 100644 --- a/0003-fs-tester-make-sh-compatible.patch +++ b/0003-fs-tester-make-sh-compatible.patch @@ -1,7 +1,7 @@ From 37865c2c4ad26cd5e947b08abf1fde8145699919 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 14:35:59 +0300 -Subject: [PATCH 003/192] fs-tester: make sh-compatible +Subject: [PATCH 003/194] fs-tester: make sh-compatible --- tests/util/grub-fs-tester.in | 306 ++++++++++++++++++++++++------------------- @@ -742,5 +742,5 @@ index 2337771a1..4515d165e 100644 if [ x"$fs" = x"zfs" ]; then rmdir "$MNTPOINTRW"/"grub fs" || true -- -2.13.4 +2.13.5 diff --git a/0004-support-busybox-date.patch b/0004-support-busybox-date.patch index cf91c6f..90071f5 100644 --- a/0004-support-busybox-date.patch +++ b/0004-support-busybox-date.patch @@ -1,7 +1,7 @@ From b43b8cacc813c2c15347de1e35cc88d9aa912d22 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 14:31:36 +0300 -Subject: [PATCH 004/192] support busybox date. +Subject: [PATCH 004/194] support busybox date. Busybox date doesn't understand weekdays in -d input, so strip them beforehand. @@ -39,5 +39,5 @@ index 05b8f6b73..ac51d4209 100644 # Ignore QEMU bug if [ "${grub_modinfo_target_cpu}" = arm ] && [ $((dt2 - dt1)) -ge 15 ] && [ $((dt2 - dt1)) -le 17 ]; then -- -2.13.4 +2.13.5 diff --git a/0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch b/0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch index 205d26b..b4a5a39 100644 --- a/0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch +++ b/0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch @@ -1,7 +1,7 @@ From 6dec3a26b37e128ded5d912e08abc5cee1592499 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 21:24:05 +0300 -Subject: [PATCH 005/192] Don't retrieve fstime when it's not useful. +Subject: [PATCH 005/194] Don't retrieve fstime when it's not useful. --- tests/util/grub-fs-tester.in | 48 ++++++++++++++++++++++---------------------- @@ -68,5 +68,5 @@ index 4515d165e..bf47305f3 100644 if [ x$NOHARDLINK != xy ]; then -- -2.13.4 +2.13.5 diff --git a/0006-Support-lseek64.patch b/0006-Support-lseek64.patch index a7b44a8..8151cdf 100644 --- a/0006-Support-lseek64.patch +++ b/0006-Support-lseek64.patch @@ -1,7 +1,7 @@ From 608bec51128008afb81c9e3f297283e9f830a146 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 20:21:05 +0300 -Subject: [PATCH 006/192] Support lseek64. +Subject: [PATCH 006/194] Support lseek64. Android doesn't have 64-bit off_t, so use off64_t instead. --- @@ -50,5 +50,5 @@ index 2a8c5882e..5450cf416 100644 } -- -2.13.4 +2.13.5 diff --git a/0007-Use-SHELL-rather-than-bin-sh.patch b/0007-Use-SHELL-rather-than-bin-sh.patch index a938f4f..09cd145 100644 --- a/0007-Use-SHELL-rather-than-bin-sh.patch +++ b/0007-Use-SHELL-rather-than-bin-sh.patch @@ -1,7 +1,7 @@ From c2ea443446b7feea868e54f94a87781f69820375 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 00:55:30 +0300 -Subject: [PATCH 007/192] Use $(SHELL) rather than /bin/sh. +Subject: [PATCH 007/194] Use $(SHELL) rather than /bin/sh. /bin/sh doesn't exist under termux. --- @@ -22,5 +22,5 @@ index 04e9395fd..809a8aa26 100644 CLEANFILES += symlist.c BUILT_SOURCES += symlist.c -- -2.13.4 +2.13.5 diff --git a/0008-po-Use-SHELL-rather-than-bin-sh.patch b/0008-po-Use-SHELL-rather-than-bin-sh.patch index f50343a..33c7e04 100644 --- a/0008-po-Use-SHELL-rather-than-bin-sh.patch +++ b/0008-po-Use-SHELL-rather-than-bin-sh.patch @@ -1,7 +1,7 @@ From 4341f82af0b61d3dfbe675670d4105dc759c0df3 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 14:54:03 +0300 -Subject: [PATCH 008/192] po: Use @SHELL@ rather than /bin/sh. +Subject: [PATCH 008/194] po: Use @SHELL@ rather than /bin/sh. /bin/sh might not exist. --- @@ -22,5 +22,5 @@ index 3619458e8..e68e9da84 100644 srcdir = @srcdir@ -- -2.13.4 +2.13.5 diff --git a/0009-Add-termux-path-to-dict.patch b/0009-Add-termux-path-to-dict.patch index 2c5db0d..07f4a6e 100644 --- a/0009-Add-termux-path-to-dict.patch +++ b/0009-Add-termux-path-to-dict.patch @@ -1,7 +1,7 @@ From 1073ddb12078f3c8edbdb74bb8f5afc674983f40 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 14:52:48 +0300 -Subject: [PATCH 009/192] Add termux path to dict. +Subject: [PATCH 009/194] Add termux path to dict. --- tests/util/grub-fs-tester.in | 2 +- @@ -21,5 +21,5 @@ index bf47305f3..468d9e785 100644 CFILESRC="$cand" break -- -2.13.4 +2.13.5 diff --git a/0010-Fix-shebang-for-termux.patch b/0010-Fix-shebang-for-termux.patch index c6838c1..1f93e9d 100644 --- a/0010-Fix-shebang-for-termux.patch +++ b/0010-Fix-shebang-for-termux.patch @@ -1,7 +1,7 @@ From a827807a1330d5ad619faa103bc7f12d89fc8bee Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 22 Jan 2017 20:22:34 +0300 -Subject: [PATCH 010/192] Fix shebang for termux. +Subject: [PATCH 010/194] Fix shebang for termux. Termux doesn't have a /bin/sh. So we needto use $SHELL. Keep /bin/sh as much as possible. @@ -680,5 +680,5 @@ index 047120e47..eee62c10d 100644 set -e -- -2.13.4 +2.13.5 diff --git a/0011-Add-strtoull-test.patch b/0011-Add-strtoull-test.patch index 8665d58..dca6c19 100644 --- a/0011-Add-strtoull-test.patch +++ b/0011-Add-strtoull-test.patch @@ -1,7 +1,7 @@ From ede6c9689395499f98a4c14d76b97151b4de5f54 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 3 May 2017 12:58:15 +0200 -Subject: [PATCH 011/192] Add strtoull test. +Subject: [PATCH 011/194] Add strtoull test. --- grub-core/Makefile.core.def | 5 +++++ @@ -24,5 +24,5 @@ index 2dfa22a92..8dcd0e5a9 100644 common = tests/setjmp_test.c; }; -- -2.13.4 +2.13.5 diff --git a/0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch b/0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch index ba8a675..352f7ab 100644 --- a/0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch +++ b/0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch @@ -1,7 +1,7 @@ From dc6e1b5af83eb1c4290baf97c2d221c0865127be Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 10 Aug 2016 17:49:42 +0200 -Subject: [PATCH 012/192] strtoull: Fix behaviour on chars between '9' and 'a'. +Subject: [PATCH 012/194] strtoull: Fix behaviour on chars between '9' and 'a'. Reported by: Aaron Miller --- @@ -64,5 +64,5 @@ index d4822a124..96781fb39 100644 ok = ok && !grub_test_run (test); grub_errno = 0; -- -2.13.4 +2.13.5 diff --git a/0013-Add-Virtual-LAN-support.patch b/0013-Add-Virtual-LAN-support.patch index 3ac50df..3a48d3a 100644 --- a/0013-Add-Virtual-LAN-support.patch +++ b/0013-Add-Virtual-LAN-support.patch @@ -1,7 +1,7 @@ From d9f7de0ae3c0c09cff7257c55418450261f3e082 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Mon, 23 Dec 2013 12:32:02 -0200 -Subject: [PATCH 013/192] Add Virtual LAN support. +Subject: [PATCH 013/194] Add Virtual LAN support. This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allows multiple VLANs in a bridged network to share the same physical network link @@ -345,5 +345,5 @@ index dcceaa568..ab9d68f98 100644 grub_err_t grub_net_send_ip_packet (struct grub_net_network_level_interface *inf, -- -2.13.4 +2.13.5 diff --git a/0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch b/0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch index 14d65da..20574b5 100644 --- a/0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch +++ b/0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch @@ -1,7 +1,7 @@ From a35ac854308b0af7c86c2c7b199f6abdfa2110b0 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 17:32:15 +0200 -Subject: [PATCH 014/192] mkimage: Pass layout to mkimage_generate_elfXX rather +Subject: [PATCH 014/194] mkimage: Pass layout to mkimage_generate_elfXX rather than some fields. This allows easier extension of this function without having too long of @@ -164,5 +164,5 @@ index 9ad4cfe42..528166c87 100644 break; } -- -2.13.4 +2.13.5 diff --git a/0015-Refactor-arm-uboot-code-to-make-it-genereic.patch b/0015-Refactor-arm-uboot-code-to-make-it-genereic.patch index 5010968..18b666b 100644 --- a/0015-Refactor-arm-uboot-code-to-make-it-genereic.patch +++ b/0015-Refactor-arm-uboot-code-to-make-it-genereic.patch @@ -1,7 +1,7 @@ From d08c9685149e7788001ac9a209baa1d84c3628e0 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 17:47:57 +0200 -Subject: [PATCH 015/192] Refactor arm-uboot code to make it genereic. +Subject: [PATCH 015/194] Refactor arm-uboot code to make it genereic. arm-coreboot startup code can be very similar to arm-uboot but current code has U-Boot specific references. So split U-Boot part from generic part. @@ -400,5 +400,5 @@ index 000000000..9afb6c57c + +#endif -- -2.13.4 +2.13.5 diff --git a/0016-coreboot-Split-parts-that-are-platform-independent.patch b/0016-coreboot-Split-parts-that-are-platform-independent.patch index f326efb..8b5dd40 100644 --- a/0016-coreboot-Split-parts-that-are-platform-independent.patch +++ b/0016-coreboot-Split-parts-that-are-platform-independent.patch @@ -1,7 +1,7 @@ From 461bfab7b7e47fd0a76bf6076a438af1b7e2184a Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 19:06:22 +0200 -Subject: [PATCH 016/192] coreboot: Split parts that are platform-independent. +Subject: [PATCH 016/194] coreboot: Split parts that are platform-independent. We currently assume that coreboot is always i386, it's no longer the case, so split i386-coreboot parts from generic coreboot code. @@ -340,5 +340,5 @@ index 1c3fa6f19..5076d36c7 100644 + #endif -- -2.13.4 +2.13.5 diff --git a/0017-Rename-uboot-halt.c-to-dummy-halt.c.patch b/0017-Rename-uboot-halt.c-to-dummy-halt.c.patch index 9c63406..4d5ed38 100644 --- a/0017-Rename-uboot-halt.c-to-dummy-halt.c.patch +++ b/0017-Rename-uboot-halt.c-to-dummy-halt.c.patch @@ -1,7 +1,7 @@ From 1daa716c7017f1858de117a20a31da66815435c5 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 19:31:55 +0200 -Subject: [PATCH 017/192] Rename uboot/halt.c to dummy/halt.c. +Subject: [PATCH 017/194] Rename uboot/halt.c to dummy/halt.c. It's not U-Boot specific and it's a stub. --- @@ -28,5 +28,5 @@ similarity index 100% rename from grub-core/lib/uboot/halt.c rename to grub-core/lib/dummy/halt.c -- -2.13.4 +2.13.5 diff --git a/0018-Rename-uboot-datetime-to-dummy-datetime.patch b/0018-Rename-uboot-datetime-to-dummy-datetime.patch index 309e309..2e93c36 100644 --- a/0018-Rename-uboot-datetime-to-dummy-datetime.patch +++ b/0018-Rename-uboot-datetime-to-dummy-datetime.patch @@ -1,7 +1,7 @@ From 9808c3ef956c6472a96790b60cf74f4eaa742010 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 19:37:29 +0200 -Subject: [PATCH 018/192] Rename uboot/datetime to dummy/datetime. +Subject: [PATCH 018/194] Rename uboot/datetime to dummy/datetime. It's just a stub and is not UBoot-specific. --- @@ -54,5 +54,5 @@ index 4be716928..cf693fc6b 100644 + "can\'t set datetime on this machine"); } -- -2.13.4 +2.13.5 diff --git a/0019-arm-coreboot-Start-new-port.patch b/0019-arm-coreboot-Start-new-port.patch index 03e6f32..295504e 100644 --- a/0019-arm-coreboot-Start-new-port.patch +++ b/0019-arm-coreboot-Start-new-port.patch @@ -1,7 +1,7 @@ From 24e37a885269bdec9b27babf1da0bba3692d55c0 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 20:53:28 +0200 -Subject: [PATCH 019/192] arm-coreboot: Start new port. +Subject: [PATCH 019/194] arm-coreboot: Start new port. --- configure.ac | 2 + @@ -823,5 +823,5 @@ index 528166c87..6aa77ed73 100644 (unsigned) layout.kernel_size + (unsigned) layout.bss_size + GRUB_KERNEL_I386_PC_LINK_ADDR, -- -2.13.4 +2.13.5 diff --git a/0020-Add-support-for-device-tree-based-drivers.patch b/0020-Add-support-for-device-tree-based-drivers.patch index d2bdfa1..5ee0abf 100644 --- a/0020-Add-support-for-device-tree-based-drivers.patch +++ b/0020-Add-support-for-device-tree-based-drivers.patch @@ -1,7 +1,7 @@ From fcbb723d4b1f7ad4687191562621dd0eb25f4d9e Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 21:19:59 +0200 -Subject: [PATCH 020/192] Add support for device-tree-based drivers. +Subject: [PATCH 020/194] Add support for device-tree-based drivers. --- conf/Makefile.common | 4 +- @@ -847,5 +847,5 @@ index 6aa77ed73..e22d82afa 100644 { struct grub_module_header *header; -- -2.13.4 +2.13.5 diff --git a/0021-arm-coreboot-Support-for-vexpress-timer.patch b/0021-arm-coreboot-Support-for-vexpress-timer.patch index e38b9c9..d68cc32 100644 --- a/0021-arm-coreboot-Support-for-vexpress-timer.patch +++ b/0021-arm-coreboot-Support-for-vexpress-timer.patch @@ -1,7 +1,7 @@ From 5a865b37866ee8cd64c080bc6fb1e537f8e2b3c6 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 21:26:36 +0200 -Subject: [PATCH 021/192] arm-coreboot: Support for vexpress timer. +Subject: [PATCH 021/194] arm-coreboot: Support for vexpress timer. --- grub-core/kern/arm/coreboot/timer.c | 36 ++++++++++++++++++++++++++++++++++++ @@ -69,5 +69,5 @@ index ebefb99d5..d97b844f8 100644 try_generic_timer (); if (!have_timer) -- -2.13.4 +2.13.5 diff --git a/0022-arm-coreboot-Export-FDT-routines.patch b/0022-arm-coreboot-Export-FDT-routines.patch index 4532b31..063a1e9 100644 --- a/0022-arm-coreboot-Export-FDT-routines.patch +++ b/0022-arm-coreboot-Export-FDT-routines.patch @@ -1,7 +1,7 @@ From ac6b41b89fbb82a3ba843a7ed19115d81432b604 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 21:29:48 +0200 -Subject: [PATCH 022/192] arm-coreboot: Export FDT routines. +Subject: [PATCH 022/194] arm-coreboot: Export FDT routines. We need to use them from modules as well. --- @@ -23,5 +23,5 @@ index fc6ca3051..147e6959c 100644 if COND_arm_efi -- -2.13.4 +2.13.5 diff --git a/0023-at_keyboard-Split-protocol-from-controller-code.patch b/0023-at_keyboard-Split-protocol-from-controller-code.patch index 02eb6bb..6091c61 100644 --- a/0023-at_keyboard-Split-protocol-from-controller-code.patch +++ b/0023-at_keyboard-Split-protocol-from-controller-code.patch @@ -1,7 +1,7 @@ From 216950a4eea1a1ead1c28eaca94e34ea2ef2ad19 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 21:41:22 +0200 -Subject: [PATCH 023/192] at_keyboard: Split protocol from controller code. +Subject: [PATCH 023/194] at_keyboard: Split protocol from controller code. On vexpress controller is different but protocol is the same, so reuse the code. @@ -1023,5 +1023,5 @@ index 000000000..4f2e527e4 + +#endif -- -2.13.4 +2.13.5 diff --git a/0024-arm_coreboot-Support-keyboard-for-vexpress.patch b/0024-arm_coreboot-Support-keyboard-for-vexpress.patch index 961600d..2cad8da 100644 --- a/0024-arm_coreboot-Support-keyboard-for-vexpress.patch +++ b/0024-arm_coreboot-Support-keyboard-for-vexpress.patch @@ -1,7 +1,7 @@ From 848bed9d92cf20e9f25db4c69a20efad23996ca0 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 21:42:37 +0200 -Subject: [PATCH 024/192] arm_coreboot: Support keyboard for vexpress. +Subject: [PATCH 024/194] arm_coreboot: Support keyboard for vexpress. --- grub-core/Makefile.am | 1 + @@ -245,5 +245,5 @@ index 000000000..e4cda3056 + grub_fdtbus_register (&pl050); +} -- -2.13.4 +2.13.5 diff --git a/0025-arm_coreboot-Support-grub-mkstandalone.patch b/0025-arm_coreboot-Support-grub-mkstandalone.patch index 77f5d1c..b36403b 100644 --- a/0025-arm_coreboot-Support-grub-mkstandalone.patch +++ b/0025-arm_coreboot-Support-grub-mkstandalone.patch @@ -1,7 +1,7 @@ From 3edabad8fefb112cc4b2d43be6e97d43c909ceee Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 21:59:48 +0200 -Subject: [PATCH 025/192] arm_coreboot: Support grub-mkstandalone. +Subject: [PATCH 025/194] arm_coreboot: Support grub-mkstandalone. --- include/grub/util/install.h | 6 +++++- @@ -154,5 +154,5 @@ index 9074d3e9e..75e3e5ba6 100644 case GRUB_INSTALL_PLATFORM_MIPSEL_ARC: case GRUB_INSTALL_PLATFORM_ARM_UBOOT: -- -2.13.4 +2.13.5 diff --git a/0026-arm_coreboot-Support-loading-linux-images.patch b/0026-arm_coreboot-Support-loading-linux-images.patch index 061cdf0..d503a7f 100644 --- a/0026-arm_coreboot-Support-loading-linux-images.patch +++ b/0026-arm_coreboot-Support-loading-linux-images.patch @@ -1,7 +1,7 @@ From 656c3b0d7fbe23f0e1ab561c8faa4ac4a37364d1 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 22:00:06 +0200 -Subject: [PATCH 026/192] arm_coreboot: Support loading linux images. +Subject: [PATCH 026/194] arm_coreboot: Support loading linux images. --- grub-core/loader/arm/linux.c | 132 ++++++++++++++++++++++--------------------- @@ -298,5 +298,5 @@ index a66caad13..f217f8281 100644 #define FDT_ADDITIONAL_ENTRIES_SIZE 0x300 -- -2.13.4 +2.13.5 diff --git a/0027-arm_coreboot-Support-DMA.patch b/0027-arm_coreboot-Support-DMA.patch index 1741ffe..c8725a4 100644 --- a/0027-arm_coreboot-Support-DMA.patch +++ b/0027-arm_coreboot-Support-DMA.patch @@ -1,7 +1,7 @@ From 265292f2b0da0eb414c409871ba0f94a99ec33c1 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 22:06:04 +0200 -Subject: [PATCH 027/192] arm_coreboot: Support DMA. +Subject: [PATCH 027/194] arm_coreboot: Support DMA. This is needed to support USB and some other busses. --- @@ -288,5 +288,5 @@ index 70d9a0513..262c89b74 100644 grub_uint8_t EXPORT_FUNC (grub_pci_find_capability) (grub_pci_device_t dev, grub_uint8_t cap); -- -2.13.4 +2.13.5 diff --git a/0028-ehci-Split-core-code-from-PCI-part.patch b/0028-ehci-Split-core-code-from-PCI-part.patch index 0062feb..cb6d172 100644 --- a/0028-ehci-Split-core-code-from-PCI-part.patch +++ b/0028-ehci-Split-core-code-from-PCI-part.patch @@ -1,7 +1,7 @@ From 058df7b5a9cc7aaa9872eaa916b715544a8f9840 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 22:10:26 +0200 -Subject: [PATCH 028/192] ehci: Split core code from PCI part. +Subject: [PATCH 028/194] ehci: Split core code from PCI part. On ARM often EHCI is present without PCI and just declared in device tree. So splitcore from PCI part. @@ -567,5 +567,5 @@ index 5f4297bb2..c772e7654 100644 grub_usb_controller_dev_register (&usb_controller); grub_boot_time ("EHCI driver registered"); -- -2.13.4 +2.13.5 diff --git a/0029-arm_coreboot-Support-EHCI.patch b/0029-arm_coreboot-Support-EHCI.patch index 56141bb..2b2a984 100644 --- a/0029-arm_coreboot-Support-EHCI.patch +++ b/0029-arm_coreboot-Support-EHCI.patch @@ -1,7 +1,7 @@ From d11ced1e1fb93676942e51618eb53c140f541890 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 22:14:28 +0200 -Subject: [PATCH 029/192] arm_coreboot: Support EHCI. +Subject: [PATCH 029/194] arm_coreboot: Support EHCI. --- gentpl.py | 2 +- @@ -119,5 +119,5 @@ index 11d96481f..512ae1dd0 100644 #endif /* GRUB_USB_H */ -- -2.13.4 +2.13.5 diff --git a/0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch b/0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch index 6121523..dc40a0c 100644 --- a/0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch +++ b/0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch @@ -1,7 +1,7 @@ From 4f8471532d454b2db96434c28bf7105ed69e0f4d Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 9 May 2017 08:39:40 +0200 -Subject: [PATCH 030/192] Fix bug on FDT nodes with compatible property +Subject: [PATCH 030/194] Fix bug on FDT nodes with compatible property --- grub-core/bus/fdt.c | 2 ++ @@ -21,5 +21,5 @@ index 6fb077000..34d535457 100644 while (compatible < compatible_end) { -- -2.13.4 +2.13.5 diff --git a/0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch b/0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch index 5a42fad..01fae85 100644 --- a/0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch +++ b/0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch @@ -1,7 +1,7 @@ From c4313c812dc14e82a774b580b5e34d40e7f3fae6 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 9 May 2017 08:40:29 +0200 -Subject: [PATCH 031/192] fdtbus: Add ability to send/receive messages on +Subject: [PATCH 031/194] fdtbus: Add ability to send/receive messages on parent busses. --- @@ -130,5 +130,5 @@ index 985837e55..f519c40ec 100644 /* dtb is assumed to be unfreeable and must remain valid for lifetime of GRUB. -- -2.13.4 +2.13.5 diff --git a/0032-rk3288_spi-Add-SPI-driver.patch b/0032-rk3288_spi-Add-SPI-driver.patch index 3168323..7190ac8 100644 --- a/0032-rk3288_spi-Add-SPI-driver.patch +++ b/0032-rk3288_spi-Add-SPI-driver.patch @@ -1,7 +1,7 @@ From b0b1b81a11f8bae8ab9e8edd87ac3f4f7949d03b Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 9 May 2017 08:42:14 +0200 -Subject: [PATCH 032/192] rk3288_spi: Add SPI driver +Subject: [PATCH 032/194] rk3288_spi: Add SPI driver --- grub-core/Makefile.core.def | 1 + @@ -161,5 +161,5 @@ index 09cd7fe32..269505342 100644 #endif /* ! ASM_FILE */ -- -2.13.4 +2.13.5 diff --git a/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch b/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch index a7f8de0..e7ea0f4 100644 --- a/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch +++ b/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch @@ -1,7 +1,7 @@ From 5c3fd1b135bd73c8e3467b9b635b25ca4d360a19 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 9 May 2017 08:47:34 +0200 -Subject: [PATCH 033/192] arm_coreboot: Add Chromebook keyboard driver. +Subject: [PATCH 033/194] arm_coreboot: Add Chromebook keyboard driver. --- grub-core/term/arm/cros.c | 125 +++++++++++++++++++++++ @@ -415,5 +415,5 @@ index 000000000..45a372572 + +#endif -- -2.13.4 +2.13.5 diff --git a/0034-Missing-parts-of-previous-commit.patch b/0034-Missing-parts-of-previous-commit.patch index 718d03b..6278e35 100644 --- a/0034-Missing-parts-of-previous-commit.patch +++ b/0034-Missing-parts-of-previous-commit.patch @@ -1,7 +1,7 @@ From c6eaa982d12e3cfc5465dda5ea372774188b6b81 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 9 May 2017 09:02:15 +0200 -Subject: [PATCH 034/192] Missing parts of previous commit +Subject: [PATCH 034/194] Missing parts of previous commit --- grub-core/Makefile.core.def | 2 ++ @@ -34,5 +34,5 @@ index 0126ff638..8d8c5b829 100644 } -- -2.13.4 +2.13.5 diff --git a/0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch b/0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch index 5aa9e00..5594081 100644 --- a/0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch +++ b/0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch @@ -1,7 +1,7 @@ From 70b555a52a065b2beb91e6fc97a6b358c931b303 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 9 May 2017 09:03:02 +0200 -Subject: [PATCH 035/192] coreboot: Changed cbmemc to support updated console +Subject: [PATCH 035/194] coreboot: Changed cbmemc to support updated console format from coreboot. --- @@ -94,5 +94,5 @@ index 129248c7f..cea9b8431 100644 } -- -2.13.4 +2.13.5 diff --git a/0036-at_keyboard-Fix-falco-chromebook-case.patch b/0036-at_keyboard-Fix-falco-chromebook-case.patch index 31ac73b..4d229e9 100644 --- a/0036-at_keyboard-Fix-falco-chromebook-case.patch +++ b/0036-at_keyboard-Fix-falco-chromebook-case.patch @@ -1,7 +1,7 @@ From c4b8bec5fee4e30a165fd14a188cf3ab8eccd095 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 9 May 2017 14:27:52 +0200 -Subject: [PATCH 036/192] at_keyboard: Fix falco chromebook case. +Subject: [PATCH 036/194] at_keyboard: Fix falco chromebook case. EC is slow, so we need few delays for it to toggle the bits correctly. @@ -85,5 +85,5 @@ index b031523eb..bcb4d9ba7 100644 #define KEYBOARD_ISMAKE(x) !((x) & 0x80) #define KEYBOARD_ISREADY(x) ((x) & 0x01) -- -2.13.4 +2.13.5 diff --git a/0037-sparc64-Close-cdboot-ihandle.patch b/0037-sparc64-Close-cdboot-ihandle.patch index b99216d..15b5b6e 100644 --- a/0037-sparc64-Close-cdboot-ihandle.patch +++ b/0037-sparc64-Close-cdboot-ihandle.patch @@ -1,7 +1,7 @@ From bd4e40aadded7093908d786d03b4acf60b7b1707 Mon Sep 17 00:00:00 2001 From: Eric Snowberg Date: Thu, 11 May 2017 18:42:23 -0700 -Subject: [PATCH 037/192] sparc64: Close cdboot ihandle +Subject: [PATCH 037/194] sparc64: Close cdboot ihandle The ihandle is left open with a cd-core image. This will cause a delay booting grub from a virtual cdrom in a LDOM. It will also cause problems @@ -44,5 +44,5 @@ index 586efb401..9ea9b4e06 100644 mov 512, %o3 #endif -- -2.13.4 +2.13.5 diff --git a/0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch b/0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch index 91c4b21..f7e83c7 100644 --- a/0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch +++ b/0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch @@ -1,7 +1,7 @@ From ae5817f1dcbf0b99f7a849f56afe442165317840 Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Fri, 19 Feb 2016 16:28:52 +0000 -Subject: [PATCH 038/192] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64 +Subject: [PATCH 038/194] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64 Xen is currently crashing because of malformed compatible property for the boot module. This is because the property string is not @@ -28,5 +28,5 @@ index a914eb8e2..8ae43d7e8 100644 return grub_error (GRUB_ERR_IO, "failed to update FDT"); -- -2.13.4 +2.13.5 diff --git a/0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch b/0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch index 35b6b4e..d4e02fe 100644 --- a/0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch +++ b/0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch @@ -1,7 +1,7 @@ From 8eed7be8a61c295df700e918744a984162378ca9 Mon Sep 17 00:00:00 2001 From: Fu Wei Date: Sun, 14 May 2017 15:43:45 +0800 -Subject: [PATCH 039/192] arm64: Add "--nounzip" option support in xen_module +Subject: [PATCH 039/194] arm64: Add "--nounzip" option support in xen_module command This patch adds "--nounzip" option support in order to @@ -52,5 +52,5 @@ index 8ae43d7e8..27ede46ca 100644 if (!file) goto fail; -- -2.13.4 +2.13.5 diff --git a/0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch b/0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch index cfb14a5..09297ad 100644 --- a/0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch +++ b/0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch @@ -1,7 +1,7 @@ From d33045ce7ffcb7c1e4a60c14d5ca64b36e3c5abe Mon Sep 17 00:00:00 2001 From: Fu Wei Date: Sun, 14 May 2017 15:43:46 +0800 -Subject: [PATCH 040/192] util/grub.d/20_linux_xen.in: Add xen_boot command +Subject: [PATCH 040/194] util/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64 This patch adds the support of xen_boot command for aarch64: @@ -59,5 +59,5 @@ index c48af948d..c002fc9f9 100644 linux=`version_find_latest $list` gettext_printf "Found linux image: %s\n" "$linux" >&2 -- -2.13.4 +2.13.5 diff --git a/0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch b/0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch index 4a894b6..1c8d209 100644 --- a/0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch +++ b/0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch @@ -1,7 +1,7 @@ From 26c2f306fd425d2c0348023b8dcb7eb40a01851a Mon Sep 17 00:00:00 2001 From: Fu Wei Date: Sun, 14 May 2017 15:43:47 +0800 -Subject: [PATCH 041/192] arm64: Update the introduction of Xen boot commands +Subject: [PATCH 041/194] arm64: Update the introduction of Xen boot commands in docs/grub.texi delete: xen_linux, xen_initrd, xen_xsm @@ -89,5 +89,5 @@ index e935af33e..a0c4b9e4e 100644 @section The list of networking commands -- -2.13.4 +2.13.5 diff --git a/0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch b/0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch index ad0806e..4521955 100644 --- a/0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch +++ b/0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch @@ -1,7 +1,7 @@ From f8679cedff703b437171f4708d46adbfcff80a65 Mon Sep 17 00:00:00 2001 From: Eric Snowberg Date: Thu, 18 May 2017 17:10:22 -0600 -Subject: [PATCH 042/192] sparc64: Don't use devspec to determine the OBP path +Subject: [PATCH 042/194] sparc64: Don't use devspec to determine the OBP path Don't use devspec to determine the OBP path on SPARC hardware. Within all versions of Linux on SPARC, the devspec returns one of three values: @@ -49,5 +49,5 @@ index a79682a5e..dce4e59d0 100644 if (fd < 0 || fstat (fd, &st) < 0) { -- -2.13.4 +2.13.5 diff --git a/0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch b/0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch index 451b51b..4565505 100644 --- a/0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch +++ b/0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch @@ -1,7 +1,7 @@ From 734668238fcc0ef691a080839e04f33854fa133a Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 29 Jun 2017 13:27:49 +0000 -Subject: [PATCH 043/192] Allow GRUB to mount ext2/3/4 filesystems that have +Subject: [PATCH 043/194] Allow GRUB to mount ext2/3/4 filesystems that have the encryption feature. On such a filesystem, inodes may have EXT4_ENCRYPT_FLAG set. @@ -136,5 +136,5 @@ index 88cbe7365..fd7e0f14b 100644 MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.$fs" -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" ;; xxfs) -- -2.13.4 +2.13.5 diff --git a/0044-ehci-Fix-compilation-for-amd64.patch b/0044-ehci-Fix-compilation-for-amd64.patch index 664d9a6..accd423 100644 --- a/0044-ehci-Fix-compilation-for-amd64.patch +++ b/0044-ehci-Fix-compilation-for-amd64.patch @@ -1,7 +1,7 @@ From edb37fb30bbc8a3b6bec67911c7200e4eb071127 Mon Sep 17 00:00:00 2001 From: phcoder Date: Sun, 9 Jul 2017 20:58:31 +0200 -Subject: [PATCH 044/192] ehci: Fix compilation for amd64 +Subject: [PATCH 044/194] ehci: Fix compilation for amd64 --- grub-core/bus/usb/ehci.c | 8 ++++---- @@ -34,5 +34,5 @@ index c772e7654..7b7061f53 100644 grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND)); grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n", -- -2.13.4 +2.13.5 diff --git a/0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch b/0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch index 31e6144..cd1f508 100644 --- a/0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch +++ b/0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch @@ -1,7 +1,7 @@ From d8901e3ba115d705c9c08ecedd201aca8b4867b8 Mon Sep 17 00:00:00 2001 From: phcoder Date: Sun, 9 Jul 2017 20:59:15 +0200 -Subject: [PATCH 045/192] cache: Fix compilation for ppc, sparc and arm64 +Subject: [PATCH 045/194] cache: Fix compilation for ppc, sparc and arm64 --- include/grub/cache.h | 4 +++- @@ -23,5 +23,5 @@ index 1c98ce270..ccfa717e6 100644 grub_arch_sync_dma_caches (volatile void *address __attribute__ ((unused)), grub_size_t len __attribute__ ((unused))) -- -2.13.4 +2.13.5 diff --git a/0046-ehci-Fix-compilation-on-i386.patch b/0046-ehci-Fix-compilation-on-i386.patch index 9196dfc..52f4468 100644 --- a/0046-ehci-Fix-compilation-on-i386.patch +++ b/0046-ehci-Fix-compilation-on-i386.patch @@ -1,7 +1,7 @@ From 284afab081ef7ed7db2c59151853aa3c92d988f2 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 9 Jul 2017 21:31:19 +0200 -Subject: [PATCH 046/192] ehci: Fix compilation on i386 +Subject: [PATCH 046/194] ehci: Fix compilation on i386 --- grub-core/bus/usb/ehci.c | 4 ++-- @@ -30,5 +30,5 @@ index 7b7061f53..d966fc210 100644 grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND)); grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n", -- -2.13.4 +2.13.5 diff --git a/0047-crypto-Fix-use-after-free.patch b/0047-crypto-Fix-use-after-free.patch index b9d4a8b..b9a8940 100644 --- a/0047-crypto-Fix-use-after-free.patch +++ b/0047-crypto-Fix-use-after-free.patch @@ -1,7 +1,7 @@ From a0fe0c26aa8a1c0ad66d9527611bd726b849c623 Mon Sep 17 00:00:00 2001 From: AppChecker Date: Sun, 9 Jul 2017 21:57:35 +0200 -Subject: [PATCH 047/192] crypto: Fix use after free. +Subject: [PATCH 047/194] crypto: Fix use after free. Reported by: AppChecker Transformed to patch by: Satish Govindarajan @@ -24,5 +24,5 @@ index 2bfd67c8e..e6d345f33 100644 } cur->next = crypto_specs; -- -2.13.4 +2.13.5 diff --git a/0048-arm-efi-Fix-compilation.patch b/0048-arm-efi-Fix-compilation.patch index 05f6aa7..2b37e39 100644 --- a/0048-arm-efi-Fix-compilation.patch +++ b/0048-arm-efi-Fix-compilation.patch @@ -1,7 +1,7 @@ From cb8b7e4e36bf32dccbbba8252aa44ad3ada4fbc1 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 9 Jul 2017 21:48:37 +0000 -Subject: [PATCH 048/192] arm-efi: Fix compilation +Subject: [PATCH 048/194] arm-efi: Fix compilation --- grub-core/loader/arm/linux.c | 8 ++++---- @@ -37,5 +37,5 @@ index 260cbf068..e64c79a95 100644 } -- -2.13.4 +2.13.5 diff --git a/0049-fdt-silence-clang-warning.patch b/0049-fdt-silence-clang-warning.patch index 2067ccf..fc1f552 100644 --- a/0049-fdt-silence-clang-warning.patch +++ b/0049-fdt-silence-clang-warning.patch @@ -1,7 +1,7 @@ From 68d54b55f49249c5e0517bf189f0f3df7ee6a36f Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 10 Jul 2017 01:34:22 +0000 -Subject: [PATCH 049/192] fdt: silence clang warning. +Subject: [PATCH 049/194] fdt: silence clang warning. --- grub-core/lib/fdt.c | 3 ++- @@ -22,5 +22,5 @@ index bdc630244..2705f2629 100644 return 0; return token; -- -2.13.4 +2.13.5 diff --git a/0050-Fix-a-segfault-in-lsefi.patch b/0050-Fix-a-segfault-in-lsefi.patch index 8e0dc53..348bb1a 100644 --- a/0050-Fix-a-segfault-in-lsefi.patch +++ b/0050-Fix-a-segfault-in-lsefi.patch @@ -1,7 +1,7 @@ From e8ab5a1a9e2889eb59d1fa494ba441a53698dcd2 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Wed, 19 Jul 2017 15:47:41 -0400 -Subject: [PATCH 050/192] Fix a segfault in lsefi +Subject: [PATCH 050/194] Fix a segfault in lsefi when protocols_per_handle returns error, we can't use the pointers we passed to it, and that includes trusting num_protocols. @@ -29,5 +29,5 @@ index d901c3892..d1ce99af4 100644 { for (k = 0; k < ARRAY_SIZE (known_protocols); k++) -- -2.13.4 +2.13.5 diff --git a/0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch b/0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch index a87a1b3..b7ab69c 100644 --- a/0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch +++ b/0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch @@ -1,7 +1,7 @@ From fa42786264cef98c56e972b3bb6b8448000e1c70 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 3 Aug 2017 15:46:15 +0100 -Subject: [PATCH 051/192] zfs: remove size_t typedef and use grub_size_t +Subject: [PATCH 051/194] zfs: remove size_t typedef and use grub_size_t instead * Prevents some toolchains from issuing a warning on size_t redef. @@ -55,5 +55,5 @@ index 2f73449f0..5453822d0 100644 const int dec2 = 0; #endif -- -2.13.4 +2.13.5 diff --git a/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch b/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch index ce736cf..2174ca7 100644 --- a/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch +++ b/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch @@ -1,7 +1,7 @@ From 76188809d5ca40c5285b0ab202b5edea7be3f04d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Thu, 22 Jun 2017 14:33:17 +0200 -Subject: [PATCH 052/192] udf: Fix reading label, lvd.ident is dstring +Subject: [PATCH 052/194] udf: Fix reading label, lvd.ident is dstring UDF dstring has stored length in the last byte of buffer. Therefore last byte is not part of recorded characters. And empty string in dstring is @@ -50,5 +50,5 @@ index 839bff889..258745633 100644 } else -- -2.13.4 +2.13.5 diff --git a/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch b/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch index 53c920e..5be7e28 100644 --- a/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch +++ b/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch @@ -1,7 +1,7 @@ From 435fa75e01ef40917239c7f775e505e86f70d202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Thu, 22 Jun 2017 14:42:16 +0200 -Subject: [PATCH 053/192] * grub-core/fs/udf.c: Add support for UUID +Subject: [PATCH 053/194] * grub-core/fs/udf.c: Add support for UUID Use same algorithm as in libblkid from util-linux v2.30. @@ -187,5 +187,5 @@ index 258745633..00a16098b 100644 .reserved_first_sector = 1, .blocklist_install = 1, -- -2.13.4 +2.13.5 diff --git a/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch b/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch index 4ea9e95..163c96a 100644 --- a/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch +++ b/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch @@ -1,7 +1,7 @@ From 9e962fd3c42081e2eef1f99a0eaab38fd04d2620 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 7 Aug 2017 18:05:17 +0200 -Subject: [PATCH 054/192] mkrescue: Check xorriso presence before doing +Subject: [PATCH 054/194] mkrescue: Check xorriso presence before doing anything else. mkrescue can't do anything useful without xorriso, so abort early if it's @@ -46,5 +46,5 @@ index 238d4840e..38f154397 100644 grub_hostfs_init (); grub_host_init (); -- -2.13.4 +2.13.5 diff --git a/0055-Fail-if-xorriso-failed.patch b/0055-Fail-if-xorriso-failed.patch index 2de8c81..1038231 100644 --- a/0055-Fail-if-xorriso-failed.patch +++ b/0055-Fail-if-xorriso-failed.patch @@ -1,7 +1,7 @@ From e66dc5d71ebfc9763420a76c274e6980d54641c3 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 7 Aug 2017 18:08:39 +0200 -Subject: [PATCH 055/192] Fail if xorriso failed. +Subject: [PATCH 055/194] Fail if xorriso failed. If xorriso failed most likely we didn't generate a meaningful image. --- @@ -40,5 +40,5 @@ index 38f154397..9545945d8 100644 grub_util_unlink_recursive (iso9660_dir); -- -2.13.4 +2.13.5 diff --git a/0056-efi-refactor-grub_efi_allocate_pages.patch b/0056-efi-refactor-grub_efi_allocate_pages.patch index 2b8390d..48b553f 100644 --- a/0056-efi-refactor-grub_efi_allocate_pages.patch +++ b/0056-efi-refactor-grub_efi_allocate_pages.patch @@ -1,7 +1,7 @@ From dd5fde2df83c5c03b7ba04d2cc5b7be96de8da7b Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 3 Aug 2017 11:04:23 +0100 -Subject: [PATCH 056/192] efi: refactor grub_efi_allocate_pages +Subject: [PATCH 056/194] efi: refactor grub_efi_allocate_pages Expose a new function, grub_efi_allocate_pages_real(), making it possible to specify allocation type and memory type as supported by the UEFI @@ -116,5 +116,5 @@ index e9c601f34..b4cbebf38 100644 grub_efi_uintn_t pages); void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address, -- -2.13.4 +2.13.5 diff --git a/0057-Remove-grub_efi_allocate_pages.patch b/0057-Remove-grub_efi_allocate_pages.patch index 207fc05..a820211 100644 --- a/0057-Remove-grub_efi_allocate_pages.patch +++ b/0057-Remove-grub_efi_allocate_pages.patch @@ -1,7 +1,7 @@ From 4bc909bf89f5b4ff86c9e4e609d4fe0c11a66b0c Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 7 Aug 2017 18:33:29 +0200 -Subject: [PATCH 057/192] Remove grub_efi_allocate_pages. +Subject: [PATCH 057/194] Remove grub_efi_allocate_pages. grub_efi_allocate_pages Essentially does 2 unrelated things: * Allocate at fixed address. @@ -248,5 +248,5 @@ index b4cbebf38..3fa082816 100644 grub_efi_uintn_t pages); int -- -2.13.4 +2.13.5 diff --git a/0058-efi-move-fdt-helper-library.patch b/0058-efi-move-fdt-helper-library.patch index 3ac4ea5..b4b8b8d 100644 --- a/0058-efi-move-fdt-helper-library.patch +++ b/0058-efi-move-fdt-helper-library.patch @@ -1,7 +1,7 @@ From 8c9465fac901caac6802d6872a1374518b001517 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 3 Aug 2017 11:04:24 +0100 -Subject: [PATCH 058/192] efi: move fdt helper library +Subject: [PATCH 058/194] efi: move fdt helper library There is nothing ARM64 (or even ARM) specific about the efi fdt helper library, which is used for locating or overriding a firmware-provided @@ -89,5 +89,5 @@ similarity index 100% rename from include/grub/arm64/fdtload.h rename to include/grub/efi/fdtload.h -- -2.13.4 +2.13.5 diff --git a/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch b/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch index 74da631..f584828 100644 --- a/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch +++ b/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch @@ -1,7 +1,7 @@ From c5841ba7f0d14c193f20854e7e55b4f7ce9207d5 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 3 Aug 2017 11:04:25 +0100 -Subject: [PATCH 059/192] efi: Add GRUB_PE32_MAGIC definition +Subject: [PATCH 059/194] efi: Add GRUB_PE32_MAGIC definition Add a generic GRUB_PE32_MAGIC definition for the PE 'MZ' tag and delete the existing one in arm64/linux.h. @@ -55,5 +55,5 @@ index f79c36c02..7d44732d2 100644 But some examples (such as EFI drivers in the Intel Sample Implementation) use 32 bytes (0x20) instead, and it seems -- -2.13.4 +2.13.5 diff --git a/0060-arm64-linux-loader-improve-type-portability.patch b/0060-arm64-linux-loader-improve-type-portability.patch index 1f8dcdc..e34dbd0 100644 --- a/0060-arm64-linux-loader-improve-type-portability.patch +++ b/0060-arm64-linux-loader-improve-type-portability.patch @@ -1,7 +1,7 @@ From 91212e0aa07e704a61e4540c18a27f149f5e51c3 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 3 Aug 2017 11:04:26 +0100 -Subject: [PATCH 060/192] arm64 linux loader: improve type portability +Subject: [PATCH 060/194] arm64 linux loader: improve type portability In preparation for turning this into a common loader for 32-bit and 64-bit platforms, ensure the code will compile cleanly for either. @@ -111,5 +111,5 @@ index 091e9ddf4..17212c38d 100644 fdt = NULL; } -- -2.13.4 +2.13.5 diff --git a/0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch b/0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch index d3d5191..c0c7207 100644 --- a/0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch +++ b/0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch @@ -1,7 +1,7 @@ From f826330683675f0deb55b58fd229afd7d65fb053 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 3 Aug 2017 11:04:32 +0100 -Subject: [PATCH 061/192] efi: change heap allocation type to +Subject: [PATCH 061/194] efi: change heap allocation type to GRUB_EFI_LOADER_CODE With upcoming changes to EDK2, allocations of type EFI_LOADER_DATA may @@ -32,5 +32,5 @@ index b97b05fe8..ac2a4c556 100644 grub_fatal ("cannot allocate conventional memory %p with %u pages", (void *) ((grub_addr_t) start), -- -2.13.4 +2.13.5 diff --git a/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch b/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch index 45efac5..74fb5f6 100644 --- a/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch +++ b/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch @@ -1,7 +1,7 @@ From bdd89d239cd9b4089630bfb5ec862aab8086dca2 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 7 Aug 2017 16:20:30 +0100 -Subject: [PATCH 062/192] core: use GRUB_TERM_ definitions when handling term +Subject: [PATCH 062/194] core: use GRUB_TERM_ definitions when handling term characters * Also use hex value for GRUB_TERM_ESC as '\e' is not in the C standard and is not understood by some compilers @@ -261,5 +261,5 @@ index 5ffb38f69..8117e2a24 100644 #define GRUB_TERM_BACKSPACE '\b' -- -2.13.4 +2.13.5 diff --git a/0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch b/0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch index 4090efd..b2d4ab6 100644 --- a/0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch +++ b/0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch @@ -1,7 +1,7 @@ From 1deebd85ef87cc581e995ce0a51dc0802ac9c367 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 7 Aug 2017 16:23:12 +0100 -Subject: [PATCH 063/192] io: add a GRUB_GZ prefix to gzio specific defines +Subject: [PATCH 063/194] io: add a GRUB_GZ prefix to gzio specific defines * This is done to avoid a conflict with a PACKED define in the EDK2 --- @@ -81,5 +81,5 @@ index 0f2ea6bd8..a8e33033b 100644 /* TRANSLATORS: It's about given file having some strange format, not complete lack of gzip support. */ -- -2.13.4 +2.13.5 diff --git a/0064-info-in-builddir.patch b/0064-info-in-builddir.patch index 61811a5..84cca1c 100644 --- a/0064-info-in-builddir.patch +++ b/0064-info-in-builddir.patch @@ -1,7 +1,7 @@ From 5cf0df8753c19e83251c7244cafe38869a65060f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 8 Aug 2017 13:08:59 -0400 -Subject: [PATCH 064/192] info-in-builddir +Subject: [PATCH 064/194] info-in-builddir --- docs/Makefile.am | 2 +- @@ -18,5 +18,5 @@ index 93eb39627..e396ba10f 100644 # AM_MAKEINFOFLAGS = --no-split --no-validate info_TEXINFOS = grub.texi grub-dev.texi -- -2.13.4 +2.13.5 diff --git a/0065-re-write-.gitignore.patch b/0065-re-write-.gitignore.patch index f36028a..e6d919a 100644 --- a/0065-re-write-.gitignore.patch +++ b/0065-re-write-.gitignore.patch @@ -1,7 +1,7 @@ From ff9da35fd789354cc1490b75893e765771808352 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 8 Aug 2017 12:48:04 -0400 -Subject: [PATCH 065/192] re-write .gitignore +Subject: [PATCH 065/194] re-write .gitignore --- .gitignore | 352 ++++++++++++-------------------------- @@ -496,5 +496,5 @@ index 000000000..b7e1eb124 @@ -0,0 +1 @@ +grub -- -2.13.4 +2.13.5 diff --git a/0066-IBM-client-architecture-CAS-reboot-support.patch b/0066-IBM-client-architecture-CAS-reboot-support.patch index 2c02308..7138208 100644 --- a/0066-IBM-client-architecture-CAS-reboot-support.patch +++ b/0066-IBM-client-architecture-CAS-reboot-support.patch @@ -1,7 +1,7 @@ From 34423216f8f3d7ce6086e2f1ee9869407e6a2221 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Thu, 20 Sep 2012 18:07:39 -0300 -Subject: [PATCH 066/192] IBM client architecture (CAS) reboot support +Subject: [PATCH 066/194] IBM client architecture (CAS) reboot support This is an implementation of IBM client architecture (CAS) reboot for GRUB. @@ -170,5 +170,5 @@ index 8e4251303..9f26c69a2 100644 #define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));) -- -2.13.4 +2.13.5 diff --git a/0067-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0067-for-ppc-reset-console-display-attr-when-clear-screen.patch index 8a45c9e..917ec59 100644 --- a/0067-for-ppc-reset-console-display-attr-when-clear-screen.patch +++ b/0067-for-ppc-reset-console-display-attr-when-clear-screen.patch @@ -1,7 +1,7 @@ From 070dc282d3cc6602571296e90945df9d4671aecb Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 24 Apr 2013 10:51:48 -0300 -Subject: [PATCH 067/192] for ppc, reset console display attr when clear screen +Subject: [PATCH 067/194] for ppc, reset console display attr when clear screen v2: Also use \x0c instead of a literal ^L to make future patches less awkward. @@ -28,5 +28,5 @@ index d317efa36..29df35e6d 100644 data->reverse_video_off = grub_strdup ("\e[m"); if (grub_strcmp ("ieee1275", str) == 0) -- -2.13.4 +2.13.5 diff --git a/0068-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0068-Disable-GRUB-video-support-for-IBM-power-machines.patch index 4932e92..bbcf776 100644 --- a/0068-Disable-GRUB-video-support-for-IBM-power-machines.patch +++ b/0068-Disable-GRUB-video-support-for-IBM-power-machines.patch @@ -1,7 +1,7 @@ From 4e31478fdf4cda470305c1bb2acb9b820e790757 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 11 Jun 2013 15:14:05 -0300 -Subject: [PATCH 068/192] Disable GRUB video support for IBM power machines +Subject: [PATCH 068/194] Disable GRUB video support for IBM power machines Should fix the problem in bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=973205 @@ -61,5 +61,5 @@ index 9f26c69a2..ab4f284c3 100644 extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag); -- -2.13.4 +2.13.5 diff --git a/0069-Honor-a-symlink-when-generating-configuration-by-gru.patch b/0069-Honor-a-symlink-when-generating-configuration-by-gru.patch index e8a79de..33b11ed 100644 --- a/0069-Honor-a-symlink-when-generating-configuration-by-gru.patch +++ b/0069-Honor-a-symlink-when-generating-configuration-by-gru.patch @@ -1,7 +1,7 @@ From 35535549324923af7fecf79cc739baba48246f21 Mon Sep 17 00:00:00 2001 From: Marcel Kolaja Date: Tue, 21 Jan 2014 10:57:08 -0500 -Subject: [PATCH 069/192] Honor a symlink when generating configuration by +Subject: [PATCH 069/194] Honor a symlink when generating configuration by grub2-mkconfig Honor a symlink when generating configuration by grub2-mkconfig, so that @@ -25,5 +25,5 @@ index f8496d28b..3b070fd76 100644 fi -- -2.13.4 +2.13.5 diff --git a/0070-Move-bash-completion-script-922997.patch b/0070-Move-bash-completion-script-922997.patch index 5fe88c6..6c33653 100644 --- a/0070-Move-bash-completion-script-922997.patch +++ b/0070-Move-bash-completion-script-922997.patch @@ -1,7 +1,7 @@ From 999bbc2002275efce284aed6e1e31b3ca351fa19 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Apr 2013 14:35:34 -0400 -Subject: [PATCH 070/192] Move bash completion script (#922997) +Subject: [PATCH 070/194] Move bash completion script (#922997) Apparently these go in a new place now. --- @@ -51,5 +51,5 @@ index 136287cf1..61108f054 100644 $(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status -- -2.13.4 +2.13.5 diff --git a/0071-Update-to-minilzo-2.08.patch b/0071-Update-to-minilzo-2.08.patch index e949241..0bffbdd 100644 --- a/0071-Update-to-minilzo-2.08.patch +++ b/0071-Update-to-minilzo-2.08.patch @@ -1,7 +1,7 @@ From c0977f7fd42e16cc568af7ae667a2aeda85eb583 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Dec 2014 15:36:09 -0500 -Subject: [PATCH 071/192] Update to minilzo-2.08 +Subject: [PATCH 071/194] Update to minilzo-2.08 This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow @@ -8786,5 +8786,5 @@ index 74fefa9fe..793745467 100644 -- -2.13.4 +2.13.5 diff --git a/0072-Allow-fallback-to-include-entries-by-title-not-just-.patch b/0072-Allow-fallback-to-include-entries-by-title-not-just-.patch index 114fae6..04a51b2 100644 --- a/0072-Allow-fallback-to-include-entries-by-title-not-just-.patch +++ b/0072-Allow-fallback-to-include-entries-by-title-not-just-.patch @@ -1,7 +1,7 @@ From 15e9ccc8abd5621107788bea6ae6f2bdb27a3ed3 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 5 Sep 2014 10:07:04 -0400 -Subject: [PATCH 072/192] Allow "fallback" to include entries by title, not +Subject: [PATCH 072/194] Allow "fallback" to include entries by title, not just number. Resolves: rhbz#1026084 @@ -140,5 +140,5 @@ index e7a83c2d6..d2f64b05e 100644 static int get_entry_number (grub_menu_t menu, const char *name) -- -2.13.4 +2.13.5 diff --git a/0073-Add-GRUB_DISABLE_UUID.patch b/0073-Add-GRUB_DISABLE_UUID.patch index 5e686c7..9498050 100644 --- a/0073-Add-GRUB_DISABLE_UUID.patch +++ b/0073-Add-GRUB_DISABLE_UUID.patch @@ -1,7 +1,7 @@ From 87602724b509a60628623baabf5a2c7741a68884 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 16:49:25 -0400 -Subject: [PATCH 073/192] Add GRUB_DISABLE_UUID. +Subject: [PATCH 073/194] 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 @@ -95,5 +95,5 @@ index 60b31cadd..cf35e4174 100644 else echo $device |sed 's, ,_,g' -- -2.13.4 +2.13.5 diff --git a/0074-Make-exit-take-a-return-code.patch b/0074-Make-exit-take-a-return-code.patch index c8a51bd..51a19cf 100644 --- a/0074-Make-exit-take-a-return-code.patch +++ b/0074-Make-exit-take-a-return-code.patch @@ -1,7 +1,7 @@ From 68d514b51b81911d8359d7825618112dae4a44d9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 26 Feb 2014 21:49:12 -0500 -Subject: [PATCH 074/192] Make "exit" take a return code. +Subject: [PATCH 074/194] 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 @@ -255,5 +255,5 @@ index 2a9f87cc2..062081437 100644 grub_uint64_t d, grub_uint64_t *r); -- -2.13.4 +2.13.5 diff --git a/0075-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch b/0075-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch index cf69cee..49b545d 100644 --- a/0075-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch +++ b/0075-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: Peter Jones Date: Wed, 22 Jul 2015 11:21:01 -0400 -Subject: [PATCH 075/192] Mark po/exclude.pot as binary so git won't try to +Subject: [PATCH 075/194] Mark po/exclude.pot as binary so git won't try to diff nonprintables. Signed-off-by: Peter Jones @@ -18,5 +18,5 @@ index 000000000..33ffaa404 @@ -0,0 +1 @@ +po/exclude.pot binary -- -2.13.4 +2.13.5 diff --git a/0076-Make-efi-machines-load-an-env-block-from-a-variable.patch b/0076-Make-efi-machines-load-an-env-block-from-a-variable.patch index 82d1fc5..8fea681 100644 --- a/0076-Make-efi-machines-load-an-env-block-from-a-variable.patch +++ b/0076-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: Peter Jones Date: Mon, 7 Dec 2015 14:20:49 -0500 -Subject: [PATCH 076/192] Make efi machines load an env block from a variable +Subject: [PATCH 076/194] Make efi machines load an env block from a variable Signed-off-by: Peter Jones --- @@ -80,5 +80,5 @@ index 2c31847bf..f7782b6e1 100644 char **path); -- -2.13.4 +2.13.5 diff --git a/0077-DHCP-client-ID-and-UUID-options-added.patch b/0077-DHCP-client-ID-and-UUID-options-added.patch index 9d64246..3e98429 100644 --- a/0077-DHCP-client-ID-and-UUID-options-added.patch +++ b/0077-DHCP-client-ID-and-UUID-options-added.patch @@ -1,7 +1,7 @@ From 8a0b654a520e407da69e0cf64f3dd6bb7cf86240 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 17:18:53 -0200 -Subject: [PATCH 077/192] DHCP client ID and UUID options added. +Subject: [PATCH 077/194] DHCP client ID and UUID options added. --- grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++----- @@ -141,5 +141,5 @@ index 1096b2432..e266bae23 100644 }; -- -2.13.4 +2.13.5 diff --git a/0078-trim-arp-packets-with-abnormal-size.patch b/0078-trim-arp-packets-with-abnormal-size.patch index 8f28829..ef000b1 100644 --- a/0078-trim-arp-packets-with-abnormal-size.patch +++ b/0078-trim-arp-packets-with-abnormal-size.patch @@ -1,7 +1,7 @@ -From adbdeea1eaf60e01f7aa5df34ea1050878476ed3 Mon Sep 17 00:00:00 2001 +From c0fa21c8898437747ce093884e6aba48d45ac329 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 5 Feb 2014 09:42:42 -0200 -Subject: [PATCH 078/192] trim arp packets with abnormal size +Subject: [PATCH 078/194] 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. @@ -10,7 +10,7 @@ is foobared, GRUB needs to trim the arp response packet before sending it. 1 file changed, 6 insertions(+) diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c -index 54306e3b1..d1c69ed2b 100644 +index 54306e3b1..2083b5a4b 100644 --- a/grub-core/net/arp.c +++ b/grub-core/net/arp.c @@ -150,6 +150,12 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card, @@ -19,7 +19,7 @@ index 54306e3b1..d1c69ed2b 100644 { + if ((nb->tail - nb->data) > 50) + { -+ grub_dprintf ("net", "arp packet with abnormal size (%ld bytes).\n", ++ grub_dprintf ("net", "arp packet with abnormal size (%d bytes).\n", + nb->tail - nb->data); + nb->tail = nb->data + 50; + } @@ -27,5 +27,5 @@ index 54306e3b1..d1c69ed2b 100644 struct grub_net_buff nb_reply; struct arppkt *arp_reply; -- -2.13.4 +2.13.5 diff --git a/0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch b/0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch index 1b42b14..076026c 100644 --- a/0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch +++ b/0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch @@ -1,7 +1,7 @@ -From 0703a4c9e31d04907a5b8ecfa8f98dbbd583ae17 Mon Sep 17 00:00:00 2001 +From 60262dc77512d017974f38768d7492b4588d54f0 Mon Sep 17 00:00:00 2001 From: Prarit Bhargava Date: Wed, 12 Mar 2014 10:58:16 -0400 -Subject: [PATCH 079/192] Fix bad test on GRUB_DISABLE_SUBMENU. +Subject: [PATCH 079/194] Fix bad test on GRUB_DISABLE_SUBMENU. The file /etc/grub.d/10_linux does @@ -37,5 +37,5 @@ index de9044c7f..cf6331f2a 100644 "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -- -2.13.4 +2.13.5 diff --git a/0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch b/0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch index cf783a2..a80e104 100644 --- a/0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch +++ b/0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch @@ -1,7 +1,7 @@ -From 7da79a8ccf620ec3ce840b52888652fb4cae6d2f Mon Sep 17 00:00:00 2001 +From 699b7db9cabfe5e2dd48e61fcb079a91df3af4a7 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 12 Jun 2013 11:51:49 -0400 -Subject: [PATCH 080/192] Add support for UEFI operating systems returned by +Subject: [PATCH 080/194] Add support for UEFI operating systems returned by os-prober os-prober returns UEFI operating systems in the form: @@ -46,5 +46,5 @@ index 515a68c7a..9b8f5968e 100644 esac done -- -2.13.4 +2.13.5 diff --git a/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch index 7ca2a00..bcaac73 100644 --- a/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch +++ b/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch @@ -1,7 +1,7 @@ -From c61d269591b80943a643daa0576817d1472c6e75 Mon Sep 17 00:00:00 2001 +From 91b2efdd5e9c3b0784d0a70282407324f07a30b8 Mon Sep 17 00:00:00 2001 From: Mark Hamzy Date: Wed, 28 Mar 2012 14:46:41 -0500 -Subject: [PATCH 081/192] Migrate PPC from Yaboot to Grub2 +Subject: [PATCH 081/194] 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. @@ -150,5 +150,5 @@ index 000000000..10d665868 + terminfo -g ${X}x${Y} ${TERMINAL} +EOF -- -2.13.4 +2.13.5 diff --git a/0082-Add-fw_path-variable-revised.patch b/0082-Add-fw_path-variable-revised.patch index a10aed5..42cdf2b 100644 --- a/0082-Add-fw_path-variable-revised.patch +++ b/0082-Add-fw_path-variable-revised.patch @@ -1,7 +1,7 @@ -From 3fd7e5fa14a3edd982f62685dbc2f3a3901dc932 Mon Sep 17 00:00:00 2001 +From bcb1f1a6a5530ecbc4b674e61acbb406592714c6 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 19 Sep 2012 21:22:55 -0300 -Subject: [PATCH 082/192] Add fw_path variable (revised) +Subject: [PATCH 082/194] 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 @@ -77,5 +77,5 @@ index 249e19bc7..759c475c4 100644 prefix = grub_env_get ("prefix"); if (prefix) -- -2.13.4 +2.13.5 diff --git a/0083-Add-support-for-linuxefi.patch b/0083-Add-support-for-linuxefi.patch index 4b594c4..ee42905 100644 --- a/0083-Add-support-for-linuxefi.patch +++ b/0083-Add-support-for-linuxefi.patch @@ -1,7 +1,7 @@ -From 6df27b02eb4815f535b5f7e6b4987c67f1506545 Mon Sep 17 00:00:00 2001 +From 28136df7d90f865a8030a0ff6513dacb3096dc10 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 10 Jul 2012 11:58:52 -0400 -Subject: [PATCH 083/192] Add support for linuxefi +Subject: [PATCH 083/194] Add support for linuxefi --- grub-core/Makefile.core.def | 8 + @@ -478,5 +478,5 @@ index da0ca3b83..fc36bdaf3 100644 /* Boot parameters for Linux based on 2.6.12. This is used by the setup -- -2.13.4 +2.13.5 diff --git a/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch b/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch index 0db3d7a..f4676d4 100644 --- a/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch +++ b/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch @@ -1,7 +1,7 @@ -From 6a8677e6fc4a5809519e3b31941728e7c74b6098 Mon Sep 17 00:00:00 2001 +From e915644108ed022ad0cc5d2d987f116d2605bcf2 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 16 Jul 2012 18:57:11 -0400 -Subject: [PATCH 084/192] Use "linuxefi" and "initrdefi" where appropriate. +Subject: [PATCH 084/194] Use "linuxefi" and "initrdefi" where appropriate. --- util/grub.d/10_linux.in | 18 ++++++++++++++++-- @@ -46,5 +46,5 @@ index cf6331f2a..8ccf012f7 100644 sed "s/^/$submenu_indentation/" << EOF } -- -2.13.4 +2.13.5 diff --git a/0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch b/0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch index 635fba0..2bff02f 100644 --- a/0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch +++ b/0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch @@ -1,7 +1,7 @@ -From e7f79b18704982a8e589433e49e9d5f0408adf66 Mon Sep 17 00:00:00 2001 +From b1eb9a8b9aa961bf6b6f40d6b4d22a5741f29ae4 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 23 Oct 2012 10:40:49 -0400 -Subject: [PATCH 085/192] Don't allow insmod when secure boot is enabled. +Subject: [PATCH 085/194] Don't allow insmod when secure boot is enabled. Hi, @@ -120,5 +120,5 @@ index 91e29ce66..bb3ab7dfd 100644 EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1, const grub_efi_device_path_t *dp2); -- -2.13.4 +2.13.5 diff --git a/0086-Pass-x-hex-hex-straight-through-unmolested.patch b/0086-Pass-x-hex-hex-straight-through-unmolested.patch index 9bfee06..0f7da97 100644 --- a/0086-Pass-x-hex-hex-straight-through-unmolested.patch +++ b/0086-Pass-x-hex-hex-straight-through-unmolested.patch @@ -1,7 +1,7 @@ -From 41b59196e7114f06b498910640193a817b615db7 Mon Sep 17 00:00:00 2001 +From cc8be4cafeb5a0af779afe5d2856da434c165612 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 1 Oct 2012 13:24:37 -0400 -Subject: [PATCH 086/192] Pass "\x[[:hex:]][[:hex:]]" straight through +Subject: [PATCH 086/194] Pass "\x[[:hex:]][[:hex:]]" straight through unmolested. --- @@ -179,5 +179,5 @@ index ab78ca87f..cf6cd6601 100644 case '$': if (escaped) -- -2.13.4 +2.13.5 diff --git a/0087-Add-X-option-to-printf-functions.patch b/0087-Add-X-option-to-printf-functions.patch index 94586a8..37bf66b 100644 --- a/0087-Add-X-option-to-printf-functions.patch +++ b/0087-Add-X-option-to-printf-functions.patch @@ -1,7 +1,7 @@ -From bedc2b207a941b590155dd66047ac4d831413a4b Mon Sep 17 00:00:00 2001 +From d3e9800ae2fe7c0ed2d7795eae2be17a66e625ff Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 16:58:39 -0200 -Subject: [PATCH 087/192] Add %X option to printf functions. +Subject: [PATCH 087/194] Add %X option to printf functions. --- grub-core/kern/misc.c | 7 +++++-- @@ -54,5 +54,5 @@ index 952411d5d..8344526be 100644 case 'd': { -- -2.13.4 +2.13.5 diff --git a/0088-Search-for-specific-config-file-for-netboot.patch b/0088-Search-for-specific-config-file-for-netboot.patch index 529e533..c1c1d13 100644 --- a/0088-Search-for-specific-config-file-for-netboot.patch +++ b/0088-Search-for-specific-config-file-for-netboot.patch @@ -1,7 +1,7 @@ -From 23c496b96dfeab1f524b736c525114539c549d27 Mon Sep 17 00:00:00 2001 +From 30c15e39be47d60f6a4a45628a687911a9f11091 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 17:22:07 -0200 -Subject: [PATCH 088/192] Search for specific config file for netboot +Subject: [PATCH 088/194] 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: @@ -199,5 +199,5 @@ index e266bae23..50d62ab0c 100644 + #endif /* ! GRUB_NET_HEADER */ -- -2.13.4 +2.13.5 diff --git a/0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch index c253df8..b310fd0 100644 --- a/0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch +++ b/0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch @@ -1,7 +1,7 @@ -From 90d7c3a044d3be318bec517661aa7e7822166a84 Mon Sep 17 00:00:00 2001 +From 266c7e797971879dc229594556a687a79c92d3b6 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Tue, 22 Jan 2013 06:31:38 +0100 -Subject: [PATCH 089/192] blscfg: add blscfg module to parse Boot Loader +Subject: [PATCH 089/194] blscfg: add blscfg module to parse Boot Loader Specification snippets http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec @@ -247,5 +247,5 @@ index 000000000..4274aca5a + grub_unregister_extcmd (cmd); +} -- -2.13.4 +2.13.5 diff --git a/0090-Don-t-write-messages-to-the-screen.patch b/0090-Don-t-write-messages-to-the-screen.patch index 19f6c69..197f653 100644 --- a/0090-Don-t-write-messages-to-the-screen.patch +++ b/0090-Don-t-write-messages-to-the-screen.patch @@ -1,7 +1,7 @@ -From 60db753f54d4b11ac2caa4536b685cc252cf5df6 Mon Sep 17 00:00:00 2001 +From 6609ba848331d9153c554bb52f2ef0a33531cf55 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:30:20 -0400 -Subject: [PATCH 090/192] Don't write messages to the screen +Subject: [PATCH 090/194] 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 @@ -177,5 +177,5 @@ index 8ccf012f7..a3d9711d6 100644 EOF fi -- -2.13.4 +2.13.5 diff --git a/0091-Don-t-print-GNU-GRUB-header.patch b/0091-Don-t-print-GNU-GRUB-header.patch index 1e51b0c..538a095 100644 --- a/0091-Don-t-print-GNU-GRUB-header.patch +++ b/0091-Don-t-print-GNU-GRUB-header.patch @@ -1,7 +1,7 @@ -From 7801f78495d43599e7255cdfaeed717f9fbe542a Mon Sep 17 00:00:00 2001 +From 95aeba5fe67ad11a995eb8e583708a722b8bdeb9 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:53:48 -0400 -Subject: [PATCH 091/192] Don't print GNU GRUB header +Subject: [PATCH 091/194] Don't print GNU GRUB header No one cares. --- @@ -41,5 +41,5 @@ index b2654ef62..f57b7508a 100644 static void -- -2.13.4 +2.13.5 diff --git a/0092-Don-t-add-to-highlighted-row.patch b/0092-Don-t-add-to-highlighted-row.patch index 1b9bc5c..caa2c80 100644 --- a/0092-Don-t-add-to-highlighted-row.patch +++ b/0092-Don-t-add-to-highlighted-row.patch @@ -1,7 +1,7 @@ -From e06f4d9d640db5041f5934ba486de84705fee66b Mon Sep 17 00:00:00 2001 +From aca25c56911ece3e4d82ae9edbde6c705c1eaacc Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 17:49:45 -0400 -Subject: [PATCH 092/192] Don't add '*' to highlighted row +Subject: [PATCH 092/194] Don't add '*' to highlighted row It is already highlighted. --- @@ -22,5 +22,5 @@ index e22bb91f6..a3d1f23f6 100644 grub_print_ucs4_menu (unicode_title, unicode_title + len, -- -2.13.4 +2.13.5 diff --git a/0093-Message-string-cleanups.patch b/0093-Message-string-cleanups.patch index c24432e..4276a3f 100644 --- a/0093-Message-string-cleanups.patch +++ b/0093-Message-string-cleanups.patch @@ -1,7 +1,7 @@ -From 3d60e13903f30f8a0d60ca7ad8bb984d28fb5262 Mon Sep 17 00:00:00 2001 +From eef343ff642b42f0e46eb5e8ff5d89fef375f4a2 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 11:09:04 -0400 -Subject: [PATCH 093/192] Message string cleanups +Subject: [PATCH 093/194] Message string cleanups Make use of terminology consistent. Remove jargon. --- @@ -67,5 +67,5 @@ index a3d1f23f6..64a83862f 100644 { grub_print_error (); -- -2.13.4 +2.13.5 diff --git a/0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch b/0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch index 9a15e1f..6a277ce 100644 --- a/0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch +++ b/0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch @@ -1,7 +1,7 @@ -From 0346f89bd0d9332f613f84063f2e88eb60b80b5d Mon Sep 17 00:00:00 2001 +From c2e1e09485a5773dc3639d34eadc3a07ebce8fe5 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:23 -0400 -Subject: [PATCH 094/192] Fix border spacing now that we aren't displaying it +Subject: [PATCH 094/194] Fix border spacing now that we aren't displaying it --- grub-core/normal/menu_text.c | 6 +++--- @@ -28,5 +28,5 @@ index 64a83862f..1062d64ee 100644 geo->timeout_lines = 2; -- -2.13.4 +2.13.5 diff --git a/0095-Use-the-correct-indentation-for-the-term-help-text.patch b/0095-Use-the-correct-indentation-for-the-term-help-text.patch index 7d61b93..71570ed 100644 --- a/0095-Use-the-correct-indentation-for-the-term-help-text.patch +++ b/0095-Use-the-correct-indentation-for-the-term-help-text.patch @@ -1,7 +1,7 @@ -From c9c76c9c90f9c5464efd17d04e839e9c0ff11b3f Mon Sep 17 00:00:00 2001 +From e29b4dd346fa10dc6a073239ef1ed8fb32a0c838 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:49 -0400 -Subject: [PATCH 095/192] Use the correct indentation for the term help text +Subject: [PATCH 095/194] Use the correct indentation for the term help text That is consistent with the menu help text --- @@ -24,5 +24,5 @@ index f57b7508a..0ce59fdc3 100644 grub_print_message_indented (msg_formatted, 0, 0, term); grub_putcode ('\n', term); -- -2.13.4 +2.13.5 diff --git a/0096-Indent-menu-entries.patch b/0096-Indent-menu-entries.patch index a4fec24..41bede5 100644 --- a/0096-Indent-menu-entries.patch +++ b/0096-Indent-menu-entries.patch @@ -1,7 +1,7 @@ -From 544becc2362005b59c561eefd1b68360ca1764ca Mon Sep 17 00:00:00 2001 +From a67be6e17cd318ad3d4a669efb2b8c5f6e76c003 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:30:55 -0400 -Subject: [PATCH 096/192] Indent menu entries +Subject: [PATCH 096/194] Indent menu entries --- grub-core/normal/menu_text.c | 3 ++- @@ -22,5 +22,5 @@ index 1062d64ee..ecc60f99f 100644 grub_print_ucs4_menu (unicode_title, unicode_title + len, -- -2.13.4 +2.13.5 diff --git a/0097-Fix-margins.patch b/0097-Fix-margins.patch index d62d9bd..58904ce 100644 --- a/0097-Fix-margins.patch +++ b/0097-Fix-margins.patch @@ -1,7 +1,7 @@ -From aaecd5d322bc4050e9d143f2e648349b4c6c9e17 Mon Sep 17 00:00:00 2001 +From 8e5a006c6c48002f3debd99f4c377b443f9f8369 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:59:36 -0400 -Subject: [PATCH 097/192] Fix margins +Subject: [PATCH 097/194] Fix margins --- grub-core/normal/menu_text.c | 8 +++----- @@ -33,5 +33,5 @@ index ecc60f99f..0e43f2c10 100644 - geo->timeout_lines /* timeout */ - 1 /* empty final line */; -- -2.13.4 +2.13.5 diff --git a/0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch b/0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch index 7884d09..79715a9 100644 --- a/0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch +++ b/0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch @@ -1,7 +1,7 @@ -From f7c5e91c99f066efef6183e53d4c7c9a73d19389 Mon Sep 17 00:00:00 2001 +From 01757871cb2a7355a7f67e80f77a57fecba26f54 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 21 Jun 2013 14:44:08 -0400 -Subject: [PATCH 098/192] Use -2 instead of -1 for our right-hand margin, so +Subject: [PATCH 098/194] Use -2 instead of -1 for our right-hand margin, so linewrapping works (#976643). Signed-off-by: Peter Jones @@ -23,5 +23,5 @@ index 0e43f2c10..537d4bf86 100644 geo->first_entry_y = 3; /* three empty lines*/ -- -2.13.4 +2.13.5 diff --git a/0099-Use-linux16-when-appropriate-880840.patch b/0099-Use-linux16-when-appropriate-880840.patch index cebc5c6..c28450b 100644 --- a/0099-Use-linux16-when-appropriate-880840.patch +++ b/0099-Use-linux16-when-appropriate-880840.patch @@ -1,7 +1,7 @@ -From 6f560f08b9bf0c0041a7ec2980e270fe9e2aca09 Mon Sep 17 00:00:00 2001 +From ac001b7b4cc1819186fbe2bc695cbe58d2077d0f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:05:07 -0400 -Subject: [PATCH 099/192] Use linux16 when appropriate (#880840) +Subject: [PATCH 099/194] Use linux16 when appropriate (#880840) The kernel group really would prefer that we use the 16 bit entry point on x86 bios machines. @@ -48,5 +48,5 @@ index a3d9711d6..f3bf6acd8 100644 fi fi -- -2.13.4 +2.13.5 diff --git a/0100-Enable-pager-by-default.-985860.patch b/0100-Enable-pager-by-default.-985860.patch index 77eab6a..8e15e9b 100644 --- a/0100-Enable-pager-by-default.-985860.patch +++ b/0100-Enable-pager-by-default.-985860.patch @@ -1,7 +1,7 @@ -From a7a59ff4c00792170ddba29a5939c5fecb253c1f Mon Sep 17 00:00:00 2001 +From cc60fb5b7693dabcf100c910d42b3ffe1816597f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:09:27 -0400 -Subject: [PATCH 100/192] Enable pager by default. (#985860) +Subject: [PATCH 100/194] Enable pager by default. (#985860) Signed-off-by: Peter Jones --- @@ -22,5 +22,5 @@ index 93a90233e..858b526c9 100644 load_env fi -- -2.13.4 +2.13.5 diff --git a/0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch b/0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch index edd1ff2..5016265 100644 --- a/0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch +++ b/0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch @@ -1,7 +1,7 @@ -From a53467b1b78788c8661c50150dcef4ab4bcbd1e4 Mon Sep 17 00:00:00 2001 +From f1cb6c5a7640406294b7dffab3c5e4a4afdaf745 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:13:27 -0400 -Subject: [PATCH 101/192] F10 doesn't work on serial, so don't tell the user to +Subject: [PATCH 101/194] F10 doesn't work on serial, so don't tell the user to hit it (#987443) Signed-off-by: Peter Jones @@ -23,5 +23,5 @@ index 537d4bf86..452d55bf9 100644 STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run); -- -2.13.4 +2.13.5 diff --git a/0102-Don-t-say-GNU-Linux-in-generated-menus.patch b/0102-Don-t-say-GNU-Linux-in-generated-menus.patch index b63fe27..0f5f81b 100644 --- a/0102-Don-t-say-GNU-Linux-in-generated-menus.patch +++ b/0102-Don-t-say-GNU-Linux-in-generated-menus.patch @@ -1,7 +1,7 @@ -From 334fa04e691a47ab435a0cce35cf4b989b43a80c Mon Sep 17 00:00:00 2001 +From 13c028af4104555993650dd9a26dd633c516d23f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 14 Mar 2011 14:27:42 -0400 -Subject: [PATCH 102/192] Don't say "GNU/Linux" in generated menus. +Subject: [PATCH 102/194] Don't say "GNU/Linux" in generated menus. --- util/grub.d/10_linux.in | 4 ++-- @@ -41,5 +41,5 @@ index c002fc9f9..54f1ec8a2 100644 fi -- -2.13.4 +2.13.5 diff --git a/0103-Don-t-draw-a-border-around-the-menu.patch b/0103-Don-t-draw-a-border-around-the-menu.patch index 5205c74..4c928e4 100644 --- a/0103-Don-t-draw-a-border-around-the-menu.patch +++ b/0103-Don-t-draw-a-border-around-the-menu.patch @@ -1,7 +1,7 @@ -From 92f753273188441554068e0e653f7ba394d85940 Mon Sep 17 00:00:00 2001 +From 8b51cba8f5587746d1559bd6ec957db3e185c049 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 16:47:33 -0400 -Subject: [PATCH 103/192] Don't draw a border around the menu +Subject: [PATCH 103/194] Don't draw a border around the menu It looks cleaner without it. --- @@ -70,5 +70,5 @@ index 452d55bf9..1ed2bd92c 100644 grub_term_highlight_color = old_color_highlight; geo->timeout_y = geo->first_entry_y + geo->num_entries -- -2.13.4 +2.13.5 diff --git a/0104-Use-the-standard-margin-for-the-timeout-string.patch b/0104-Use-the-standard-margin-for-the-timeout-string.patch index 747a8c9..c1462a3 100644 --- a/0104-Use-the-standard-margin-for-the-timeout-string.patch +++ b/0104-Use-the-standard-margin-for-the-timeout-string.patch @@ -1,7 +1,7 @@ -From aecbe8a0a7a384bebe61874c4ef9e5de0cd0642a Mon Sep 17 00:00:00 2001 +From 137250b0ef67150568074da35c568c6c649899f6 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 10:52:32 -0400 -Subject: [PATCH 104/192] Use the standard margin for the timeout string +Subject: [PATCH 104/194] Use the standard margin for the timeout string So that it aligns with the other messages --- @@ -39,5 +39,5 @@ index 1ed2bd92c..7681f7d28 100644 } -- -2.13.4 +2.13.5 diff --git a/0105-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0105-Add-.eh_frame-to-list-of-relocations-stripped.patch index b874972..00f419a 100644 --- a/0105-Add-.eh_frame-to-list-of-relocations-stripped.patch +++ b/0105-Add-.eh_frame-to-list-of-relocations-stripped.patch @@ -1,7 +1,7 @@ -From e21419427cdb8248c5d99a3fa3776cb8570518aa Mon Sep 17 00:00:00 2001 +From 0464db837a67b88a761f100391b135a70b7054eb Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 13 Jan 2014 21:50:59 -0500 -Subject: [PATCH 105/192] Add .eh_frame to list of relocations stripped +Subject: [PATCH 105/194] Add .eh_frame to list of relocations stripped --- conf/Makefile.common | 2 +- @@ -21,5 +21,5 @@ index 311da61c6..044ab3abe 100644 CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d -- -2.13.4 +2.13.5 diff --git a/0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch b/0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch index 0e4b082..ad3dae3 100644 --- a/0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch +++ b/0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch @@ -1,7 +1,7 @@ -From 7e736292dcb182f7c012365c3fc02908585f8440 Mon Sep 17 00:00:00 2001 +From fb582651ea4568d7226f96e6b618ad795430c842 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 13:12:23 -0500 -Subject: [PATCH 106/192] Make 10_linux work with our changes for linux16 and +Subject: [PATCH 106/194] Make 10_linux work with our changes for linux16 and linuxefi on aarch64 Signed-off-by: Peter Jones @@ -81,5 +81,5 @@ index ef52cf3db..191aebe80 100644 for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do if test -e "${i}" ; then -- -2.13.4 +2.13.5 diff --git a/0107-Don-t-print-during-fdt-loading-method.patch b/0107-Don-t-print-during-fdt-loading-method.patch index b56dc33..425d882 100644 --- a/0107-Don-t-print-during-fdt-loading-method.patch +++ b/0107-Don-t-print-during-fdt-loading-method.patch @@ -1,7 +1,7 @@ -From 9e03e6019e0c1b5f171fd5a0098d95de83c92a11 Mon Sep 17 00:00:00 2001 +From 40e56a4c2e879f5efcbcc36cf6a88ee1cb39d607 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 16:15:46 -0500 -Subject: [PATCH 107/192] Don't print during fdt loading method. +Subject: [PATCH 107/194] Don't print during fdt loading method. Signed-off-by: Peter Jones --- @@ -23,5 +23,5 @@ index 191aebe80..452a9f69d 100644 EOF fi -- -2.13.4 +2.13.5 diff --git a/0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch b/0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch index cf8f1ae..63960fe 100644 --- a/0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch +++ b/0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch @@ -1,7 +1,7 @@ -From d67cd23e1ce2a0f0e70b367ecdda2c9ab13985ce Mon Sep 17 00:00:00 2001 +From ff25c6034ab8213d911414e666b7d44bc44496aa Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 30 Jun 2014 14:16:46 -0400 -Subject: [PATCH 108/192] Don't munge raw spaces when we're doing our cmdline +Subject: [PATCH 108/194] Don't munge raw spaces when we're doing our cmdline escaping (#923374) Signed-off-by: Peter Jones @@ -32,5 +32,5 @@ index 0a5b2afb9..970ea868c 100644 { *buf++ = *c++; -- -2.13.4 +2.13.5 diff --git a/0109-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0109-Don-t-require-a-password-to-boot-entries-generated-b.patch index 67e6ce6..78b89d4 100644 --- a/0109-Don-t-require-a-password-to-boot-entries-generated-b.patch +++ b/0109-Don-t-require-a-password-to-boot-entries-generated-b.patch @@ -1,7 +1,7 @@ -From c21043e2abeb73b1441763509d9c03f30b963be8 Mon Sep 17 00:00:00 2001 +From 2df38f07986a91d2a06cb3e432f9121d9f678f89 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 11 Feb 2014 11:14:50 -0500 -Subject: [PATCH 109/192] Don't require a password to boot entries generated by +Subject: [PATCH 109/194] 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. @@ -27,5 +27,5 @@ index 452a9f69d..79a747ebd 100644 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS="$(sed 's, release .*$,,g' /etc/system-release)" -- -2.13.4 +2.13.5 diff --git a/0110-Don-t-emit-Booting-.-message.patch b/0110-Don-t-emit-Booting-.-message.patch index 725f1f3..01b4ffc 100644 --- a/0110-Don-t-emit-Booting-.-message.patch +++ b/0110-Don-t-emit-Booting-.-message.patch @@ -1,7 +1,7 @@ -From 4796aa1bb00d7f1704337e989d2c4cef5c2cc879 Mon Sep 17 00:00:00 2001 +From a72d4819fb7275cbf65b5de901c50d076bf861fd Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 09:37:49 -0500 -Subject: [PATCH 110/192] Don't emit "Booting ..." message. +Subject: [PATCH 110/194] Don't emit "Booting ..." message. UI team still hates this stuff, so we're disabling it for RHEL 7. @@ -48,5 +48,5 @@ index cdf3590a3..5785f67ee 100644 errs_before = grub_err_printed_errors; -- -2.13.4 +2.13.5 diff --git a/0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch b/0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch index b7541b2..7652346 100644 --- a/0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch +++ b/0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch @@ -1,7 +1,7 @@ -From ef35b75ee89b4d065f6727b6e01cac72107e95f9 Mon Sep 17 00:00:00 2001 +From 6412d775976361b52c0914f6e5e3b0a4b99cdba9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 4 Mar 2014 11:00:23 -0500 -Subject: [PATCH 111/192] Replace a lot of man pages with slightly nicer ones. +Subject: [PATCH 111/194] Replace a lot of man pages with slightly nicer ones. Replace a bunch of machine generated ones with ones that look nicer. --- @@ -1959,5 +1959,5 @@ index 000000000..37ea2dd5e +.SH SEE ALSO +.BR "info grub" -- -2.13.4 +2.13.5 diff --git a/0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch index 24b183f..f31b4fa 100644 --- a/0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch +++ b/0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch @@ -1,7 +1,7 @@ -From 8d2464a69534923e473fcd0058630a38a31dad48 Mon Sep 17 00:00:00 2001 +From acf4cfa6d1691a9476b36949af7e296080c88d25 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 19 Feb 2014 15:58:43 -0500 -Subject: [PATCH 112/192] use fw_path prefix when fallback searching for grub +Subject: [PATCH 112/194] use fw_path prefix when fallback searching for grub config When PXE booting via UEFI firmware, grub was searching for grub.cfg @@ -41,5 +41,5 @@ index 0ce59fdc3..a3713efcd 100644 { grub_size_t config_len; -- -2.13.4 +2.13.5 diff --git a/0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch index c3bac78..89cb209 100644 --- a/0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch +++ b/0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch @@ -1,7 +1,7 @@ -From d11f6b6e85d9e33d4d247ae1a1fbee4a38c92978 Mon Sep 17 00:00:00 2001 +From b7aa57a2f879d185888e4d47f77a1a30370973f9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 6 Mar 2014 11:51:33 -0500 -Subject: [PATCH 113/192] Try mac/guid/etc before grub.cfg on tftp config +Subject: [PATCH 113/194] Try mac/guid/etc before grub.cfg on tftp config files. Signed-off-by: Peter Jones @@ -111,5 +111,5 @@ index a3713efcd..7d9c4f09b 100644 else grub_enter_normal_mode (argv[0]); -- -2.13.4 +2.13.5 diff --git a/0114-Fix-convert-function-to-support-NVMe-devices.patch b/0114-Fix-convert-function-to-support-NVMe-devices.patch index 2b3437d..32d51c0 100644 --- a/0114-Fix-convert-function-to-support-NVMe-devices.patch +++ b/0114-Fix-convert-function-to-support-NVMe-devices.patch @@ -1,7 +1,7 @@ -From 42d897675b2952fad5274dd979fb493b6976167c Mon Sep 17 00:00:00 2001 +From 69946054baab92385b9f6518cc78e94810b40c48 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 11:34:00 -0500 -Subject: [PATCH 114/192] Fix convert function to support NVMe devices +Subject: [PATCH 114/194] 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 @@ -55,5 +55,5 @@ index 847406fba..fa3460d6c 100644 return grub_util_devmapper_part_to_disk (&st, is_part, os_dev); -- -2.13.4 +2.13.5 diff --git a/0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch b/0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch index b7b83a4..6332685 100644 --- a/0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch +++ b/0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch @@ -1,7 +1,7 @@ -From 3d6dacedc4482b58109799358c8ed91e697b1717 Mon Sep 17 00:00:00 2001 +From f168a0803d8d35e431ef6888755f9b2622304846 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 10 Feb 2014 16:13:10 -0500 -Subject: [PATCH 115/192] Switch to use APM Mustang device tree, for hardware +Subject: [PATCH 115/194] Switch to use APM Mustang device tree, for hardware testing. Signed-off-by: David A. Marlin @@ -25,5 +25,5 @@ index 79a747ebd..462b461ff 100644 fi done -- -2.13.4 +2.13.5 diff --git a/0116-Use-the-default-device-tree-from-the-grub-default-fi.patch b/0116-Use-the-default-device-tree-from-the-grub-default-fi.patch index 2228bc4..fbd3192 100644 --- a/0116-Use-the-default-device-tree-from-the-grub-default-fi.patch +++ b/0116-Use-the-default-device-tree-from-the-grub-default-fi.patch @@ -1,7 +1,7 @@ -From ffddaa31d23826e2123bdeab567ba1f4e4fd4df2 Mon Sep 17 00:00:00 2001 +From 6ec36777aae0c4afd98f67f22d4d511b447dbb02 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 12 Feb 2014 14:54:04 -0500 -Subject: [PATCH 116/192] Use the default device tree from the grub default +Subject: [PATCH 116/194] Use the default device tree from the grub default file instead of hardcoding a value. @@ -42,5 +42,5 @@ index 462b461ff..a9692a0c2 100644 fi done -- -2.13.4 +2.13.5 diff --git a/0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index 12f3945..c6b0e43 100644 --- a/0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,7 +1,7 @@ -From dc504f405ad6a968d9f5af120dd6b2a212bb0001 Mon Sep 17 00:00:00 2001 +From debcbbacd18bfbbcbd5fd9dce947f2cbce09c916 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Sat, 15 Feb 2014 15:10:22 -0500 -Subject: [PATCH 117/192] reopen SNP protocol for exclusive use by grub +Subject: [PATCH 117/194] reopen SNP protocol for exclusive use by grub --- grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++ @@ -42,5 +42,5 @@ index 5388f952b..ea0e0ca36 100644 } } -- -2.13.4 +2.13.5 diff --git a/0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index f6ec9a1..e30bf4a 100644 --- a/0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,7 +1,7 @@ -From 6935b93eb6deacf6cd72ec6dad41cc01347f4015 Mon Sep 17 00:00:00 2001 +From 88892eedb9beb9d8c295329fad87edb339e4e27c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Mar 2016 15:13:59 -0500 -Subject: [PATCH 118/192] Revert "reopen SNP protocol for exclusive use by +Subject: [PATCH 118/194] Revert "reopen SNP protocol for exclusive use by grub" This reverts commit a3f2c756ce34c9666bddef35e3b3b85ccecdcffc , which is @@ -51,5 +51,5 @@ index ea0e0ca36..5388f952b 100644 } } -- -2.13.4 +2.13.5 diff --git a/0119-Add-grub_util_readlink.patch b/0119-Add-grub_util_readlink.patch index 640dff9..953637d 100644 --- a/0119-Add-grub_util_readlink.patch +++ b/0119-Add-grub_util_readlink.patch @@ -1,7 +1,7 @@ -From e6835380a668fbb6b1739ac10e492e766d5416bd Mon Sep 17 00:00:00 2001 +From 9c1af9c0a44353f6b72691456a4a2883246b6346 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:01:03 -0400 -Subject: [PATCH 119/192] Add grub_util_readlink() +Subject: [PATCH 119/194] 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 @@ -3730,5 +3730,5 @@ index 000000000..9852778f9 + REPLACE_LOCALTIME=0; AC_SUBST([REPLACE_LOCALTIME]) +]) -- -2.13.4 +2.13.5 diff --git a/0120-Make-editenv-chase-symlinks-including-those-across-d.patch b/0120-Make-editenv-chase-symlinks-including-those-across-d.patch index 134f03a..a3838c4 100644 --- a/0120-Make-editenv-chase-symlinks-including-those-across-d.patch +++ b/0120-Make-editenv-chase-symlinks-including-those-across-d.patch @@ -1,7 +1,7 @@ -From 4e4d07017eea4d6540559f7753cd26efa9e0dfdf Mon Sep 17 00:00:00 2001 +From 5c54e71e4b4a3f8fbfedd5eca821238a7d80b491 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:38:00 -0400 -Subject: [PATCH 120/192] Make editenv chase symlinks including those across +Subject: [PATCH 120/194] Make editenv chase symlinks including those across devices. This lets us make /boot/grub2/grubenv a symlink to @@ -102,5 +102,5 @@ index c6f8d2298..d8d1dad6a 100644 + free (rename_target); } -- -2.13.4 +2.13.5 diff --git a/0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch index 143eb66..8d8780b 100644 --- a/0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch +++ b/0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch @@ -1,7 +1,7 @@ -From 3a14f08bd4cf5a18cb4348c362cefa6f2dd298a2 Mon Sep 17 00:00:00 2001 +From 7ca8e2b9e23a3588654d53a8e84bb22743896f80 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 14:23:23 -0400 -Subject: [PATCH 121/192] Generate OS and CLASS in 10_linux from +Subject: [PATCH 121/194] Generate OS and CLASS in 10_linux from /etc/os-release This makes us use pretty names in the titles we generate in @@ -29,5 +29,5 @@ index a9692a0c2..c6627268c 100644 OS="${GRUB_DISTRIBUTOR}" CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" -- -2.13.4 +2.13.5 diff --git a/0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch index de7510a..79281f4 100644 --- a/0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch +++ b/0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch @@ -1,7 +1,7 @@ -From d58ebb3d09e1b22ba4a58c9ebc8eecab5ae20f98 Mon Sep 17 00:00:00 2001 +From e84a66eb07c96db182d57f4d40ff7c607a0e5296 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 15:52:08 -0400 -Subject: [PATCH 122/192] Minimize the sort ordering for .debug and -rescue- +Subject: [PATCH 122/194] Minimize the sort ordering for .debug and -rescue- kernels. Resolves: rhbz#1065360 @@ -30,5 +30,5 @@ index cf35e4174..10fabee5e 100644 version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b" return "$?" -- -2.13.4 +2.13.5 diff --git a/0123-Load-arm-with-SB-enabled.patch b/0123-Load-arm-with-SB-enabled.patch index 82d6e49..aff9066 100644 --- a/0123-Load-arm-with-SB-enabled.patch +++ b/0123-Load-arm-with-SB-enabled.patch @@ -1,7 +1,7 @@ -From 89cc931e0faf05a4cf79cf8554037d035b829d0a Mon Sep 17 00:00:00 2001 +From b21b80fe44eb379bb268c623ee092a9b776d11d9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 18 Sep 2014 11:26:14 -0400 -Subject: [PATCH 123/192] Load arm with SB enabled. +Subject: [PATCH 123/194] 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.) @@ -11,12 +11,12 @@ kernel command line, because we can't call systab->bs->LoadImage() if SB is enabled. --- grub-core/Makefile.core.def | 3 + - grub-core/loader/arm64/linux.c | 116 ++++++++++++++++++++------------------ + grub-core/loader/arm64/linux.c | 115 ++++++++++++++++++++------------------ grub-core/loader/efi/linux.c | 65 +++++++++++++++++++++ grub-core/loader/i386/efi/linux.c | 39 +------------ include/grub/arm64/linux.h | 7 +++ include/grub/efi/linux.h | 31 ++++++++++ - 6 files changed, 171 insertions(+), 90 deletions(-) + 6 files changed, 170 insertions(+), 90 deletions(-) create mode 100644 grub-core/loader/efi/linux.c create mode 100644 include/grub/efi/linux.h @@ -42,7 +42,7 @@ index 7f3d5a2bf..5ae70204c 100644 enable = x86_64_efi; }; diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 746edd104..03ff83563 100644 +index 746edd104..33345d375 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -28,6 +28,7 @@ @@ -71,7 +71,7 @@ index 746edd104..03ff83563 100644 void *fdt; -@@ -100,6 +103,26 @@ finalize_params_linux (void) +@@ -100,6 +103,25 @@ finalize_params_linux (void) if (grub_fdt_install() != GRUB_ERR_NONE) goto failure; @@ -86,8 +86,7 @@ index 746edd104..03ff83563 100644 + loaded_image->load_options_size = len = + (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t); + loaded_image->load_options = -+ grub_efi_allocate_pages_max (0, -+ GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size)); ++ grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size)); + if (!loaded_image->load_options) + return grub_error(GRUB_ERR_BAD_OS, "failed to create kernel parameters"); + @@ -98,7 +97,7 @@ index 746edd104..03ff83563 100644 return GRUB_ERR_NONE; failure: -@@ -107,72 +130,47 @@ failure: +@@ -107,72 +129,47 @@ failure: return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT"); } @@ -199,7 +198,7 @@ index 746edd104..03ff83563 100644 } static grub_err_t -@@ -249,6 +247,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), +@@ -249,6 +246,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), { grub_file_t file = 0; struct grub_arm64_linux_kernel_header lh; @@ -207,7 +206,7 @@ index 746edd104..03ff83563 100644 grub_dl_ref (my_mod); -@@ -293,6 +292,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), +@@ -293,6 +291,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), grub_dprintf ("linux", "kernel @ %p\n", kernel_addr); @@ -423,5 +422,5 @@ index 000000000..d9ede3677 + +#endif /* ! GRUB_EFI_LINUX_HEADER */ -- -2.13.4 +2.13.5 diff --git a/0124-Try-prefix-if-fw_path-doesn-t-work.patch b/0124-Try-prefix-if-fw_path-doesn-t-work.patch index cedc449..4279e1a 100644 --- a/0124-Try-prefix-if-fw_path-doesn-t-work.patch +++ b/0124-Try-prefix-if-fw_path-doesn-t-work.patch @@ -1,7 +1,7 @@ -From 9f6d403d5d3e782759276c158736e431e5c9de3f Mon Sep 17 00:00:00 2001 +From 8fd7dd327b69530d901168cb02827a894f1f9cf7 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 3 Oct 2014 11:08:03 -0400 -Subject: [PATCH 124/192] Try $prefix if $fw_path doesn't work. +Subject: [PATCH 124/194] Try $prefix if $fw_path doesn't work. Related: rhbz#1148652 @@ -207,5 +207,5 @@ index 7d9c4f09b..b69f9e738 100644 } -- -2.13.4 +2.13.5 diff --git a/0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch b/0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch index 9a27b28..57ac7b9 100644 --- a/0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch +++ b/0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch @@ -1,7 +1,7 @@ -From fdd459b6c8a262066c1dcbebd919b03e566bd597 Mon Sep 17 00:00:00 2001 +From 577f38ceb2f1676cb8e63a1d461eb9d6a9936385 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 16:34:51 -0400 -Subject: [PATCH 125/192] Update info with grub.cfg netboot selection order +Subject: [PATCH 125/194] Update info with grub.cfg netboot selection order (#1148650) Added documentation to the grub info page that specifies the order @@ -66,5 +66,5 @@ index 6fdd2a041..15a90b26e 100644 @samp{(tftp)} device. -- -2.13.4 +2.13.5 diff --git a/0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch b/0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch index be38a80..6e733bf 100644 --- a/0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch +++ b/0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch @@ -1,7 +1,7 @@ -From 8da9508faa25ba5add92267cce1286c0d44541e7 Mon Sep 17 00:00:00 2001 +From 42c78f4a2f3359b415eff631712a0400c2042522 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 14:14:19 -0400 -Subject: [PATCH 126/192] Use Distribution Package Sort for grub2-mkconfig +Subject: [PATCH 126/194] Use Distribution Package Sort for grub2-mkconfig (#1124074) Users reported that newly installed kernels on their systems installed @@ -447,5 +447,5 @@ index 000000000..f33bd1ed5 + return 0; +} -- -2.13.4 +2.13.5 diff --git a/0127-Handle-rssd-storage-devices.patch b/0127-Handle-rssd-storage-devices.patch index 3fec5e5..f686ec0 100644 --- a/0127-Handle-rssd-storage-devices.patch +++ b/0127-Handle-rssd-storage-devices.patch @@ -1,7 +1,7 @@ -From cdbc94f3f51b2575535a51c952238b2cd5b34639 Mon Sep 17 00:00:00 2001 +From 1dbfe2b96218a579d8da9ba8418857f0cf030890 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 30 Jun 2015 15:50:41 -0400 -Subject: [PATCH 127/192] Handle rssd storage devices. +Subject: [PATCH 127/194] Handle rssd storage devices. Resolves: rhbz#1087962 @@ -35,5 +35,5 @@ index 90d92d3ad..6d9f4e5fa 100644 if ((strncmp ("loop", p, 4) == 0) && p[4] >= '0' && p[4] <= '9') { -- -2.13.4 +2.13.5 diff --git a/0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch b/0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch index 099bcb3..3563c28 100644 --- a/0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch +++ b/0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch @@ -1,7 +1,7 @@ -From ce0866787ab88f37c346595c639921ef8922975e Mon Sep 17 00:00:00 2001 +From f6c0a92a360a92e58b3e90120ddbd1e183eccb50 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 27 Oct 2014 09:22:55 -0400 -Subject: [PATCH 128/192] Try to emit linux16/initrd16 and linuxefi/initrdefi +Subject: [PATCH 128/194] Try to emit linux16/initrd16 and linuxefi/initrdefi in 30-os_prober. Resolves: rhbz#1108296 @@ -73,5 +73,5 @@ index 9b8f5968e..dc98eace9 100644 fi cat << EOF -- -2.13.4 +2.13.5 diff --git a/0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index 2a70c57..ab644ed 100644 --- a/0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -1,7 +1,7 @@ -From abd7a4299e641a3c3ee2d91dfe7721796355ee2d Mon Sep 17 00:00:00 2001 +From 12fd265ed00dcbe26e423800fc6b7058f48163db Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 28 Apr 2015 11:15:03 -0400 -Subject: [PATCH 129/192] Make grub2-mkconfig construct titles that look like +Subject: [PATCH 129/194] Make grub2-mkconfig construct titles that look like the ones we want elsewhere. Resolves: rhbz#1215839 @@ -50,5 +50,5 @@ index c6627268c..121524185 100644 echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/" else -- -2.13.4 +2.13.5 diff --git a/0130-Add-friendly-grub2-password-config-tool-985962.patch b/0130-Add-friendly-grub2-password-config-tool-985962.patch index 03dfccb..ad60457 100644 --- a/0130-Add-friendly-grub2-password-config-tool-985962.patch +++ b/0130-Add-friendly-grub2-password-config-tool-985962.patch @@ -1,7 +1,7 @@ -From 03c35775014c6937302aad6c97e87734c7f6a82f Mon Sep 17 00:00:00 2001 +From dda4c69e2fb3c12f838866740eb04142975df9a3 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Thu, 25 Jun 2015 11:13:11 -0400 -Subject: [PATCH 130/192] Add friendly grub2 password config tool (#985962) +Subject: [PATCH 130/194] 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 @@ -271,5 +271,5 @@ index 000000000..db2f44bfb +fi +EOF -- -2.13.4 +2.13.5 diff --git a/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch b/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch index b45df49..b1f7e69 100644 --- a/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch +++ b/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch @@ -1,7 +1,7 @@ -From 2e6a1b095ea2acab1b16a80f199e34d9a287a6da Mon Sep 17 00:00:00 2001 +From 55b69bdee6f721044ba1d44e2efae98ccbb888f5 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Fri, 10 Oct 2014 11:11:09 +0200 -Subject: [PATCH 131/192] calibrate_tsc(): use the Stall() EFI boot service on +Subject: [PATCH 131/194] calibrate_tsc(): use the Stall() EFI boot service on GRUB_MACHINE_EFI Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1150698 @@ -11,11 +11,11 @@ services instead. Signed-off-by: RHEL Ninjas --- - grub-core/kern/i386/tsc.c | 59 +++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 57 insertions(+), 2 deletions(-) + grub-core/kern/i386/tsc.c | 61 ++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c -index 2e85289d8..0787b6f3e 100644 +index 2e85289d8..ca3009cf5 100644 --- a/grub-core/kern/i386/tsc.c +++ b/grub-core/kern/i386/tsc.c @@ -24,6 +24,17 @@ @@ -81,8 +81,12 @@ index 2e85289d8..0787b6f3e 100644 static grub_uint64_t grub_tsc_get_time_ms (void) { -@@ -46,8 +95,14 @@ grub_tsc_get_time_ms (void) - static int +@@ -43,11 +92,17 @@ grub_tsc_get_time_ms (void) + return ((al * grub_tsc_rate) >> 32) + ah * grub_tsc_rate; + } + +-static int ++static void calibrate_tsc_hardcode (void) { - grub_tsc_rate = 5368;/* 800 MHz */ @@ -99,5 +103,5 @@ index 2e85289d8..0787b6f3e 100644 void -- -2.13.4 +2.13.5 diff --git a/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index 7162778..bc41993 100644 --- a/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -1,7 +1,7 @@ -From e0ceb7a5c51264891d65944e3da487c076a362d9 Mon Sep 17 00:00:00 2001 +From fade370401ca1af3427a6669f582fd6c10cab3ad Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 28 Apr 2015 11:15:03 -0400 -Subject: [PATCH 132/192] Make grub2-mkconfig construct titles that look like +Subject: [PATCH 132/194] Make grub2-mkconfig construct titles that look like the ones we want elsewhere. Resolves: rhbz#1215839 @@ -64,5 +64,5 @@ index 121524185..584ad1f46 100644 replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)" -- -2.13.4 +2.13.5 diff --git a/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch b/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch index 94568b9..68dd005 100644 --- a/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch +++ b/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch @@ -1,7 +1,7 @@ -From 696f516bc0868f089f1298ebbe7889f9fdc2930c Mon Sep 17 00:00:00 2001 +From 48b83be63828dd8d6ad164dae7b564d8fdf36a90 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 3 Aug 2015 11:46:42 -0400 -Subject: [PATCH 133/192] Try to make sure configure.ac and grub-rpm-sort play +Subject: [PATCH 133/194] 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 @@ -57,5 +57,5 @@ index 954844d2d..9c410eae4 100644 version_test_numeric () -- -2.13.4 +2.13.5 diff --git a/0134-tcp-add-window-scaling-support.patch b/0134-tcp-add-window-scaling-support.patch index 4851f86..aa188c0 100644 --- a/0134-tcp-add-window-scaling-support.patch +++ b/0134-tcp-add-window-scaling-support.patch @@ -1,7 +1,7 @@ -From 1fa17daed3d36b3697a2af98ecbf05aeb0cdffa8 Mon Sep 17 00:00:00 2001 +From c4ac5d23a45330af2cfd4a2eba0a20e4ed24b18e Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Wed, 12 Aug 2015 08:57:55 -0700 -Subject: [PATCH 134/192] tcp: add window scaling support +Subject: [PATCH 134/194] 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 @@ -86,5 +86,5 @@ index e8ad34b84..7d4b82262 100644 tcp_socket_register (socket); -- -2.13.4 +2.13.5 diff --git a/0135-efinet-retransmit-if-our-device-is-busy.patch b/0135-efinet-retransmit-if-our-device-is-busy.patch index 47a6b36..8e15fb4 100644 --- a/0135-efinet-retransmit-if-our-device-is-busy.patch +++ b/0135-efinet-retransmit-if-our-device-is-busy.patch @@ -1,7 +1,7 @@ -From cc3b425098bae73eb87947785aeea6a4fb3c8d05 Mon Sep 17 00:00:00 2001 +From c116386a63dd4ce58ba2a3d81c0ce8b59a7288e5 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Mon, 31 Aug 2015 13:34:35 -0400 -Subject: [PATCH 135/192] efinet: retransmit if our device is busy +Subject: [PATCH 135/194] 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 @@ -44,5 +44,5 @@ index 5388f952b..3f112438a 100644 return grub_error (GRUB_ERR_TIMEOUT, N_("couldn't send network packet")); -- -2.13.4 +2.13.5 diff --git a/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch b/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch index b261b90..8261827 100644 --- a/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch +++ b/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch @@ -1,7 +1,7 @@ -From d09b120606921bde20630c4a9dd1c500104cef13 Mon Sep 17 00:00:00 2001 +From c5cc06a8063b7d40dfd4d82affce37249b2bf627 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 11 Sep 2015 17:30:49 -0400 -Subject: [PATCH 136/192] Be more aggro about actually using the *configured* +Subject: [PATCH 136/194] 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 @@ -220,5 +220,5 @@ index c7c9f0e1d..97b9aa7a4 100644 #define GRUB_EFI_DEVICE_PATH_SUBTYPE(dp) ((dp)->subtype) #define GRUB_EFI_DEVICE_PATH_LENGTH(dp) ((dp)->length) -- -2.13.4 +2.13.5 diff --git a/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch b/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch index be2d480..b1e2f3c 100644 --- a/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch +++ b/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch @@ -1,7 +1,7 @@ -From b3a46d78db26c265e3343c26e3322b03e825b6c1 Mon Sep 17 00:00:00 2001 +From f3ff7d48d06f5bde788a4c969c7d55604b13907e Mon Sep 17 00:00:00 2001 From: RHEL Ninjas Date: Fri, 25 Sep 2015 16:24:23 +0900 -Subject: [PATCH 137/192] efinet: add filter for the first exclusive reopen of +Subject: [PATCH 137/194] efinet: add filter for the first exclusive reopen of SNP --- @@ -59,5 +59,5 @@ index a3ce4c67c..b870d3f19 100644 } } -- -2.13.4 +2.13.5 diff --git a/0138-Fix-security-issue-when-reading-username-and-passwor.patch b/0138-Fix-security-issue-when-reading-username-and-passwor.patch index 19d44bf..33cb045 100644 --- a/0138-Fix-security-issue-when-reading-username-and-passwor.patch +++ b/0138-Fix-security-issue-when-reading-username-and-passwor.patch @@ -1,7 +1,7 @@ -From 31eb7da21d59107afb5e1e0d4f732d1dc269a2c0 Mon Sep 17 00:00:00 2001 +From 6512905bc4a5f71729f1835898b65221731652f7 Mon Sep 17 00:00:00 2001 From: Hector Marco-Gisbert Date: Fri, 13 Nov 2015 16:21:09 +0100 -Subject: [PATCH 138/192] Fix security issue when reading username and password +Subject: [PATCH 138/194] Fix security issue when reading username and password This patch fixes two integer underflows at: * grub-core/lib/crypto.c @@ -43,5 +43,5 @@ index 6be678c0d..c35ce9724 100644 if (cur_len) { -- -2.13.4 +2.13.5 diff --git a/0139-Warn-if-grub-password-will-not-be-read-1290803.patch b/0139-Warn-if-grub-password-will-not-be-read-1290803.patch index 7be7fc1..51f262a 100644 --- a/0139-Warn-if-grub-password-will-not-be-read-1290803.patch +++ b/0139-Warn-if-grub-password-will-not-be-read-1290803.patch @@ -1,7 +1,7 @@ -From 97ec7dbda41e62685428fc695ba593986bbf9ef0 Mon Sep 17 00:00:00 2001 +From 5f9da3f16acdce1cdc706201022974834dafe278 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 22 Feb 2016 15:30:05 -0500 -Subject: [PATCH 139/192] Warn if grub password will not be read (#1290803) +Subject: [PATCH 139/194] 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 @@ -27,5 +27,5 @@ index dd76f00fc..fb9d3a3b6 100644 + echo "Update your configuration with @grub_mkconfig@ to support this feature." +fi -- -2.13.4 +2.13.5 diff --git a/0140-Clean-up-grub-setpassword-documentation-1290799.patch b/0140-Clean-up-grub-setpassword-documentation-1290799.patch index 3d36c6e..437a92d 100644 --- a/0140-Clean-up-grub-setpassword-documentation-1290799.patch +++ b/0140-Clean-up-grub-setpassword-documentation-1290799.patch @@ -1,7 +1,7 @@ -From 92a6412b9e3cf872792a2748310cd2a5861953da Mon Sep 17 00:00:00 2001 +From bcb4b0b97698eb0a68e1cf89c37cb644bbd1cec2 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Tue, 26 Jan 2016 10:28:35 -0500 -Subject: [PATCH 140/192] Clean up grub-setpassword documentation (#1290799) +Subject: [PATCH 140/194] 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 @@ -54,5 +54,5 @@ index fb9d3a3b6..c8c0fa419 100644 Report bugs at https://bugzilla.redhat.com. EOF -- -2.13.4 +2.13.5 diff --git a/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch b/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch index 7c3674f..66b8823 100644 --- a/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch +++ b/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch @@ -1,7 +1,7 @@ -From 4a85dce84b2ed10b30abcc40ab40d5882afae028 Mon Sep 17 00:00:00 2001 +From 6ed8e1dc5ebc489b51455d4a21872b5edeeeed7e Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Fri, 29 Jan 2016 16:56:11 -0500 -Subject: [PATCH 141/192] Fix locale issue in grub-setpassword (#1294243) +Subject: [PATCH 141/194] 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 @@ -26,5 +26,5 @@ index c8c0fa419..d7924af51 100644 sed -e "s/PBKDF2 hash of your password is //" } -- -2.13.4 +2.13.5 diff --git a/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch b/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch index 42dc65d..8cfed82 100644 --- a/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch +++ b/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch @@ -1,7 +1,7 @@ -From 8935c9fd26c5d4e2517393d4665b4602dfac0d63 Mon Sep 17 00:00:00 2001 +From d9392199bdda53cdd5461cd7ff8a0f361a49f301 Mon Sep 17 00:00:00 2001 From: Robert Elliott Date: Fri, 22 Jan 2016 13:32:30 +0100 -Subject: [PATCH 142/192] efiemu: Handle persistent RAM and unknown possible +Subject: [PATCH 142/194] efiemu: Handle persistent RAM and unknown possible future additions. (cherry picked from commit ae3b83a4d4df75a01198a2fed7542391e7c449e0) @@ -27,5 +27,5 @@ index 52a032f7b..92e7df7e5 100644 GRUB_EFI_PERSISTENT_MEMORY); default: -- -2.13.4 +2.13.5 diff --git a/0143-efiemu-Fix-compilation-failure.patch b/0143-efiemu-Fix-compilation-failure.patch index c03dc82..4e24d0a 100644 --- a/0143-efiemu-Fix-compilation-failure.patch +++ b/0143-efiemu-Fix-compilation-failure.patch @@ -1,7 +1,7 @@ -From a017f7824b24be5e818c4fd110c2a06df4d45a0f Mon Sep 17 00:00:00 2001 +From 05b8716bd5605eff7c55d752c110fb686934090c Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 22 Jan 2016 14:10:30 +0100 -Subject: [PATCH 143/192] efiemu: Fix compilation failure +Subject: [PATCH 143/194] efiemu: Fix compilation failure (cherry picked from commit b6a03dfd327489d53ee07c6d7d593b99c7b7cb62) @@ -26,5 +26,5 @@ index 92e7df7e5..52a032f7b 100644 GRUB_EFI_PERSISTENT_MEMORY); default: -- -2.13.4 +2.13.5 diff --git a/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index 3d8e5a1..ad3e37c 100644 --- a/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,7 +1,7 @@ -From 29a2a50d54efc3dbc79031e9188aa5694f2fcfc1 Mon Sep 17 00:00:00 2001 +From 885f6f6d08a1180c5cee1b28cd1d501e2c83f1e0 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 7 Apr 2016 10:58:06 -0400 -Subject: [PATCH 144/192] Revert "reopen SNP protocol for exclusive use by +Subject: [PATCH 144/194] Revert "reopen SNP protocol for exclusive use by grub" I *think* this should have been replaced by upstream's @@ -65,5 +65,5 @@ index b870d3f19..a3ce4c67c 100644 } } -- -2.13.4 +2.13.5 diff --git a/0145-Add-a-url-parser.patch b/0145-Add-a-url-parser.patch index 92d18e4..e8f57ef 100644 --- a/0145-Add-a-url-parser.patch +++ b/0145-Add-a-url-parser.patch @@ -1,7 +1,7 @@ -From 8616d37a59d2cce2e68ec4c497a7c42d525481d8 Mon Sep 17 00:00:00 2001 +From 8fdff58908ee2f23990db79cbed8bc36a1fbfd9c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jun 2016 16:18:44 -0400 -Subject: [PATCH 145/192] Add a url parser. +Subject: [PATCH 145/194] 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. @@ -1020,5 +1020,5 @@ index 000000000..a215fa27d + +#endif /* GRUB_URL_HEADER */ -- -2.13.4 +2.13.5 diff --git a/0146-efinet-and-bootp-add-support-for-dhcpv6.patch b/0146-efinet-and-bootp-add-support-for-dhcpv6.patch index 9eb4732..5221e84 100644 --- a/0146-efinet-and-bootp-add-support-for-dhcpv6.patch +++ b/0146-efinet-and-bootp-add-support-for-dhcpv6.patch @@ -1,7 +1,7 @@ -From 973a2cbc0d4cb3ac66b32525ba047f59dab060b2 Mon Sep 17 00:00:00 2001 +From d2336a91f9e497d6e7993d9f0b88012003d04e14 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 8 Jun 2016 21:03:37 -0400 -Subject: [PATCH 146/192] efinet and bootp: add support for dhcpv6 +Subject: [PATCH 146/194] efinet and bootp: add support for dhcpv6 Signed-off-by: Peter Jones --- @@ -663,5 +663,5 @@ index 50d62ab0c..f8f3ec13a 100644 grub_net_add_ipv4_local (struct grub_net_network_level_interface *inf, int mask); -- -2.13.4 +2.13.5 diff --git a/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch index 5134b68..5bfc9b8 100644 --- a/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +++ b/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch @@ -1,7 +1,7 @@ -From 291e69a7b9b2f56c8928e2a33827980992c94d1e Mon Sep 17 00:00:00 2001 +From 025c114176b79c2bdb9136fc0518e1d0d79a9cae Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 23 Jun 2016 11:01:39 -0400 -Subject: [PATCH 147/192] Add grub-get-kernel-settings and use it in 10_linux +Subject: [PATCH 147/194] 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 @@ -299,5 +299,5 @@ index 584ad1f46..c9bf223f2 100644 fi -- -2.13.4 +2.13.5 diff --git a/0148-Normalize-slashes-in-tftp-paths.patch b/0148-Normalize-slashes-in-tftp-paths.patch index 324502e..65ed5ab 100644 --- a/0148-Normalize-slashes-in-tftp-paths.patch +++ b/0148-Normalize-slashes-in-tftp-paths.patch @@ -1,7 +1,7 @@ -From bac663561b4d6b666d3a89d80f21a81667353989 Mon Sep 17 00:00:00 2001 +From 29409f7b6ade21079fec8e5044df6276d7b7d546 Mon Sep 17 00:00:00 2001 From: Lenny Szubowicz Date: Mon, 29 Aug 2016 11:04:48 -0400 -Subject: [PATCH 148/192] Normalize slashes in tftp paths. +Subject: [PATCH 148/194] 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. @@ -54,5 +54,5 @@ index 1157524fc..5ca0a96a6 100644 rrq += grub_strlen (filename) + 1; -- -2.13.4 +2.13.5 diff --git a/0149-Fix-malformed-tftp-packets.patch b/0149-Fix-malformed-tftp-packets.patch index f29c5a5..afc64dc 100644 --- a/0149-Fix-malformed-tftp-packets.patch +++ b/0149-Fix-malformed-tftp-packets.patch @@ -1,7 +1,7 @@ -From bb1eaf9f908130c805db845dfc5fffcaec0d98e4 Mon Sep 17 00:00:00 2001 +From b0f59f7eff93afc032b5edd7a78bdf72cb677ea2 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Tue, 7 Mar 2017 18:26:17 -0500 -Subject: [PATCH 149/192] Fix malformed tftp packets +Subject: [PATCH 149/194] 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. @@ -31,5 +31,5 @@ index 5ca0a96a6..dcd824943 100644 grub_strcpy (rrq, "octet"); rrqlen += grub_strlen ("octet") + 1; -- -2.13.4 +2.13.5 diff --git a/0150-Fix-race-in-EFI-validation.patch b/0150-Fix-race-in-EFI-validation.patch index 6264661..25c283c 100644 --- a/0150-Fix-race-in-EFI-validation.patch +++ b/0150-Fix-race-in-EFI-validation.patch @@ -1,7 +1,7 @@ -From 387037519dbb9f019fa377026f8abf27e34d0327 Mon Sep 17 00:00:00 2001 +From 9d512c81f31fd7218737de3225d62a925fbdad4a Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 14 Jul 2015 16:58:51 -0700 -Subject: [PATCH 150/192] Fix race in EFI validation +Subject: [PATCH 150/194] Fix race in EFI validation --- grub-core/loader/i386/efi/linux.c | 44 ++++++++++----------------------------- @@ -93,5 +93,5 @@ index e5b778577..7ccf32d9d 100644 { grub_dl_unref (my_mod); -- -2.13.4 +2.13.5 diff --git a/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch index 459f9aa..46af94f 100644 --- a/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch +++ b/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch @@ -1,7 +1,7 @@ -From e84de0761303285ef42940c70fc7a7d53a4a2504 Mon Sep 17 00:00:00 2001 +From abe32cb229f3f47e372b0a40a75f7202b9686f9e Mon Sep 17 00:00:00 2001 From: Masahiro Matsuya Date: Sat, 29 Oct 2016 08:35:26 +0900 -Subject: [PATCH 151/192] bz1374141 fix incorrect mask for ppc64 +Subject: [PATCH 151/194] 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(). @@ -44,5 +44,5 @@ index 002446be1..3df75357a 100644 if (gateway_addr.ipv4 != 0) -- -2.13.4 +2.13.5 diff --git a/0152-Use-device-part-of-chainloader-target-if-present.patch b/0152-Use-device-part-of-chainloader-target-if-present.patch index a887907..543ecf8 100644 --- a/0152-Use-device-part-of-chainloader-target-if-present.patch +++ b/0152-Use-device-part-of-chainloader-target-if-present.patch @@ -1,7 +1,7 @@ -From 90a2478253009a33584ee4ba3785e5945e64482d Mon Sep 17 00:00:00 2001 +From f8885d086fecab08c6f49037b61044e0a4793e8d Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Fri, 10 Apr 2015 01:45:02 -0400 -Subject: [PATCH 152/192] Use device part of chainloader target, if present. +Subject: [PATCH 152/194] Use device part of chainloader target, if present. Otherwise chainloading is restricted to '$root', which might not even be readable by EFI! @@ -33,5 +33,5 @@ index adc856366..14ce6ddd7 100644 goto fail; -- -2.13.4 +2.13.5 diff --git a/0153-Add-secureboot-support-on-efi-chainloader.patch b/0153-Add-secureboot-support-on-efi-chainloader.patch index f44fad5..b8a7d6e 100644 --- a/0153-Add-secureboot-support-on-efi-chainloader.patch +++ b/0153-Add-secureboot-support-on-efi-chainloader.patch @@ -1,7 +1,7 @@ -From f4cf150259fab118806ac1dcc4e73cb2e50b3ffc Mon Sep 17 00:00:00 2001 +From c28876ae7347a7102587b289055f126263406614 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 13:04:37 -0400 -Subject: [PATCH 153/192] Add secureboot support on efi chainloader +Subject: [PATCH 153/194] 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 @@ -796,5 +796,5 @@ index 7d44732d2..6e24dae2c 100644 { grub_uint32_t page_rva; -- -2.13.4 +2.13.5 diff --git a/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch index 9426df4..8398b91 100644 --- a/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +++ b/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch @@ -1,7 +1,7 @@ -From 4c768f9b3ee1f26b1d7cedc6f5aa79e9a77a0f1b Mon Sep 17 00:00:00 2001 +From 892992cce5df0ed3df9086b40064ac946954ced3 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 16:09:25 -0400 -Subject: [PATCH 154/192] Make any of the loaders that link in efi mode honor +Subject: [PATCH 154/194] 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 @@ -490,5 +490,5 @@ diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h new file mode 100644 index 000000000..e69de29bb -- -2.13.4 +2.13.5 diff --git a/0155-Make-grub_fatal-also-backtrace.patch b/0155-Make-grub_fatal-also-backtrace.patch index 39a83c7..ddafcf1 100644 --- a/0155-Make-grub_fatal-also-backtrace.patch +++ b/0155-Make-grub_fatal-also-backtrace.patch @@ -1,7 +1,7 @@ -From 6cc2859f44543f71ff448c44e65a65d867687ae8 Mon Sep 17 00:00:00 2001 +From 5e7a1d2555f759fe3422af4e4eb9f0199f76b7e8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 27 Jan 2016 09:22:42 -0500 -Subject: [PATCH 155/192] Make grub_fatal() also backtrace. +Subject: [PATCH 155/194] Make grub_fatal() also backtrace. --- grub-core/Makefile.core.def | 3 ++ @@ -171,5 +171,5 @@ index c3e03c727..c67273db3 100644 #include #include -- -2.13.4 +2.13.5 diff --git a/0156-Rework-linux-command.patch b/0156-Rework-linux-command.patch index de222c9..3853daf 100644 --- a/0156-Rework-linux-command.patch +++ b/0156-Rework-linux-command.patch @@ -1,7 +1,7 @@ -From 8c04cd7ab27fadf834df9f2f4d767b100547c190 Mon Sep 17 00:00:00 2001 +From 7b2ab6778772e342fd49040d47405660803a91ae Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:12:39 -0700 -Subject: [PATCH 156/192] Rework linux command +Subject: [PATCH 156/194] 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 @@ -103,5 +103,5 @@ index b2438547d..e4b8342f5 100644 grub_file_close (file); -- -2.13.4 +2.13.5 diff --git a/0157-Rework-linux16-command.patch b/0157-Rework-linux16-command.patch index 95346ff..2fb7e44 100644 --- a/0157-Rework-linux16-command.patch +++ b/0157-Rework-linux16-command.patch @@ -1,7 +1,7 @@ -From 17f5bd6c5f9c7d9e7ec922852038dcdfe9f52e86 Mon Sep 17 00:00:00 2001 +From 281bb55b2bce894c8b340a5782f50c9befa41e78 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:20:58 -0700 -Subject: [PATCH 157/192] Rework linux16 command +Subject: [PATCH 157/194] 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 @@ -97,5 +97,5 @@ index 91283157e..b864e5403 100644 grub_file_close (file); -- -2.13.4 +2.13.5 diff --git a/0158-Make-grub-editenv-build-again.patch b/0158-Make-grub-editenv-build-again.patch index cf72c4f..25230bb 100644 --- a/0158-Make-grub-editenv-build-again.patch +++ b/0158-Make-grub-editenv-build-again.patch @@ -1,7 +1,7 @@ -From 0102b5ffd55e96280fbbf67c823d52c4f913c3a5 Mon Sep 17 00:00:00 2001 +From a62f9a9929a8529f5e4c89286c4a48d1dd45e13d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Mar 2016 16:29:13 -0500 -Subject: [PATCH 158/192] Make grub-editenv build again. +Subject: [PATCH 158/194] Make grub-editenv build again. 36212460d3565b18439a3a8130b28e6c97702c6a split how some of the mkimage utility functions are defined, and they wind up being linked into @@ -26,5 +26,5 @@ index ed27351eb..38cdf4ccc 100644 common = util/config.c; common = util/resolve.c; -- -2.13.4 +2.13.5 diff --git a/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch index be4193a..57cc131 100644 --- a/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch +++ b/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch @@ -1,7 +1,7 @@ -From 6c3247e1bcad21587e3ec5ace9a5cd3b717471cf Mon Sep 17 00:00:00 2001 +From a3d0b20b048769cf70001538950697600a08b164 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 23 Sep 2014 09:58:49 -0400 -Subject: [PATCH 159/192] Fix up some man pages rpmdiff noticed. +Subject: [PATCH 159/194] Fix up some man pages rpmdiff noticed. --- configure.ac | 2 ++ @@ -149,5 +149,5 @@ index 000000000..853094827 +.SH SEE ALSO +.BR "info grub" -- -2.13.4 +2.13.5 diff --git a/0160-Re-work-some-intricacies-of-PE-loading.patch b/0160-Re-work-some-intricacies-of-PE-loading.patch index a20f1d8..ce91953 100644 --- a/0160-Re-work-some-intricacies-of-PE-loading.patch +++ b/0160-Re-work-some-intricacies-of-PE-loading.patch @@ -1,7 +1,7 @@ -From 98f57101ba066e247c87b7b39b53df2e597805ee Mon Sep 17 00:00:00 2001 +From 8c24e280be2465f1f412c318fbbe98022a63c351 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 9 Jun 2016 12:22:29 -0400 -Subject: [PATCH 160/192] Re-work some intricacies of PE loading. +Subject: [PATCH 160/194] 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 @@ -349,5 +349,5 @@ index 6e24dae2c..c03cc599f 100644 struct grub_pe32_header -- -2.13.4 +2.13.5 diff --git a/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch b/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch index 9de28b9..f3f0d65 100644 --- a/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch +++ b/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch @@ -1,7 +1,7 @@ -From b25aeee879c5b5dc8bf642c11090feb9b3ed875f Mon Sep 17 00:00:00 2001 +From 1e83cbd99c80c82b58f14df243b35aba21636458 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 10 Jun 2016 14:06:15 -0400 -Subject: [PATCH 161/192] Rework even more of efi chainload so non-sb cases +Subject: [PATCH 161/194] 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 @@ -80,10 +80,10 @@ index a41b6c5b8..d74778b0c 100644 if (*secure_boot && !*setup_mode) ret = 1; diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 03ff83563..34f34e65a 100644 +index 33345d375..ad39a3015 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c -@@ -248,6 +248,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), +@@ -247,6 +247,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), grub_file_t file = 0; struct grub_arm64_linux_kernel_header lh; struct grub_arm64_linux_pe_header *pe; @@ -91,7 +91,7 @@ index 03ff83563..34f34e65a 100644 grub_dl_ref (my_mod); -@@ -292,7 +293,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), +@@ -291,7 +292,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), grub_dprintf ("linux", "kernel @ %p\n", kernel_addr); @@ -409,5 +409,5 @@ index d9ede3677..0033d9305 100644 grub_err_t EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset, -- -2.13.4 +2.13.5 diff --git a/0162-linuxefi-fix-double-free-on-verification-failure.patch b/0162-linuxefi-fix-double-free-on-verification-failure.patch index 5a96a66..0e09f8f 100644 --- a/0162-linuxefi-fix-double-free-on-verification-failure.patch +++ b/0162-linuxefi-fix-double-free-on-verification-failure.patch @@ -1,7 +1,7 @@ -From 174e79117b2996a9388c1cba6ac3bfbf053396c3 Mon Sep 17 00:00:00 2001 +From 7b0b3f1f0d68b4362e4a839a84d968e9f521cc7e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jun 2016 09:50:25 -0400 -Subject: [PATCH 162/192] linuxefi: fix double free on verification failure. +Subject: [PATCH 162/194] linuxefi: fix double free on verification failure. Signed-off-by: Peter Jones --- @@ -21,5 +21,5 @@ index 82f75b7f3..010bf982d 100644 } -- -2.13.4 +2.13.5 diff --git a/0163-fix-machine-type-test-in-30_os-prober.in.patch b/0163-fix-machine-type-test-in-30_os-prober.in.patch index c16459c..bde3d51 100644 --- a/0163-fix-machine-type-test-in-30_os-prober.in.patch +++ b/0163-fix-machine-type-test-in-30_os-prober.in.patch @@ -1,7 +1,7 @@ -From 5368a034f371af6614de303b057fdc092892611a Mon Sep 17 00:00:00 2001 +From dff704cc19aba7aa6e2981d80fb3c927351f51b2 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 11 Jul 2016 13:36:45 -0400 -Subject: [PATCH 163/192] fix machine type test in 30_os-prober.in +Subject: [PATCH 163/194] fix machine type test in 30_os-prober.in Signed-off-by: Peter Jones --- @@ -21,5 +21,5 @@ index dc98eace9..e40274fc0 100644 i?86|x86_64) sixteenbit="16" -- -2.13.4 +2.13.5 diff --git a/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch b/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch index b0b5c83..f60fa8b 100644 --- a/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch +++ b/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch @@ -1,7 +1,7 @@ -From 7004abbe4fd446b9ad6b03b657397704009382af Mon Sep 17 00:00:00 2001 +From 87ba5c404c474c78c01199a2b05096015d493988 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Mon, 21 Nov 2016 15:34:00 +0100 -Subject: [PATCH 164/192] efi/chainloader: fix wrong sanity check in +Subject: [PATCH 164/194] efi/chainloader: fix wrong sanity check in relocate_coff() In relocate_coff(), the relocation entries are parsed from the original @@ -35,5 +35,5 @@ index b977c7b55..d5ab21d09 100644 grub_error (GRUB_ERR_BAD_ARGUMENT, "Reloc entry %d overflows binary", n); -- -2.13.4 +2.13.5 diff --git a/0165-efi-chainloader-truncate-overlong-relocation-section.patch b/0165-efi-chainloader-truncate-overlong-relocation-section.patch index 8a5ac5f..096844c 100644 --- a/0165-efi-chainloader-truncate-overlong-relocation-section.patch +++ b/0165-efi-chainloader-truncate-overlong-relocation-section.patch @@ -1,7 +1,7 @@ -From 0e2289b515d283b72ab86959a76d8a9ea2b608fc Mon Sep 17 00:00:00 2001 +From 496b570a7755415fa1ac8929da2f692470405640 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 23 Nov 2016 06:27:09 +0100 -Subject: [PATCH 165/192] efi/chainloader: truncate overlong relocation section +Subject: [PATCH 165/194] efi/chainloader: truncate overlong relocation section The UEFI Windows 7 boot loader ("EFI/Microsoft/Boot/bootmgfw.efi", SHA1 31b410e029bba87d2068c65a80b88882f9f8ea25) has inconsistent headers. @@ -109,5 +109,5 @@ index d5ab21d09..7826e794a 100644 grub_dprintf ("chain", " section is not reloc section?\n"); grub_dprintf ("chain", " rds: 0x%08x, vs: %08x\n", -- -2.13.4 +2.13.5 diff --git a/0166-linuxefi-minor-cleanups.patch b/0166-linuxefi-minor-cleanups.patch index c8a5ba6..8087c8e 100644 --- a/0166-linuxefi-minor-cleanups.patch +++ b/0166-linuxefi-minor-cleanups.patch @@ -1,7 +1,7 @@ -From 7daabb17821b515b26c948275ee5aa8b2208c649 Mon Sep 17 00:00:00 2001 +From f43a55cb0d8465355c2da26905d5817c0a8bf421 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Feb 2017 16:31:52 -0500 -Subject: [PATCH 166/192] linuxefi: minor cleanups +Subject: [PATCH 166/194] linuxefi: minor cleanups Signed-off-by: Peter Jones --- @@ -85,5 +85,5 @@ index 010bf982d..8b5a817b9 100644 return grub_errno; } -- -2.13.4 +2.13.5 diff --git a/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch index bdfc7c9..9c5264d 100644 --- a/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch +++ b/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch @@ -1,7 +1,7 @@ -From 5a5ab4ce7f57bf2e18ba0f1cfb8ab478adf32676 Mon Sep 17 00:00:00 2001 +From da87c2566ef96dc32cf0fd025c18cbbc8eceaa21 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Feb 2017 16:18:54 -0500 -Subject: [PATCH 167/192] Handle multi-arch (64-on-32) boot in linuxefi loader. +Subject: [PATCH 167/194] Handle multi-arch (64-on-32) boot in linuxefi loader. Allow booting 64-bit kernels on 32-bit EFI on x86. @@ -274,5 +274,5 @@ index fc36bdaf3..110ecf806 100644 grub_uint32_t hardware_subarch; grub_uint64_t hardware_subarch_data; -- -2.13.4 +2.13.5 diff --git a/0168-Fix-up-linux-params-usage.patch b/0168-Fix-up-linux-params-usage.patch index a15c66b..513b551 100644 --- a/0168-Fix-up-linux-params-usage.patch +++ b/0168-Fix-up-linux-params-usage.patch @@ -1,7 +1,7 @@ -From 6b2eba692ce88288202c826e70d30164b7d7f606 Mon Sep 17 00:00:00 2001 +From 266ba60c72da1116412d8f1c89cf67bb1b9b254c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 30 May 2017 14:16:07 -0400 -Subject: [PATCH 168/192] Fix up linux params usage... +Subject: [PATCH 168/194] Fix up linux params usage... Signed-off-by: Peter Jones --- @@ -39,5 +39,5 @@ index e4b8342f5..c9e89310b 100644 linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE; -- -2.13.4 +2.13.5 diff --git a/0169-Make-exit-take-a-return-code.patch b/0169-Make-exit-take-a-return-code.patch index aecf973..798d2e2 100644 --- a/0169-Make-exit-take-a-return-code.patch +++ b/0169-Make-exit-take-a-return-code.patch @@ -1,7 +1,7 @@ -From f06b7aa6c687bec98c237da8e63c4420fc46a7e5 Mon Sep 17 00:00:00 2001 +From ccf0fedfb6f550aa00fc2bdd1df1acce1d64363c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 26 Feb 2014 21:49:12 -0500 -Subject: [PATCH 169/192] Make "exit" take a return code. +Subject: [PATCH 169/194] 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 @@ -52,5 +52,5 @@ index 5ce89a40c..04371ac49 100644 grub_fatal (const char *fmt, ...) { -- -2.13.4 +2.13.5 diff --git a/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch b/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch index f1c16ee..1591843 100644 --- a/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch +++ b/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch @@ -1,7 +1,7 @@ -From 8ed119f11ac2981a123f192ba9229c31d4ecb287 Mon Sep 17 00:00:00 2001 +From 8adc85f6daabdd7ea991f8aa2b759fb4ed651198 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 17 Apr 2017 08:44:29 -0400 -Subject: [PATCH 170/192] arm64: make sure fdt has #address-cells and +Subject: [PATCH 170/194] arm64: make sure fdt has #address-cells and #size-cells properties Recent upstream changes to kexec-tools relies on #address-cells @@ -14,7 +14,7 @@ make sure they exist. 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 34f34e65a..530c4ba2d 100644 +index ad39a3015..59ff9cc05 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -79,7 +79,21 @@ finalize_params_linux (void) @@ -41,5 +41,5 @@ index 34f34e65a..530c4ba2d 100644 if (node < 1) goto failure; -- -2.13.4 +2.13.5 diff --git a/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch b/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch index 6d1b930..97e59da 100644 --- a/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch +++ b/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch @@ -1,7 +1,7 @@ -From d23b61bdbd200bfb6428dd1b36053614913c596b Mon Sep 17 00:00:00 2001 +From 0eff90e11b7ff7e0f9b9871d2e8bd9501297f881 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 9 May 2016 14:15:17 -0400 -Subject: [PATCH 171/192] Add some grub_dprintf() in the secure boot verify +Subject: [PATCH 171/194] Add some grub_dprintf() in the secure boot verify code. Signed-off-by: Peter Jones @@ -40,5 +40,5 @@ index 2a7024134..7fe7201a3 100644 return -1; } -- -2.13.4 +2.13.5 diff --git a/0172-Make-our-info-pages-say-grub2-where-appropriate.patch b/0172-Make-our-info-pages-say-grub2-where-appropriate.patch index 1db5065..850a582 100644 --- a/0172-Make-our-info-pages-say-grub2-where-appropriate.patch +++ b/0172-Make-our-info-pages-say-grub2-where-appropriate.patch @@ -1,7 +1,7 @@ -From c4a0a288ce09453a94c2e655094158338e20db6d Mon Sep 17 00:00:00 2001 +From 7df18806c44cde2f4b076b609ea6c0d94494bfde Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 6 May 2016 18:43:08 -0400 -Subject: [PATCH 172/192] Make our info pages say "grub2" where appropriate. +Subject: [PATCH 172/194] Make our info pages say "grub2" where appropriate. This needs to be hooked up to --program-transform=, but I haven't had time. @@ -1012,5 +1012,5 @@ index 15a90b26e..f28c4cd52 100644 @table @option @item --help -- -2.13.4 +2.13.5 diff --git a/0173-print-more-debug-info-in-our-module-loader.patch b/0173-print-more-debug-info-in-our-module-loader.patch index 2b21f00..532cff3 100644 --- a/0173-print-more-debug-info-in-our-module-loader.patch +++ b/0173-print-more-debug-info-in-our-module-loader.patch @@ -1,7 +1,7 @@ -From c94146470358e5ba3b2047f8e0aa762f9357a15e Mon Sep 17 00:00:00 2001 +From 42ce91748c4ccfef6151bddd8ef6a39f230b6f0c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 1 May 2017 11:19:40 -0400 -Subject: [PATCH 173/192] print more debug info in our module loader. +Subject: [PATCH 173/194] print more debug info in our module loader. Signed-off-by: Peter Jones --- @@ -40,5 +40,5 @@ index 684ca93f8..1f3ac5e1d 100644 } -- -2.13.4 +2.13.5 diff --git a/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch index 7077e87..5aa2e3c 100644 --- a/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch +++ b/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch @@ -1,7 +1,7 @@ -From 47b6acd4424c9e1dce694d1cc287fda2d3eca685 Mon Sep 17 00:00:00 2001 +From c3cf9f937ceeb015d508c15f88541f166a578b24 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 24 May 2017 12:42:32 -0400 -Subject: [PATCH 174/192] macos: just build chainloader entries, don't try any +Subject: [PATCH 174/194] 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 @@ -124,5 +124,5 @@ index e40274fc0..d979de198 100644 hurd) onstr="$(gettext_printf "(on %s)" "${DEVICE}")" -- -2.13.4 +2.13.5 diff --git a/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch index 0af5a24..482ee04 100644 --- a/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch +++ b/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch @@ -1,7 +1,7 @@ -From a3eaa70d8fec7f0fc5c13c4886bc67d3eab8ba6e Mon Sep 17 00:00:00 2001 +From b4685b552547012f3cd274fbcdc530fafff60ad0 Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Wed, 18 Dec 2013 09:57:04 +0000 -Subject: [PATCH 175/192] grub2/btrfs: Add ability to boot from subvolumes +Subject: [PATCH 175/194] 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. @@ -697,5 +697,5 @@ index 9d93fb6c1..234ad9767 100644 }; -- -2.13.4 +2.13.5 diff --git a/0176-export-btrfs_subvol-and-btrfs_subvolid.patch b/0176-export-btrfs_subvol-and-btrfs_subvolid.patch index 854eaa5..ea13b22 100644 --- a/0176-export-btrfs_subvol-and-btrfs_subvolid.patch +++ b/0176-export-btrfs_subvol-and-btrfs_subvolid.patch @@ -1,7 +1,7 @@ -From 1dcd15bbf1da1839c6dfa3e475f185fb72e55332 Mon Sep 17 00:00:00 2001 +From eabf98b042e3d018274304cd6afd80f2e30802df Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 18 Dec 2013 09:57:04 +0000 -Subject: [PATCH 176/192] export btrfs_subvol and btrfs_subvolid +Subject: [PATCH 176/194] 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. @@ -25,5 +25,5 @@ index 38facf3cb..396296166 100644 GRUB_MOD_FINI (btrfs) -- -2.13.4 +2.13.5 diff --git a/0177-grub2-btrfs-03-follow_default.patch b/0177-grub2-btrfs-03-follow_default.patch index 7f41e99..2d966ad 100644 --- a/0177-grub2-btrfs-03-follow_default.patch +++ b/0177-grub2-btrfs-03-follow_default.patch @@ -1,7 +1,7 @@ -From c92dacf72b436c42f7a417b161852017bd95ac72 Mon Sep 17 00:00:00 2001 +From 6ed9db71fa2593098dd94c14df0f304501f803d4 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 -Subject: [PATCH 177/192] grub2-btrfs-03-follow_default +Subject: [PATCH 177/194] grub2-btrfs-03-follow_default --- grub-core/fs/btrfs.c | 107 ++++++++++++++++++++++++++++++++++++--------------- @@ -195,5 +195,5 @@ index 396296166..2c462584e 100644 GRUB_MOD_FINI (btrfs) -- -2.13.4 +2.13.5 diff --git a/0178-grub2-btrfs-04-grub2-install.patch b/0178-grub2-btrfs-04-grub2-install.patch index 69057b1..8408eeb 100644 --- a/0178-grub2-btrfs-04-grub2-install.patch +++ b/0178-grub2-btrfs-04-grub2-install.patch @@ -1,7 +1,7 @@ -From 9501029137b4751b2cb0c84baf23f31a8ff1a4dd Mon Sep 17 00:00:00 2001 +From 1edd1a29619c55a734ea75e6c709c370af52046f Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 -Subject: [PATCH 178/192] grub2-btrfs-04-grub2-install +Subject: [PATCH 178/194] grub2-btrfs-04-grub2-install --- grub-core/osdep/linux/getroot.c | 7 +++++++ @@ -173,5 +173,5 @@ index 47a241a39..5db7a9a7d 100644 if (state->arg_num == 0) arguments->pathname = xstrdup (arg); -- -2.13.4 +2.13.5 diff --git a/0179-grub2-btrfs-05-grub2-mkconfig.patch b/0179-grub2-btrfs-05-grub2-mkconfig.patch index 36c22c5..15938a7 100644 --- a/0179-grub2-btrfs-05-grub2-mkconfig.patch +++ b/0179-grub2-btrfs-05-grub2-mkconfig.patch @@ -1,7 +1,7 @@ -From d5f0e3cb0b3e038f35cdddf798e095cb1c9b8d00 Mon Sep 17 00:00:00 2001 +From ea5165c77ba088d772966e5bb5ead9321055f8b1 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 -Subject: [PATCH 179/192] grub2-btrfs-05-grub2-mkconfig +Subject: [PATCH 179/194] grub2-btrfs-05-grub2-mkconfig --- util/grub-mkconfig.in | 3 ++- @@ -126,5 +126,5 @@ index 54f1ec8a2..462f8e1f8 100644 xzfs) rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` -- -2.13.4 +2.13.5 diff --git a/0180-grub2-btrfs-06-subvol-mount.patch b/0180-grub2-btrfs-06-subvol-mount.patch index a051d53..ba0fe44 100644 --- a/0180-grub2-btrfs-06-subvol-mount.patch +++ b/0180-grub2-btrfs-06-subvol-mount.patch @@ -1,7 +1,7 @@ -From db75dad097b89491d1f2140a054a08c9a2975c40 Mon Sep 17 00:00:00 2001 +From 96e889f67248f1bf874fb8e21d414e3057c66c1f Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Fri, 22 May 2015 11:45:25 +0000 -Subject: [PATCH 180/192] grub2-btrfs-06-subvol-mount +Subject: [PATCH 180/194] grub2-btrfs-06-subvol-mount --- grub-core/fs/btrfs.c | 195 +++++++++++++++++++++++++++++++++++++++- @@ -536,5 +536,5 @@ index 036fe1822..cd84a72b9 100644 const char *core_name = NULL; -- -2.13.4 +2.13.5 diff --git a/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch b/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch index d442f7f..5cc7dc9 100644 --- a/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch +++ b/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch @@ -1,7 +1,7 @@ -From dcccb8337cd0a5e7fdcaa32be83466430a4919dd Mon Sep 17 00:00:00 2001 +From 63c59bd4e393c7f685a4685a1af453d98939ce4d Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Sat, 18 Jul 2015 15:38:08 +0000 -Subject: [PATCH 181/192] No more "Bootable Snapshot" submenu in grub.cfg. +Subject: [PATCH 181/194] No more "Bootable Snapshot" submenu in grub.cfg. This breaks grubby (run on kernel upgrades) because grubby just does a search for "menuentry". @@ -30,5 +30,5 @@ index e2a533001..8a16fea34 100644 -EOF -fi -- -2.13.4 +2.13.5 diff --git a/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch index 9a1f604..fbd8d96 100644 --- a/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch +++ b/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch @@ -1,7 +1,7 @@ -From 71e874b34e9af7a3cd92742064ff53356f30614c Mon Sep 17 00:00:00 2001 +From aa75a46ae1f57fb15f7258071a865382dbf813b4 Mon Sep 17 00:00:00 2001 From: Andrei Borzenkov Date: Tue, 21 Jun 2016 16:44:17 +0000 -Subject: [PATCH 182/192] Fallback to old subvol name scheme to support old +Subject: [PATCH 182/194] Fallback to old subvol name scheme to support old snapshot config Ref: bsc#953538 @@ -56,5 +56,5 @@ index d111147e8..a5c000805 100644 if (btrfs_default_subvolid) return lookup_root_by_id(data, btrfs_default_subvolid); -- -2.13.4 +2.13.5 diff --git a/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch index 27e49b8..cbd5943 100644 --- a/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch +++ b/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch @@ -1,7 +1,7 @@ -From c7ef72a2a071bce0560483cb963ca4734b69ceee Mon Sep 17 00:00:00 2001 +From 1feb5549266dcfc94811b5337f1621ed1010ed85 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 11 May 2017 08:56:57 +0000 -Subject: [PATCH 183/192] Grub not working correctly with btrfs snapshots +Subject: [PATCH 183/194] Grub not working correctly with btrfs snapshots (bsc#1026511) --- @@ -272,5 +272,5 @@ index a5c000805..3cd947219 100644 subvol_set_env); grub_register_variable_hook ("btrfs_subvolid", subvolid_get_env, -- -2.13.4 +2.13.5 diff --git a/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch index 361d340..d16bdbe 100644 --- a/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch +++ b/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch @@ -1,7 +1,7 @@ -From 7775ed257814eff3867bd09a3156b7ca77bc0f6d Mon Sep 17 00:00:00 2001 +From f466b53578a09a088bf9b3c1c617ea6a49187fe1 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 09:59:56 -0400 -Subject: [PATCH 184/192] Add grub_efi_allocate_pool() and grub_efi_free_pool() +Subject: [PATCH 184/194] Add grub_efi_allocate_pool() and grub_efi_free_pool() wrappers. Signed-off-by: Peter Jones @@ -71,5 +71,5 @@ index 91e29ce66..68326d96f 100644 struct grub_net_card; -- -2.13.4 +2.13.5 diff --git a/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch index 0438d66..f24de2a 100644 --- a/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch +++ b/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch @@ -1,7 +1,7 @@ -From 8877b728ff3c33f0fc25a2bf6cda8dfbe30ef8c5 Mon Sep 17 00:00:00 2001 +From 598a3479f505f5181b42c991b57faf401d7ff483 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 10:06:38 -0400 -Subject: [PATCH 185/192] Use grub_efi_...() memory helpers where reasonable. +Subject: [PATCH 185/194] 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 @@ -105,5 +105,5 @@ index 7826e794a..d2557b38d 100644 if (cmdline) grub_free (cmdline); -- -2.13.4 +2.13.5 diff --git a/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch index 7ad0c1e..cea07d4 100644 --- a/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch +++ b/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch @@ -1,7 +1,7 @@ -From 6ba24572ef934a14b56f32bd2cd9655d5e216d2e Mon Sep 17 00:00:00 2001 +From 9fc1a37176af4503668566c17fe59e4c6279c9eb Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 10:07:50 -0400 -Subject: [PATCH 186/192] Add PRIxGRUB_EFI_STATUS and use it. +Subject: [PATCH 186/194] Add PRIxGRUB_EFI_STATUS and use it. This avoids syntax checkers getting confused about if it's llx or lx. @@ -45,5 +45,5 @@ index 02488ec35..ddc5ecfb0 100644 #define GRUB_EFI_ERROR_CODE(value) \ ((((grub_efi_status_t) 1) << (sizeof (grub_efi_status_t) * 8 - 1)) | (value)) -- -2.13.4 +2.13.5 diff --git a/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch b/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch index 9a0e031..ce0cd75 100644 --- a/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch +++ b/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch @@ -1,7 +1,7 @@ -From 94763d8eb1aeb0a1332f6e262dfc0bde4540b868 Mon Sep 17 00:00:00 2001 +From f7907ed5c7cf15d9d048712d7ea2905b04d05aa9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:42:57 -0400 -Subject: [PATCH 187/192] Don't use dynamic sized arrays since we don't build +Subject: [PATCH 187/194] Don't use dynamic sized arrays since we don't build with -std=c99 --- @@ -42,5 +42,5 @@ index 4be228d95..fa3e29126 100644 { grub_strcpy (suffix, client_uuid); -- -2.13.4 +2.13.5 diff --git a/0188-don-t-ignore-const.patch b/0188-don-t-ignore-const.patch index 12c8a26..282f4ef 100644 --- a/0188-don-t-ignore-const.patch +++ b/0188-don-t-ignore-const.patch @@ -1,7 +1,7 @@ -From ba1843ecde7b5352aeebbe8ce0f7d9bfb95ec3fb Mon Sep 17 00:00:00 2001 +From be9ebcff6abe0f6552260fa1e466ea1538203b8e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:43:22 -0400 -Subject: [PATCH 188/192] don't ignore const +Subject: [PATCH 188/194] don't ignore const --- grub-core/net/tftp.c | 2 +- @@ -21,5 +21,5 @@ index dcd824943..f90071353 100644 while (*src != '\0') { -- -2.13.4 +2.13.5 diff --git a/0189-don-t-use-int-for-efi-status.patch b/0189-don-t-use-int-for-efi-status.patch index 68e4016..e033b16 100644 --- a/0189-don-t-use-int-for-efi-status.patch +++ b/0189-don-t-use-int-for-efi-status.patch @@ -1,7 +1,7 @@ -From 6711c5bb2641789ac5e24bf880283eef65532518 Mon Sep 17 00:00:00 2001 +From b780ae62e178eb12a7c516b3de852556a1f3772f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:44:59 -0400 -Subject: [PATCH 189/192] don't use int for efi status +Subject: [PATCH 189/194] don't use int for efi status --- grub-core/kern/efi/efi.c | 2 +- @@ -21,5 +21,5 @@ index 1f3ac5e1d..2b60a6e27 100644 if (retval == 0) rc = GRUB_EFI_SUCCESS; -- -2.13.4 +2.13.5 diff --git a/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch index 2b93a39..1449d16 100644 --- a/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +++ b/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch @@ -1,7 +1,7 @@ -From a80182d86a6a55413b5794a2eca80b4b7dfc9be5 Mon Sep 17 00:00:00 2001 +From 4eff8a4634c2fd1fb4ece9d49e0b99b83b01b4c9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:46:23 -0400 -Subject: [PATCH 190/192] make GRUB_MOD_INIT() declare its function prototypes. +Subject: [PATCH 190/194] make GRUB_MOD_INIT() declare its function prototypes. --- include/grub/dl.h | 2 ++ @@ -28,5 +28,5 @@ index 2bca56ce0..b1ed3c333 100644 grub_##name##_fini (void) { grub_mod_fini (); } \ static void \ -- -2.13.4 +2.13.5 diff --git a/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch b/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch index f3d6dbd..bde02a1 100644 --- a/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch +++ b/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch @@ -1,7 +1,7 @@ -From 7d1c68137a2c4c69e3b4407d9771ccb51f3341fe Mon Sep 17 00:00:00 2001 +From 64c42b56e509074fb831ca99fa629d58c1073d68 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 24 May 2017 15:58:18 -0400 -Subject: [PATCH 191/192] Clean up some errors in the linuxefi loader +Subject: [PATCH 191/194] Clean up some errors in the linuxefi loader Signed-off-by: Peter Jones --- @@ -65,5 +65,5 @@ index bed5919ca..6db5d0bf3 100644 linux_cmdline, BYTES_TO_PAGES(lh->cmdline_size + 1)); -- -2.13.4 +2.13.5 diff --git a/0192-editenv-handle-relative-symlinks.patch b/0192-editenv-handle-relative-symlinks.patch index 87dfeff..3113a45 100644 --- a/0192-editenv-handle-relative-symlinks.patch +++ b/0192-editenv-handle-relative-symlinks.patch @@ -1,7 +1,7 @@ -From 54a01b15263a71dce51f4da826e1364780c45590 Mon Sep 17 00:00:00 2001 +From 22e713954e46af9694b670cdab6ab78dea4f7958 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 14 Aug 2017 14:37:20 -0400 -Subject: [PATCH 192/192] editenv: handle relative symlinks +Subject: [PATCH 192/194] 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. @@ -49,5 +49,5 @@ index d8d1dad6a..41bc7cb1c 100644 int rc = grub_util_rename (namenew, rename_target); -- -2.13.4 +2.13.5 diff --git a/0193-Make-libgrub.pp-depend-on-config-util.h.patch b/0193-Make-libgrub.pp-depend-on-config-util.h.patch index 332fb06..1afc630 100644 --- a/0193-Make-libgrub.pp-depend-on-config-util.h.patch +++ b/0193-Make-libgrub.pp-depend-on-config-util.h.patch @@ -1,7 +1,7 @@ -From 270c98a14f04ec48e93a67b32a66442773689ff4 Mon Sep 17 00:00:00 2001 +From a055bf63e671e97ce5fe9f0948a4071162983167 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 23 Aug 2017 10:37:27 -0400 -Subject: [PATCH] Make libgrub.pp depend on config-util.h +Subject: [PATCH 193/194] Make libgrub.pp depend on config-util.h If you build with "make -j48" a lot, sometimes you see: diff --git a/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch index fcf0496..e3b1971 100644 --- a/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch +++ b/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch @@ -1,7 +1,7 @@ -From fafbdc268d3ea0fbebd2589083088adc1a3e8004 Mon Sep 17 00:00:00 2001 +From 19c53f1f4b0ebbab6c100ffebd66ed4170359ae6 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 20 Apr 2017 13:29:06 -0400 -Subject: [PATCH] Don't guess /boot/efi/ as HFS+ on ppc machines in +Subject: [PATCH 194/194] 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/grub2.spec b/grub2.spec index ae52d6c..a205857 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -73,20 +73,6 @@ hardware devices.\ %description %{desc} -# temporary -%ifarch x86_64 aarch64 -%package efi -Summary: Bootloader with support for Linux, Multiboot, and more -Group: System Environment/Base -Requires: %{name}-tools-minimal = %{evr} -Requires: %{name}-tools-extra = %{evr} -Requires: %{name}-tools = %{evr} - -%description efi -%{desc} -This subpackage provides support for %{_arch} EFI systems -%endif - %package common Summary: grub2 common layout Group: System Environment/Base @@ -316,23 +302,6 @@ fi %files -# temporary -%ifarch x86_64 aarch64 -%files efi -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name}-efi.cfg -%dir %attr(0755,root,root)/boot/efi/EFI/%{efidir} -%dir %attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts -%ghost %config(noreplace) /boot/efi/EFI/%{efidir}/grub.cfg -/boot/grub2/grubenv -%ghost %config(noreplace) %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grubenv -/boot/efi/EFI/%{efidir}/fonts/unicode.pf2 -/boot/efi/EFI/%{efidir}/gcd%{efiarch}.efi -/boot/efi/EFI/%{efidir}/grub%{efiarch}.efi -/boot/grub2/grubenv -%license COPYING -%endif - %files common -f grub.lang %dir %{_libdir}/grub/ %dir %{_datarootdir}/grub/ @@ -490,6 +459,11 @@ fi %endif %changelog +* Thu Aug 24 2017 Peter Jones - 2.02-12 +- Fix arm kernel command line allocation + Resolves: rhbz#1484609 +- Get rid of the temporary extra efi packages hack. + * Wed Aug 23 2017 Peter Jones - 2.02-11 - Put grub2-mkimage in -tools, not -tools-extra. - Fix i686 building From e882b3a954e57b7fc5e19db4e877d150a0af527c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 24 Aug 2017 14:28:55 -0400 Subject: [PATCH 16/20] Fix accidentally regressed return type fix on calibrate_tsc_hardcode() --- ...e-the-Stall-EFI-boot-service-on-GRUB.patch | 20 ++++++++----------- ...fig-construct-titles-that-look-like-.patch | 2 +- ...-configure.ac-and-grub-rpm-sort-play.patch | 2 +- 0134-tcp-add-window-scaling-support.patch | 2 +- ...net-retransmit-if-our-device-is-busy.patch | 2 +- ...out-actually-using-the-configured-ne.patch | 2 +- ...r-for-the-first-exclusive-reopen-of-.patch | 2 +- ...ue-when-reading-username-and-passwor.patch | 2 +- ...ub-password-will-not-be-read-1290803.patch | 2 +- ...ub-setpassword-documentation-1290799.patch | 2 +- ...le-issue-in-grub-setpassword-1294243.patch | 2 +- ...rsistent-RAM-and-unknown-possible-fu.patch | 2 +- 0143-efiemu-Fix-compilation-failure.patch | 2 +- ...P-protocol-for-exclusive-use-by-grub.patch | 2 +- 0145-Add-a-url-parser.patch | 2 +- ...net-and-bootp-add-support-for-dhcpv6.patch | 2 +- ...rnel-settings-and-use-it-in-10_linux.patch | 2 +- 0148-Normalize-slashes-in-tftp-paths.patch | 2 +- 0149-Fix-malformed-tftp-packets.patch | 2 +- 0150-Fix-race-in-EFI-validation.patch | 2 +- ...1374141-fix-incorrect-mask-for-ppc64.patch | 2 +- ...art-of-chainloader-target-if-present.patch | 2 +- ...ecureboot-support-on-efi-chainloader.patch | 2 +- ...loaders-that-link-in-efi-mode-honor-.patch | 2 +- 0155-Make-grub_fatal-also-backtrace.patch | 2 +- 0156-Rework-linux-command.patch | 2 +- 0157-Rework-linux16-command.patch | 2 +- 0158-Make-grub-editenv-build-again.patch | 2 +- ...ix-up-some-man-pages-rpmdiff-noticed.patch | 2 +- ...-work-some-intricacies-of-PE-loading.patch | 2 +- ...-of-efi-chainload-so-non-sb-cases-wo.patch | 2 +- ...-double-free-on-verification-failure.patch | 2 +- ...machine-type-test-in-30_os-prober.in.patch | 2 +- ...fix-wrong-sanity-check-in-relocate_c.patch | 2 +- ...truncate-overlong-relocation-section.patch | 2 +- 0166-linuxefi-minor-cleanups.patch | 2 +- ...rch-64-on-32-boot-in-linuxefi-loader.patch | 2 +- 0168-Fix-up-linux-params-usage.patch | 2 +- 0169-Make-exit-take-a-return-code.patch | 2 +- ...fdt-has-address-cells-and-size-cells.patch | 2 +- ...rintf-in-the-secure-boot-verify-code.patch | 2 +- ...fo-pages-say-grub2-where-appropriate.patch | 2 +- ...more-debug-info-in-our-module-loader.patch | 2 +- ...-chainloader-entries-don-t-try-any-x.patch | 2 +- ...-Add-ability-to-boot-from-subvolumes.patch | 2 +- ...port-btrfs_subvol-and-btrfs_subvolid.patch | 2 +- 0177-grub2-btrfs-03-follow_default.patch | 2 +- 0178-grub2-btrfs-04-grub2-install.patch | 2 +- 0179-grub2-btrfs-05-grub2-mkconfig.patch | 2 +- 0180-grub2-btrfs-06-subvol-mount.patch | 2 +- ...ootable-Snapshot-submenu-in-grub.cfg.patch | 2 +- ...subvol-name-scheme-to-support-old-sn.patch | 2 +- ...-correctly-with-btrfs-snapshots-bsc-.patch | 2 +- ...ocate_pool-and-grub_efi_free_pool-wr.patch | 2 +- ...fi_.-memory-helpers-where-reasonable.patch | 2 +- 0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch | 2 +- ...c-sized-arrays-since-we-don-t-build-.patch | 2 +- 0188-don-t-ignore-const.patch | 2 +- 0189-don-t-use-int-for-efi-status.patch | 2 +- ...INIT-declare-its-function-prototypes.patch | 2 +- ...p-some-errors-in-the-linuxefi-loader.patch | 2 +- 0192-editenv-handle-relative-symlinks.patch | 2 +- ...e-libgrub.pp-depend-on-config-util.h.patch | 2 +- ...-efi-as-HFS-on-ppc-machines-in-grub-.patch | 2 +- 64 files changed, 71 insertions(+), 75 deletions(-) diff --git a/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch b/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch index b1f7e69..b9ffcb6 100644 --- a/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch +++ b/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch @@ -1,4 +1,4 @@ -From 55b69bdee6f721044ba1d44e2efae98ccbb888f5 Mon Sep 17 00:00:00 2001 +From 603f5c1a20ec0acd20227eb4c48ffc4d21960ec1 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Fri, 10 Oct 2014 11:11:09 +0200 Subject: [PATCH 131/194] calibrate_tsc(): use the Stall() EFI boot service on @@ -11,11 +11,11 @@ services instead. Signed-off-by: RHEL Ninjas --- - grub-core/kern/i386/tsc.c | 61 ++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 58 insertions(+), 3 deletions(-) + grub-core/kern/i386/tsc.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c -index 2e85289d8..ca3009cf5 100644 +index 2e85289d8..48c013860 100644 --- a/grub-core/kern/i386/tsc.c +++ b/grub-core/kern/i386/tsc.c @@ -24,6 +24,17 @@ @@ -81,16 +81,11 @@ index 2e85289d8..ca3009cf5 100644 static grub_uint64_t grub_tsc_get_time_ms (void) { -@@ -43,11 +92,17 @@ grub_tsc_get_time_ms (void) - return ((al * grub_tsc_rate) >> 32) + ah * grub_tsc_rate; - } - --static int -+static void +@@ -46,7 +95,15 @@ grub_tsc_get_time_ms (void) + static int calibrate_tsc_hardcode (void) { - grub_tsc_rate = 5368;/* 800 MHz */ -- return 1; + /* First calibrate the TSC rate (relative, not absolute time). */ + grub_uint64_t end_tsc; + @@ -99,9 +94,10 @@ index 2e85289d8..ca3009cf5 100644 + end_tsc = grub_get_tsc (); + + grub_tsc_rate = grub_divmod64 ((55ULL << 32), end_tsc - tsc_boot_time, 0); ++ + return 1; } - void -- 2.13.5 diff --git a/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index bc41993..27196bb 100644 --- a/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -1,4 +1,4 @@ -From fade370401ca1af3427a6669f582fd6c10cab3ad Mon Sep 17 00:00:00 2001 +From 1e3b125bce76027722c7ac9844298646f9a6e42d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 28 Apr 2015 11:15:03 -0400 Subject: [PATCH 132/194] Make grub2-mkconfig construct titles that look like diff --git a/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch b/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch index 68dd005..bc3104d 100644 --- a/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch +++ b/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch @@ -1,4 +1,4 @@ -From 48b83be63828dd8d6ad164dae7b564d8fdf36a90 Mon Sep 17 00:00:00 2001 +From fbfd5d8ed8993f3da4555b69a6018393be20b259 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 3 Aug 2015 11:46:42 -0400 Subject: [PATCH 133/194] Try to make sure configure.ac and grub-rpm-sort play diff --git a/0134-tcp-add-window-scaling-support.patch b/0134-tcp-add-window-scaling-support.patch index aa188c0..6ea60e9 100644 --- a/0134-tcp-add-window-scaling-support.patch +++ b/0134-tcp-add-window-scaling-support.patch @@ -1,4 +1,4 @@ -From c4ac5d23a45330af2cfd4a2eba0a20e4ed24b18e Mon Sep 17 00:00:00 2001 +From bb693d96ccfdd5a2bd79ae67325c75b81679fae7 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Wed, 12 Aug 2015 08:57:55 -0700 Subject: [PATCH 134/194] tcp: add window scaling support diff --git a/0135-efinet-retransmit-if-our-device-is-busy.patch b/0135-efinet-retransmit-if-our-device-is-busy.patch index 8e15fb4..ce67254 100644 --- a/0135-efinet-retransmit-if-our-device-is-busy.patch +++ b/0135-efinet-retransmit-if-our-device-is-busy.patch @@ -1,4 +1,4 @@ -From c116386a63dd4ce58ba2a3d81c0ce8b59a7288e5 Mon Sep 17 00:00:00 2001 +From 0fd33baa9fa8db6b8868a9691dc08a683bade47b Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Mon, 31 Aug 2015 13:34:35 -0400 Subject: [PATCH 135/194] efinet: retransmit if our device is busy diff --git a/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch b/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch index 8261827..b4e6f2f 100644 --- a/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch +++ b/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch @@ -1,4 +1,4 @@ -From c5cc06a8063b7d40dfd4d82affce37249b2bf627 Mon Sep 17 00:00:00 2001 +From 6296e091d9568b7334b5ba2392968ea839e404ba Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 11 Sep 2015 17:30:49 -0400 Subject: [PATCH 136/194] Be more aggro about actually using the *configured* diff --git a/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch b/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch index b1e2f3c..c42470e 100644 --- a/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch +++ b/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch @@ -1,4 +1,4 @@ -From f3ff7d48d06f5bde788a4c969c7d55604b13907e Mon Sep 17 00:00:00 2001 +From e1e6bdda43fd14f2a8a2dfe8352469921c820e0b Mon Sep 17 00:00:00 2001 From: RHEL Ninjas Date: Fri, 25 Sep 2015 16:24:23 +0900 Subject: [PATCH 137/194] efinet: add filter for the first exclusive reopen of diff --git a/0138-Fix-security-issue-when-reading-username-and-passwor.patch b/0138-Fix-security-issue-when-reading-username-and-passwor.patch index 33cb045..e0ec9d1 100644 --- a/0138-Fix-security-issue-when-reading-username-and-passwor.patch +++ b/0138-Fix-security-issue-when-reading-username-and-passwor.patch @@ -1,4 +1,4 @@ -From 6512905bc4a5f71729f1835898b65221731652f7 Mon Sep 17 00:00:00 2001 +From 7b470ffd69ab31874f04d8f4518f8feea592a16d Mon Sep 17 00:00:00 2001 From: Hector Marco-Gisbert Date: Fri, 13 Nov 2015 16:21:09 +0100 Subject: [PATCH 138/194] Fix security issue when reading username and password diff --git a/0139-Warn-if-grub-password-will-not-be-read-1290803.patch b/0139-Warn-if-grub-password-will-not-be-read-1290803.patch index 51f262a..a308304 100644 --- a/0139-Warn-if-grub-password-will-not-be-read-1290803.patch +++ b/0139-Warn-if-grub-password-will-not-be-read-1290803.patch @@ -1,4 +1,4 @@ -From 5f9da3f16acdce1cdc706201022974834dafe278 Mon Sep 17 00:00:00 2001 +From e49580ec2f0a1898df2dc54a99ee7a148f8f6a87 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 22 Feb 2016 15:30:05 -0500 Subject: [PATCH 139/194] Warn if grub password will not be read (#1290803) diff --git a/0140-Clean-up-grub-setpassword-documentation-1290799.patch b/0140-Clean-up-grub-setpassword-documentation-1290799.patch index 437a92d..ac5ea2c 100644 --- a/0140-Clean-up-grub-setpassword-documentation-1290799.patch +++ b/0140-Clean-up-grub-setpassword-documentation-1290799.patch @@ -1,4 +1,4 @@ -From bcb4b0b97698eb0a68e1cf89c37cb644bbd1cec2 Mon Sep 17 00:00:00 2001 +From ccef3063f3e6d95f8caa0154dc91a278d3f54dd1 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Tue, 26 Jan 2016 10:28:35 -0500 Subject: [PATCH 140/194] Clean up grub-setpassword documentation (#1290799) diff --git a/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch b/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch index 66b8823..7a732d6 100644 --- a/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch +++ b/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch @@ -1,4 +1,4 @@ -From 6ed8e1dc5ebc489b51455d4a21872b5edeeeed7e Mon Sep 17 00:00:00 2001 +From 149d7c90af749a5b2f0a958ea364785319fd290a Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Fri, 29 Jan 2016 16:56:11 -0500 Subject: [PATCH 141/194] Fix locale issue in grub-setpassword (#1294243) diff --git a/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch b/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch index 8cfed82..2cbb4a4 100644 --- a/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch +++ b/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch @@ -1,4 +1,4 @@ -From d9392199bdda53cdd5461cd7ff8a0f361a49f301 Mon Sep 17 00:00:00 2001 +From 30420391d9c42ee08d0d68b13de70a4f63b01ec8 Mon Sep 17 00:00:00 2001 From: Robert Elliott Date: Fri, 22 Jan 2016 13:32:30 +0100 Subject: [PATCH 142/194] efiemu: Handle persistent RAM and unknown possible diff --git a/0143-efiemu-Fix-compilation-failure.patch b/0143-efiemu-Fix-compilation-failure.patch index 4e24d0a..4a516a0 100644 --- a/0143-efiemu-Fix-compilation-failure.patch +++ b/0143-efiemu-Fix-compilation-failure.patch @@ -1,4 +1,4 @@ -From 05b8716bd5605eff7c55d752c110fb686934090c Mon Sep 17 00:00:00 2001 +From 0588a88adbd4fd4482a02f717c76b4b3753bd653 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 22 Jan 2016 14:10:30 +0100 Subject: [PATCH 143/194] efiemu: Fix compilation failure diff --git a/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index ad3e37c..14fdce1 100644 --- a/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,4 +1,4 @@ -From 885f6f6d08a1180c5cee1b28cd1d501e2c83f1e0 Mon Sep 17 00:00:00 2001 +From 7766b66bf1f1c7c586026be98883e60e2cc943b9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 7 Apr 2016 10:58:06 -0400 Subject: [PATCH 144/194] Revert "reopen SNP protocol for exclusive use by diff --git a/0145-Add-a-url-parser.patch b/0145-Add-a-url-parser.patch index e8f57ef..34d7f3f 100644 --- a/0145-Add-a-url-parser.patch +++ b/0145-Add-a-url-parser.patch @@ -1,4 +1,4 @@ -From 8fdff58908ee2f23990db79cbed8bc36a1fbfd9c Mon Sep 17 00:00:00 2001 +From af7f8bf044711fbbd3568b43e1ce31cdd6282561 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jun 2016 16:18:44 -0400 Subject: [PATCH 145/194] Add a url parser. diff --git a/0146-efinet-and-bootp-add-support-for-dhcpv6.patch b/0146-efinet-and-bootp-add-support-for-dhcpv6.patch index 5221e84..4be841c 100644 --- a/0146-efinet-and-bootp-add-support-for-dhcpv6.patch +++ b/0146-efinet-and-bootp-add-support-for-dhcpv6.patch @@ -1,4 +1,4 @@ -From d2336a91f9e497d6e7993d9f0b88012003d04e14 Mon Sep 17 00:00:00 2001 +From f809be3900ca1d95892f00d0c5dc8b975b510ef6 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 8 Jun 2016 21:03:37 -0400 Subject: [PATCH 146/194] efinet and bootp: add support for dhcpv6 diff --git a/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch index 5bfc9b8..7ca2092 100644 --- a/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +++ b/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch @@ -1,4 +1,4 @@ -From 025c114176b79c2bdb9136fc0518e1d0d79a9cae Mon Sep 17 00:00:00 2001 +From a037c9021bf1b24299a521d0c40643600ddc437e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 23 Jun 2016 11:01:39 -0400 Subject: [PATCH 147/194] Add grub-get-kernel-settings and use it in 10_linux diff --git a/0148-Normalize-slashes-in-tftp-paths.patch b/0148-Normalize-slashes-in-tftp-paths.patch index 65ed5ab..19c4bef 100644 --- a/0148-Normalize-slashes-in-tftp-paths.patch +++ b/0148-Normalize-slashes-in-tftp-paths.patch @@ -1,4 +1,4 @@ -From 29409f7b6ade21079fec8e5044df6276d7b7d546 Mon Sep 17 00:00:00 2001 +From 56569789e125711b56b6a2100ee901660aa57668 Mon Sep 17 00:00:00 2001 From: Lenny Szubowicz Date: Mon, 29 Aug 2016 11:04:48 -0400 Subject: [PATCH 148/194] Normalize slashes in tftp paths. diff --git a/0149-Fix-malformed-tftp-packets.patch b/0149-Fix-malformed-tftp-packets.patch index afc64dc..b21a08c 100644 --- a/0149-Fix-malformed-tftp-packets.patch +++ b/0149-Fix-malformed-tftp-packets.patch @@ -1,4 +1,4 @@ -From b0f59f7eff93afc032b5edd7a78bdf72cb677ea2 Mon Sep 17 00:00:00 2001 +From b62f9afe0f9b424237b68812d283aadc076109a1 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Tue, 7 Mar 2017 18:26:17 -0500 Subject: [PATCH 149/194] Fix malformed tftp packets diff --git a/0150-Fix-race-in-EFI-validation.patch b/0150-Fix-race-in-EFI-validation.patch index 25c283c..4ae0d3c 100644 --- a/0150-Fix-race-in-EFI-validation.patch +++ b/0150-Fix-race-in-EFI-validation.patch @@ -1,4 +1,4 @@ -From 9d512c81f31fd7218737de3225d62a925fbdad4a Mon Sep 17 00:00:00 2001 +From 6e1e394239abeb37940cf7fcbadddec9980061aa Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 14 Jul 2015 16:58:51 -0700 Subject: [PATCH 150/194] Fix race in EFI validation diff --git a/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch index 46af94f..4245e14 100644 --- a/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch +++ b/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch @@ -1,4 +1,4 @@ -From abe32cb229f3f47e372b0a40a75f7202b9686f9e Mon Sep 17 00:00:00 2001 +From 7e592062f2f97bb488bfe454e522c5cef9b2702f Mon Sep 17 00:00:00 2001 From: Masahiro Matsuya Date: Sat, 29 Oct 2016 08:35:26 +0900 Subject: [PATCH 151/194] bz1374141 fix incorrect mask for ppc64 diff --git a/0152-Use-device-part-of-chainloader-target-if-present.patch b/0152-Use-device-part-of-chainloader-target-if-present.patch index 543ecf8..f8ebfe5 100644 --- a/0152-Use-device-part-of-chainloader-target-if-present.patch +++ b/0152-Use-device-part-of-chainloader-target-if-present.patch @@ -1,4 +1,4 @@ -From f8885d086fecab08c6f49037b61044e0a4793e8d Mon Sep 17 00:00:00 2001 +From 88db52c0af846192d0e8ae56cf9b5ef041feeb4a Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Fri, 10 Apr 2015 01:45:02 -0400 Subject: [PATCH 152/194] Use device part of chainloader target, if present. diff --git a/0153-Add-secureboot-support-on-efi-chainloader.patch b/0153-Add-secureboot-support-on-efi-chainloader.patch index b8a7d6e..e58c457 100644 --- a/0153-Add-secureboot-support-on-efi-chainloader.patch +++ b/0153-Add-secureboot-support-on-efi-chainloader.patch @@ -1,4 +1,4 @@ -From c28876ae7347a7102587b289055f126263406614 Mon Sep 17 00:00:00 2001 +From ec51ea2e584230bfcac463b3355e76bb6cb0b89b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 13:04:37 -0400 Subject: [PATCH 153/194] Add secureboot support on efi chainloader diff --git a/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch index 8398b91..30c52b8 100644 --- a/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +++ b/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch @@ -1,4 +1,4 @@ -From 892992cce5df0ed3df9086b40064ac946954ced3 Mon Sep 17 00:00:00 2001 +From 2a279098464fb9c45491c0cd44a35ff88c9ea644 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 16:09:25 -0400 Subject: [PATCH 154/194] Make any of the loaders that link in efi mode honor diff --git a/0155-Make-grub_fatal-also-backtrace.patch b/0155-Make-grub_fatal-also-backtrace.patch index ddafcf1..407aa56 100644 --- a/0155-Make-grub_fatal-also-backtrace.patch +++ b/0155-Make-grub_fatal-also-backtrace.patch @@ -1,4 +1,4 @@ -From 5e7a1d2555f759fe3422af4e4eb9f0199f76b7e8 Mon Sep 17 00:00:00 2001 +From 482aef96798dec0896902dace1b1be71b1a12455 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 27 Jan 2016 09:22:42 -0500 Subject: [PATCH 155/194] Make grub_fatal() also backtrace. diff --git a/0156-Rework-linux-command.patch b/0156-Rework-linux-command.patch index 3853daf..164f0d2 100644 --- a/0156-Rework-linux-command.patch +++ b/0156-Rework-linux-command.patch @@ -1,4 +1,4 @@ -From 7b2ab6778772e342fd49040d47405660803a91ae Mon Sep 17 00:00:00 2001 +From a6c2dfdf5ea765938849dc7f54a685de0ef21193 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:12:39 -0700 Subject: [PATCH 156/194] Rework linux command diff --git a/0157-Rework-linux16-command.patch b/0157-Rework-linux16-command.patch index 2fb7e44..c7b0460 100644 --- a/0157-Rework-linux16-command.patch +++ b/0157-Rework-linux16-command.patch @@ -1,4 +1,4 @@ -From 281bb55b2bce894c8b340a5782f50c9befa41e78 Mon Sep 17 00:00:00 2001 +From fe4560a74b419441cc337e6395fd42f988616b32 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:20:58 -0700 Subject: [PATCH 157/194] Rework linux16 command diff --git a/0158-Make-grub-editenv-build-again.patch b/0158-Make-grub-editenv-build-again.patch index 25230bb..e7206ca 100644 --- a/0158-Make-grub-editenv-build-again.patch +++ b/0158-Make-grub-editenv-build-again.patch @@ -1,4 +1,4 @@ -From a62f9a9929a8529f5e4c89286c4a48d1dd45e13d Mon Sep 17 00:00:00 2001 +From a06e773669c63d8d32f54e17b31a7af66320a708 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Mar 2016 16:29:13 -0500 Subject: [PATCH 158/194] Make grub-editenv build again. diff --git a/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch index 57cc131..58a29a6 100644 --- a/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch +++ b/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch @@ -1,4 +1,4 @@ -From a3d0b20b048769cf70001538950697600a08b164 Mon Sep 17 00:00:00 2001 +From 37e1a445f41ebf79242310e5f9a39573118aa21b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 23 Sep 2014 09:58:49 -0400 Subject: [PATCH 159/194] Fix up some man pages rpmdiff noticed. diff --git a/0160-Re-work-some-intricacies-of-PE-loading.patch b/0160-Re-work-some-intricacies-of-PE-loading.patch index ce91953..c1ae027 100644 --- a/0160-Re-work-some-intricacies-of-PE-loading.patch +++ b/0160-Re-work-some-intricacies-of-PE-loading.patch @@ -1,4 +1,4 @@ -From 8c24e280be2465f1f412c318fbbe98022a63c351 Mon Sep 17 00:00:00 2001 +From 47e691b7f6e3035ff6658ea1c414661ee53eab02 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 9 Jun 2016 12:22:29 -0400 Subject: [PATCH 160/194] Re-work some intricacies of PE loading. diff --git a/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch b/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch index f3f0d65..c39a248 100644 --- a/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch +++ b/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch @@ -1,4 +1,4 @@ -From 1e83cbd99c80c82b58f14df243b35aba21636458 Mon Sep 17 00:00:00 2001 +From 654a7f0c5b1f89d8b77524faf5cda08b56d493c8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 10 Jun 2016 14:06:15 -0400 Subject: [PATCH 161/194] Rework even more of efi chainload so non-sb cases diff --git a/0162-linuxefi-fix-double-free-on-verification-failure.patch b/0162-linuxefi-fix-double-free-on-verification-failure.patch index 0e09f8f..41b7912 100644 --- a/0162-linuxefi-fix-double-free-on-verification-failure.patch +++ b/0162-linuxefi-fix-double-free-on-verification-failure.patch @@ -1,4 +1,4 @@ -From 7b0b3f1f0d68b4362e4a839a84d968e9f521cc7e Mon Sep 17 00:00:00 2001 +From 45e38084c55932c6039dfa1cb464ea12fd03488f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jun 2016 09:50:25 -0400 Subject: [PATCH 162/194] linuxefi: fix double free on verification failure. diff --git a/0163-fix-machine-type-test-in-30_os-prober.in.patch b/0163-fix-machine-type-test-in-30_os-prober.in.patch index bde3d51..0fc8d92 100644 --- a/0163-fix-machine-type-test-in-30_os-prober.in.patch +++ b/0163-fix-machine-type-test-in-30_os-prober.in.patch @@ -1,4 +1,4 @@ -From dff704cc19aba7aa6e2981d80fb3c927351f51b2 Mon Sep 17 00:00:00 2001 +From 939ff26ad26a6d3d17eb4d02a6c4cd263a3b107f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 11 Jul 2016 13:36:45 -0400 Subject: [PATCH 163/194] fix machine type test in 30_os-prober.in diff --git a/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch b/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch index f60fa8b..3fb9e4d 100644 --- a/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch +++ b/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch @@ -1,4 +1,4 @@ -From 87ba5c404c474c78c01199a2b05096015d493988 Mon Sep 17 00:00:00 2001 +From 64b1750a0d12280b7ac2612858680a99a673e24b Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Mon, 21 Nov 2016 15:34:00 +0100 Subject: [PATCH 164/194] efi/chainloader: fix wrong sanity check in diff --git a/0165-efi-chainloader-truncate-overlong-relocation-section.patch b/0165-efi-chainloader-truncate-overlong-relocation-section.patch index 096844c..d019393 100644 --- a/0165-efi-chainloader-truncate-overlong-relocation-section.patch +++ b/0165-efi-chainloader-truncate-overlong-relocation-section.patch @@ -1,4 +1,4 @@ -From 496b570a7755415fa1ac8929da2f692470405640 Mon Sep 17 00:00:00 2001 +From c073cea489549ce6b2398a14c407ff83f0a2962c Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 23 Nov 2016 06:27:09 +0100 Subject: [PATCH 165/194] efi/chainloader: truncate overlong relocation section diff --git a/0166-linuxefi-minor-cleanups.patch b/0166-linuxefi-minor-cleanups.patch index 8087c8e..954754e 100644 --- a/0166-linuxefi-minor-cleanups.patch +++ b/0166-linuxefi-minor-cleanups.patch @@ -1,4 +1,4 @@ -From f43a55cb0d8465355c2da26905d5817c0a8bf421 Mon Sep 17 00:00:00 2001 +From 93df822a82a37726833b977c4409141e1d8af3c9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Feb 2017 16:31:52 -0500 Subject: [PATCH 166/194] linuxefi: minor cleanups diff --git a/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch index 9c5264d..32d4cfa 100644 --- a/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch +++ b/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch @@ -1,4 +1,4 @@ -From da87c2566ef96dc32cf0fd025c18cbbc8eceaa21 Mon Sep 17 00:00:00 2001 +From c78c850158eedb26c82b4dabccb8a4b1f7daf458 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Feb 2017 16:18:54 -0500 Subject: [PATCH 167/194] Handle multi-arch (64-on-32) boot in linuxefi loader. diff --git a/0168-Fix-up-linux-params-usage.patch b/0168-Fix-up-linux-params-usage.patch index 513b551..8bb6ac5 100644 --- a/0168-Fix-up-linux-params-usage.patch +++ b/0168-Fix-up-linux-params-usage.patch @@ -1,4 +1,4 @@ -From 266ba60c72da1116412d8f1c89cf67bb1b9b254c Mon Sep 17 00:00:00 2001 +From 54fec7b1d6e7240e3ab5740abe7b14ebc6cad047 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 30 May 2017 14:16:07 -0400 Subject: [PATCH 168/194] Fix up linux params usage... diff --git a/0169-Make-exit-take-a-return-code.patch b/0169-Make-exit-take-a-return-code.patch index 798d2e2..f6ddea7 100644 --- a/0169-Make-exit-take-a-return-code.patch +++ b/0169-Make-exit-take-a-return-code.patch @@ -1,4 +1,4 @@ -From ccf0fedfb6f550aa00fc2bdd1df1acce1d64363c Mon Sep 17 00:00:00 2001 +From c281b1fc8f2533f7655c83d43d772092b9d74f7b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 26 Feb 2014 21:49:12 -0500 Subject: [PATCH 169/194] Make "exit" take a return code. diff --git a/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch b/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch index 1591843..8a92587 100644 --- a/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch +++ b/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch @@ -1,4 +1,4 @@ -From 8adc85f6daabdd7ea991f8aa2b759fb4ed651198 Mon Sep 17 00:00:00 2001 +From b9e2b2aa41a486c550c5bb9849f4e7587d1493e4 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 17 Apr 2017 08:44:29 -0400 Subject: [PATCH 170/194] arm64: make sure fdt has #address-cells and diff --git a/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch b/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch index 97e59da..2892907 100644 --- a/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch +++ b/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch @@ -1,4 +1,4 @@ -From 0eff90e11b7ff7e0f9b9871d2e8bd9501297f881 Mon Sep 17 00:00:00 2001 +From 56b10ac84eb7f4e260ec6f6efecc35e9fabc6b95 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 9 May 2016 14:15:17 -0400 Subject: [PATCH 171/194] Add some grub_dprintf() in the secure boot verify diff --git a/0172-Make-our-info-pages-say-grub2-where-appropriate.patch b/0172-Make-our-info-pages-say-grub2-where-appropriate.patch index 850a582..dff116b 100644 --- a/0172-Make-our-info-pages-say-grub2-where-appropriate.patch +++ b/0172-Make-our-info-pages-say-grub2-where-appropriate.patch @@ -1,4 +1,4 @@ -From 7df18806c44cde2f4b076b609ea6c0d94494bfde Mon Sep 17 00:00:00 2001 +From 497e06f02e9576c9cbfd560e8fb25567aaff6e4e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 6 May 2016 18:43:08 -0400 Subject: [PATCH 172/194] Make our info pages say "grub2" where appropriate. diff --git a/0173-print-more-debug-info-in-our-module-loader.patch b/0173-print-more-debug-info-in-our-module-loader.patch index 532cff3..ed76801 100644 --- a/0173-print-more-debug-info-in-our-module-loader.patch +++ b/0173-print-more-debug-info-in-our-module-loader.patch @@ -1,4 +1,4 @@ -From 42ce91748c4ccfef6151bddd8ef6a39f230b6f0c Mon Sep 17 00:00:00 2001 +From 409a1fe49689976f464e3db82cb48c6488b78864 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 1 May 2017 11:19:40 -0400 Subject: [PATCH 173/194] print more debug info in our module loader. diff --git a/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch index 5aa2e3c..f5fde3d 100644 --- a/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch +++ b/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch @@ -1,4 +1,4 @@ -From c3cf9f937ceeb015d508c15f88541f166a578b24 Mon Sep 17 00:00:00 2001 +From ebfc7bb290eb5be7919107d93ee6d03f3030d599 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 24 May 2017 12:42:32 -0400 Subject: [PATCH 174/194] macos: just build chainloader entries, don't try any diff --git a/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch index 482ee04..404cec8 100644 --- a/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch +++ b/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch @@ -1,4 +1,4 @@ -From b4685b552547012f3cd274fbcdc530fafff60ad0 Mon Sep 17 00:00:00 2001 +From 6dc076ff0e9487566885473b9b65f56ef3e02a1b Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Wed, 18 Dec 2013 09:57:04 +0000 Subject: [PATCH 175/194] grub2/btrfs: Add ability to boot from subvolumes diff --git a/0176-export-btrfs_subvol-and-btrfs_subvolid.patch b/0176-export-btrfs_subvol-and-btrfs_subvolid.patch index ea13b22..c7a481e 100644 --- a/0176-export-btrfs_subvol-and-btrfs_subvolid.patch +++ b/0176-export-btrfs_subvol-and-btrfs_subvolid.patch @@ -1,4 +1,4 @@ -From eabf98b042e3d018274304cd6afd80f2e30802df Mon Sep 17 00:00:00 2001 +From 28b70d9386749173ecfd3b153e6a8be36238405f Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 18 Dec 2013 09:57:04 +0000 Subject: [PATCH 176/194] export btrfs_subvol and btrfs_subvolid diff --git a/0177-grub2-btrfs-03-follow_default.patch b/0177-grub2-btrfs-03-follow_default.patch index 2d966ad..5676ffc 100644 --- a/0177-grub2-btrfs-03-follow_default.patch +++ b/0177-grub2-btrfs-03-follow_default.patch @@ -1,4 +1,4 @@ -From 6ed9db71fa2593098dd94c14df0f304501f803d4 Mon Sep 17 00:00:00 2001 +From 33d2bbf28d14971e531276fce042dadd4239de4e Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 Subject: [PATCH 177/194] grub2-btrfs-03-follow_default diff --git a/0178-grub2-btrfs-04-grub2-install.patch b/0178-grub2-btrfs-04-grub2-install.patch index 8408eeb..3c899fd 100644 --- a/0178-grub2-btrfs-04-grub2-install.patch +++ b/0178-grub2-btrfs-04-grub2-install.patch @@ -1,4 +1,4 @@ -From 1edd1a29619c55a734ea75e6c709c370af52046f Mon Sep 17 00:00:00 2001 +From ddf05a259df3e5c43ea0714abf227bdb82dd34a5 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 Subject: [PATCH 178/194] grub2-btrfs-04-grub2-install diff --git a/0179-grub2-btrfs-05-grub2-mkconfig.patch b/0179-grub2-btrfs-05-grub2-mkconfig.patch index 15938a7..9a50f20 100644 --- a/0179-grub2-btrfs-05-grub2-mkconfig.patch +++ b/0179-grub2-btrfs-05-grub2-mkconfig.patch @@ -1,4 +1,4 @@ -From ea5165c77ba088d772966e5bb5ead9321055f8b1 Mon Sep 17 00:00:00 2001 +From 8cc6f3420b5a42871cfc2bc7bdfed60b34eac4a8 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 Subject: [PATCH 179/194] grub2-btrfs-05-grub2-mkconfig diff --git a/0180-grub2-btrfs-06-subvol-mount.patch b/0180-grub2-btrfs-06-subvol-mount.patch index ba0fe44..f949871 100644 --- a/0180-grub2-btrfs-06-subvol-mount.patch +++ b/0180-grub2-btrfs-06-subvol-mount.patch @@ -1,4 +1,4 @@ -From 96e889f67248f1bf874fb8e21d414e3057c66c1f Mon Sep 17 00:00:00 2001 +From 67ac693c0da060226ab012074ee33156e7ebf338 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Fri, 22 May 2015 11:45:25 +0000 Subject: [PATCH 180/194] grub2-btrfs-06-subvol-mount diff --git a/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch b/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch index 5cc7dc9..563f815 100644 --- a/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch +++ b/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch @@ -1,4 +1,4 @@ -From 63c59bd4e393c7f685a4685a1af453d98939ce4d Mon Sep 17 00:00:00 2001 +From 36e3d3d7c8bc32cae3e3f86d3b89e0db5e9a330c Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Sat, 18 Jul 2015 15:38:08 +0000 Subject: [PATCH 181/194] No more "Bootable Snapshot" submenu in grub.cfg. diff --git a/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch index fbd8d96..196bdc0 100644 --- a/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch +++ b/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch @@ -1,4 +1,4 @@ -From aa75a46ae1f57fb15f7258071a865382dbf813b4 Mon Sep 17 00:00:00 2001 +From f26ee91138d132c84068bc6afb362eabc5d0af13 Mon Sep 17 00:00:00 2001 From: Andrei Borzenkov Date: Tue, 21 Jun 2016 16:44:17 +0000 Subject: [PATCH 182/194] Fallback to old subvol name scheme to support old diff --git a/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch index cbd5943..c4b5a57 100644 --- a/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch +++ b/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch @@ -1,4 +1,4 @@ -From 1feb5549266dcfc94811b5337f1621ed1010ed85 Mon Sep 17 00:00:00 2001 +From 2fd2c751861ecc2350d3bcb81228b3e663778dd1 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 11 May 2017 08:56:57 +0000 Subject: [PATCH 183/194] Grub not working correctly with btrfs snapshots diff --git a/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch index d16bdbe..a57c2c3 100644 --- a/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch +++ b/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch @@ -1,4 +1,4 @@ -From f466b53578a09a088bf9b3c1c617ea6a49187fe1 Mon Sep 17 00:00:00 2001 +From ab2832aae2c1aa27d95a18c9a15ea6e5b630cca9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 09:59:56 -0400 Subject: [PATCH 184/194] Add grub_efi_allocate_pool() and grub_efi_free_pool() diff --git a/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch index f24de2a..9c44fe2 100644 --- a/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch +++ b/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch @@ -1,4 +1,4 @@ -From 598a3479f505f5181b42c991b57faf401d7ff483 Mon Sep 17 00:00:00 2001 +From 38441515e97a0ae8bf668a747b40cd839821887a Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 10:06:38 -0400 Subject: [PATCH 185/194] Use grub_efi_...() memory helpers where reasonable. diff --git a/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch index cea07d4..feff5ea 100644 --- a/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch +++ b/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch @@ -1,4 +1,4 @@ -From 9fc1a37176af4503668566c17fe59e4c6279c9eb Mon Sep 17 00:00:00 2001 +From 03c01ad6ac50624a9cb9b061dbb9b46e590c6b1e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 10:07:50 -0400 Subject: [PATCH 186/194] Add PRIxGRUB_EFI_STATUS and use it. diff --git a/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch b/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch index ce0cd75..0a1bc5f 100644 --- a/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch +++ b/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch @@ -1,4 +1,4 @@ -From f7907ed5c7cf15d9d048712d7ea2905b04d05aa9 Mon Sep 17 00:00:00 2001 +From 4bb62c765c1456e33181b704a01008d8df42817f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:42:57 -0400 Subject: [PATCH 187/194] Don't use dynamic sized arrays since we don't build diff --git a/0188-don-t-ignore-const.patch b/0188-don-t-ignore-const.patch index 282f4ef..60c67e1 100644 --- a/0188-don-t-ignore-const.patch +++ b/0188-don-t-ignore-const.patch @@ -1,4 +1,4 @@ -From be9ebcff6abe0f6552260fa1e466ea1538203b8e Mon Sep 17 00:00:00 2001 +From a87adc91140a81b55728d0519bb14ace5ed7d3e3 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:43:22 -0400 Subject: [PATCH 188/194] don't ignore const diff --git a/0189-don-t-use-int-for-efi-status.patch b/0189-don-t-use-int-for-efi-status.patch index e033b16..5cd9d75 100644 --- a/0189-don-t-use-int-for-efi-status.patch +++ b/0189-don-t-use-int-for-efi-status.patch @@ -1,4 +1,4 @@ -From b780ae62e178eb12a7c516b3de852556a1f3772f Mon Sep 17 00:00:00 2001 +From 5f6a3933dfc6e3fff9aef089eea365f40e3c830c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:44:59 -0400 Subject: [PATCH 189/194] don't use int for efi status diff --git a/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch index 1449d16..5d155b2 100644 --- a/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +++ b/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch @@ -1,4 +1,4 @@ -From 4eff8a4634c2fd1fb4ece9d49e0b99b83b01b4c9 Mon Sep 17 00:00:00 2001 +From 25ef0f18c77e5a5080f04e34a84aa801f21fb893 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:46:23 -0400 Subject: [PATCH 190/194] make GRUB_MOD_INIT() declare its function prototypes. diff --git a/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch b/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch index bde02a1..8139d8a 100644 --- a/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch +++ b/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch @@ -1,4 +1,4 @@ -From 64c42b56e509074fb831ca99fa629d58c1073d68 Mon Sep 17 00:00:00 2001 +From 813a5703360d35260eae8f3916a66f1c1087320f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 24 May 2017 15:58:18 -0400 Subject: [PATCH 191/194] Clean up some errors in the linuxefi loader diff --git a/0192-editenv-handle-relative-symlinks.patch b/0192-editenv-handle-relative-symlinks.patch index 3113a45..4c72fe7 100644 --- a/0192-editenv-handle-relative-symlinks.patch +++ b/0192-editenv-handle-relative-symlinks.patch @@ -1,4 +1,4 @@ -From 22e713954e46af9694b670cdab6ab78dea4f7958 Mon Sep 17 00:00:00 2001 +From ed676cb54536f5ed2948babe61afff197de5083f Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 14 Aug 2017 14:37:20 -0400 Subject: [PATCH 192/194] editenv: handle relative symlinks diff --git a/0193-Make-libgrub.pp-depend-on-config-util.h.patch b/0193-Make-libgrub.pp-depend-on-config-util.h.patch index 1afc630..651971b 100644 --- a/0193-Make-libgrub.pp-depend-on-config-util.h.patch +++ b/0193-Make-libgrub.pp-depend-on-config-util.h.patch @@ -1,4 +1,4 @@ -From a055bf63e671e97ce5fe9f0948a4071162983167 Mon Sep 17 00:00:00 2001 +From e4b316bd39c8a93c146f0d4c4c570170084a7404 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 23 Aug 2017 10:37:27 -0400 Subject: [PATCH 193/194] Make libgrub.pp depend on config-util.h diff --git a/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch index e3b1971..843ecb5 100644 --- a/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch +++ b/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch @@ -1,4 +1,4 @@ -From 19c53f1f4b0ebbab6c100ffebd66ed4170359ae6 Mon Sep 17 00:00:00 2001 +From 5ca7869ea68cc03697596c106949f5636daef8d8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 20 Apr 2017 13:29:06 -0400 Subject: [PATCH 194/194] Don't guess /boot/efi/ as HFS+ on ppc machines in From 152cdcd6f5617322a4353847ee2d7f4ea9522032 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 25 Aug 2017 13:31:30 -0400 Subject: [PATCH 17/20] Minor updates to provides and excludes Add some unconditional Provides: grub2-efi on grub2-efi-${arch} grub2-efi-cdboot on grub2-efi-${arch}-cdboot grub2 on all grub2-${arch} pacakges Something is somehow adding /usr/lib/.build-id/... to all the -tools subpackages, so exclude all that. Signed-off-by: Peter Jones --- grub.macros | 9 ++++++--- grub2.spec | 29 ++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/grub.macros b/grub.macros index f190f48..a5be995 100644 --- a/grub.macros +++ b/grub.macros @@ -170,6 +170,8 @@ %{expand:%%package %%{1}} \ Summary: Bootloader with support for Linux, Multiboot, and more \ Group: System Environment/Base \ +Provides: %{name} = %{evr} \ +Obsoletes: %{name} < 1:2.02-0 \ Requires: %{name}-common = %{evr} \ Requires: %{name}-tools-minimal = %{evr} \ Requires: %{name}-%{1}-modules = %{evr} \ @@ -210,7 +212,7 @@ Requires: gettext which file \ This subpackage provides tools for support of %%{1} platforms. \ %{nil} -%define define_efi_variant(p) \ +%define define_efi_variant(o) \ %{expand:%%package %{1}} \ Summary: GRUB for EFI systems. \ Group: System Environment/Base \ @@ -218,8 +220,8 @@ Requires: %{name}-common = %{evr} \ Requires: %{name}-tools-minimal >= %{evr} \ Requires: %{name}-tools-extra = %{evr} \ Requires: %{name}-tools = %{evr} \ -%{-p:Provides: %{name}-efi = %{evr}} \ -%{-p:Obsoletes: %{name}-efi < %{evr}} \ +Provides: %{name}-efi = %{evr} \ +%{-o:Obsoletes: %{name}-efi < %{evr}} \ \ %{expand:%%description %{1}} \ %{desc} \ @@ -241,6 +243,7 @@ This subpackage provides support for rebuilding your own grub.efi. \ Summary: Files used to boot removeable media with EFI \ Group: System Environment/Base \ Requires: %{name}-common = %{evr} \ +Provides: %{name}-efi-cdboot = %{evr} \ %{expand:%%description %{1}-cdboot} \ %{desc} \ This subpackage provides optional components of grub used with removeable media on %{1} systems.\ diff --git a/grub2.spec b/grub2.spec index a205857..dcdd1e2 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -132,7 +132,7 @@ Obsoletes: %{name}-tools < %{evr} This subpackage provides tools for support of all platforms. %if 0%{with_efi_arch} -%{expand:%define_efi_variant %%{package_arch} -p} +%{expand:%define_efi_variant %%{package_arch} -o} %endif %if 0%{with_alt_efi_arch} %{expand:%define_efi_variant %%{alt_package_arch}} @@ -300,8 +300,6 @@ if [ "$1" = 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/%{name}-dev.info.gz || : fi -%files - %files common -f grub.lang %dir %{_libdir}/grub/ %dir %{_datarootdir}/grub/ @@ -330,7 +328,9 @@ fi %doc docs/font_char_metrics.png %files tools-minimal -%defattr(-,root,root,-) +# I do not know why I'm getting this in the output... +%exclude /usr/lib/.build-id + %{_sysconfdir}/prelink.conf.d/grub2.conf %{_sbindir}/%{name}-get-kernel-settings %{_sbindir}/%{name}-set-default @@ -346,7 +346,9 @@ fi %ifarch x86_64 %files tools-efi -%defattr(-,root,root,-) +# I do not know why I'm getting this in the output... +%exclude /usr/lib/.build-id + %{_sbindir}/%{name}-macbless %{_bindir}/%{name}-render-label %{_datadir}/man/man8/%{name}-macbless* @@ -354,7 +356,9 @@ fi %endif %files tools -%defattr(-,root,root,-) +# I do not know why I'm getting this in the output... +%exclude /usr/lib/.build-id + %attr(0644,root,root) %ghost %config(noreplace) %{_sysconfdir}/default/grub %config %{_sysconfdir}/grub.d/??_* %{_sysconfdir}/grub.d/README @@ -420,6 +424,9 @@ fi %endif %files tools-extra +# I do not know why I'm getting this in the output... +%exclude /usr/lib/.build-id + %{_sbindir}/%{name}-sparc64-setup %{_sbindir}/%{name}-ofpathname %{_bindir}/%{name}-fstest @@ -459,6 +466,14 @@ fi %endif %changelog +* Fri Aug 25 2017 Peter Jones - 2.02-13 +- Add some unconditional Provides: + grub2-efi on grub2-efi-${arch} + grub2-efi-cdboot on grub2-efi-${arch}-cdboot + grub2 on all grub2-${arch} pacakges +- Something is somehow adding /usr/lib/.build-id/... to all the -tools + subpackages, so exclude all that. + * Thu Aug 24 2017 Peter Jones - 2.02-12 - Fix arm kernel command line allocation Resolves: rhbz#1484609 From 7849a868f20a33531447aea078203f7d1b7be36b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 25 Aug 2017 16:40:26 -0400 Subject: [PATCH 18/20] Revert the /usr/lib/.build-id/ change Revert the /usr/lib/.build-id/ change: https://fedoraproject.org/wiki/Changes/ParallelInstallableDebuginfo says (without any particularly convincing reasoning): The main build-id file should not be in the debuginfo file, but in the main package (this was always a problem since the package and debuginfo package installed might not match). If we want to make usr/lib/debug/ a network resource then we will need to move the symlink to another location (maybe /usr/lib/.build-id). So do it that way. Of course it doesn't matter, because exclude gets ignored due to implementation details. Signed-off-by: Peter Jones --- grub2.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/grub2.spec b/grub2.spec index dcdd1e2..97772b8 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -328,9 +328,6 @@ fi %doc docs/font_char_metrics.png %files tools-minimal -# I do not know why I'm getting this in the output... -%exclude /usr/lib/.build-id - %{_sysconfdir}/prelink.conf.d/grub2.conf %{_sbindir}/%{name}-get-kernel-settings %{_sbindir}/%{name}-set-default @@ -346,9 +343,6 @@ fi %ifarch x86_64 %files tools-efi -# I do not know why I'm getting this in the output... -%exclude /usr/lib/.build-id - %{_sbindir}/%{name}-macbless %{_bindir}/%{name}-render-label %{_datadir}/man/man8/%{name}-macbless* @@ -356,9 +350,6 @@ fi %endif %files tools -# I do not know why I'm getting this in the output... -%exclude /usr/lib/.build-id - %attr(0644,root,root) %ghost %config(noreplace) %{_sysconfdir}/default/grub %config %{_sysconfdir}/grub.d/??_* %{_sysconfdir}/grub.d/README @@ -424,9 +415,6 @@ fi %endif %files tools-extra -# I do not know why I'm getting this in the output... -%exclude /usr/lib/.build-id - %{_sbindir}/%{name}-sparc64-setup %{_sbindir}/%{name}-ofpathname %{_bindir}/%{name}-fstest @@ -466,6 +454,18 @@ fi %endif %changelog +* Fri Aug 25 2017 Peter Jones - 2.02-14 +- Revert the /usr/lib/.build-id/ change: + https://fedoraproject.org/wiki/Changes/ParallelInstallableDebuginfo + says (without any particularly convincing reasoning): + The main build-id file should not be in the debuginfo file, but in the + main package (this was always a problem since the package and debuginfo + package installed might not match). If we want to make usr/lib/debug/ a + network resource then we will need to move the symlink to another + location (maybe /usr/lib/.build-id). + So do it that way. Of course it doesn't matter, because exclude gets + ignored due to implementation details. + * Fri Aug 25 2017 Peter Jones - 2.02-13 - Add some unconditional Provides: grub2-efi on grub2-efi-${arch} From 50a9c3a2b390f8989768e949beec99c00ecd464a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Wed, 30 Aug 2017 10:11:43 -0400 Subject: [PATCH 19/20] Limit the pattern matching in do_alt_efi_install to files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This unbreaks module builds that contain the ".module" string in their dist tags. Signed-off-by: Petr Šabata --- grub.macros | 2 +- grub2.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/grub.macros b/grub.macros index a5be995..fb1c96e 100644 --- a/grub.macros +++ b/grub.macros @@ -376,7 +376,7 @@ find . '(' -iname gdb_grub \\\ -o -iname '*.mod' \\\ ')' \\\ -exec cp {} $RPM_BUILD_ROOT/usr/lib/grub/%{grubaltefiarch}/ \\\; \ -find $RPM_BUILD_ROOT -iname "*.mod*" -exec chmod a-x {} '\;' \ +find $RPM_BUILD_ROOT -type f -iname "*.mod*" -exec chmod a-x {} '\;' \ install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \ install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \ cd .. \ diff --git a/grub2.spec b/grub2.spec index 97772b8..f0a6e1b 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -454,6 +454,10 @@ fi %endif %changelog +* Wed Aug 30 2017 Petr Šabata - 2.02-15 +- Limit the pattern matching in do_alt_efi_install to files to + unbreak module builds + * Fri Aug 25 2017 Peter Jones - 2.02-14 - Revert the /usr/lib/.build-id/ change: https://fedoraproject.org/wiki/Changes/ParallelInstallableDebuginfo From b52a729921fd4d13d4e3740c2f7f8977273aafba Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 6 Sep 2017 18:26:03 -0400 Subject: [PATCH 20/20] Fix Obsoletes on grub2-pc Signed-off-by: Peter Jones --- grub.macros | 2 +- grub2.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/grub.macros b/grub.macros index fb1c96e..fab76aa 100644 --- a/grub.macros +++ b/grub.macros @@ -171,7 +171,7 @@ Summary: Bootloader with support for Linux, Multiboot, and more \ Group: System Environment/Base \ Provides: %{name} = %{evr} \ -Obsoletes: %{name} < 1:2.02-0 \ +Obsoletes: %{name} < %{evr} \ Requires: %{name}-common = %{evr} \ Requires: %{name}-tools-minimal = %{evr} \ Requires: %{name}-%{1}-modules = %{evr} \ diff --git a/grub2.spec b/grub2.spec index f0a6e1b..5ff6e88 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -454,6 +454,9 @@ fi %endif %changelog +* Wed Sep 06 2017 Peter Jones - 2.02-16 +- Fix Obsoletes on grub2-pc + * Wed Aug 30 2017 Petr Šabata - 2.02-15 - Limit the pattern matching in do_alt_efi_install to files to unbreak module builds