From 9997623cd3eb4dbcc565f0fd50887fcdc1039df0 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 17 Jan 2018 14:22:39 -0500 Subject: [PATCH 1/5] Make do-rebase rebase from grub-2.02 Signed-off-by: Peter Jones --- do-rebase | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/do-rebase b/do-rebase index ae03bd48..e911f5b8 100755 --- a/do-rebase +++ b/do-rebase @@ -119,7 +119,7 @@ unset LC_ALL git rm -q 0*.patch > grub.patches -patches=$(othergit format-patch refs/remotes/rhboot/master..refs/remotes/rhboot/${releasever}) +patches=$(othergit format-patch grub-2.02..refs/remotes/rhboot/${releasever}) for x in $patches ; do echo Patch$(echo ${x} | cut -d- -f1): ${x} >> grub.patches done @@ -130,5 +130,5 @@ git add 0*.patch grub2.spec grub.patches if [ -z "$amend" ]; then fedpkg commit -s -c $amend else - git commit -m "" --amend + git commit --amend fi From fa8b2484d0dcff371b33560c0f33e2f8e72a9168 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 17 Jan 2018 14:25:08 -0500 Subject: [PATCH 2/5] Change TSC calibration driver preference (prefer pmtimer over PIT) - Pull in fixes for TSC calibration driver preference (prefer pmtimer over PIT) to boot on Apollo Lake systems with no PIT - Fix pmtimer calibration to not take forever to fail on kvm. 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 | 12 +- ...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 | 12 +- 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 | 4 +- ...Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch | 4 +- ...UEFI-operating-systems-returned-by-o.patch | 4 +- 0081-Migrate-PPC-from-Yaboot-to-Grub2.patch | 12 +- 0082-Add-fw_path-variable-revised.patch | 4 +- 0083-Add-support-for-linuxefi.patch | 12 +- ...xefi-and-initrdefi-where-appropriate.patch | 4 +- ...w-insmod-when-secure-boot-is-enabled.patch | 4 +- ...-hex-hex-straight-through-unmolested.patch | 4 +- 0087-Add-X-option-to-printf-functions.patch | 4 +- ...for-specific-config-file-for-netboot.patch | 4 +- ...g-module-to-parse-Boot-Loader-Specif.patch | 12 +- 0090-Don-t-write-messages-to-the-screen.patch | 4 +- 0091-Don-t-print-GNU-GRUB-header.patch | 4 +- 0092-Don-t-add-to-highlighted-row.patch | 4 +- 0093-Message-string-cleanups.patch | 4 +- ...ing-now-that-we-aren-t-displaying-it.patch | 4 +- ...t-indentation-for-the-term-help-text.patch | 4 +- 0096-Indent-menu-entries.patch | 4 +- 0097-Fix-margins.patch | 4 +- ...-1-for-our-right-hand-margin-so-line.patch | 4 +- ...-Use-linux16-when-appropriate-880840.patch | 4 +- 0100-Enable-pager-by-default.-985860.patch | 4 +- ...-on-serial-so-don-t-tell-the-user-to.patch | 4 +- ...n-t-say-GNU-Linux-in-generated-menus.patch | 4 +- ...-Don-t-draw-a-border-around-the-menu.patch | 4 +- ...andard-margin-for-the-timeout-string.patch | 4 +- ...rame-to-list-of-relocations-stripped.patch | 4 +- ...rk-with-our-changes-for-linux16-and-.patch | 4 +- ...on-t-print-during-fdt-loading-method.patch | 4 +- ...spaces-when-we-re-doing-our-cmdline-.patch | 4 +- ...password-to-boot-entries-generated-b.patch | 4 +- 0110-Don-t-emit-Booting-.-message.patch | 4 +- ...f-man-pages-with-slightly-nicer-ones.patch | 4 +- ...ix-when-fallback-searching-for-grub-.patch | 4 +- ...-before-grub.cfg-on-tftp-config-file.patch | 4 +- ...ert-function-to-support-NVMe-devices.patch | 4 +- ...M-Mustang-device-tree-for-hardware-t.patch | 4 +- ...device-tree-from-the-grub-default-fi.patch | 4 +- ...P-protocol-for-exclusive-use-by-grub.patch | 4 +- ...P-protocol-for-exclusive-use-by-grub.patch | 4 +- 0119-Add-grub_util_readlink.patch | 4 +- ...se-symlinks-including-those-across-d.patch | 4 +- ...CLASS-in-10_linux-from-etc-os-releas.patch | 4 +- ...t-ordering-for-.debug-and-rescue-ker.patch | 4 +- 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 | 22 +-- ...fig-construct-titles-that-look-like-.patch | 6 +- ...e-the-Stall-EFI-boot-service-on-GRUB.patch | 103 ------------- ...-configure.ac-and-grub-rpm-sort-play.patch | 6 +- ... 0133-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 +- ... 0142-efiemu-Fix-compilation-failure.patch | 6 +- ...P-protocol-for-exclusive-use-by-grub.patch | 6 +- ...arser.patch => 0144-Add-a-url-parser.patch | 6 +- ...net-and-bootp-add-support-for-dhcpv6.patch | 6 +- ...rnel-settings-and-use-it-in-10_linux.patch | 22 +-- ...0147-Normalize-slashes-in-tftp-paths.patch | 6 +- ...h => 0148-Fix-malformed-tftp-packets.patch | 6 +- ...h => 0149-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 +- ... 0154-Make-grub_fatal-also-backtrace.patch | 6 +- ...d.patch => 0155-Rework-linux-command.patch | 6 +- ...patch => 0156-Rework-linux16-command.patch | 6 +- ...> 0157-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 | 19 +-- ...-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 +- ...atch => 0165-linuxefi-minor-cleanups.patch | 6 +- ...rch-64-on-32-boot-in-linuxefi-loader.patch | 6 +- ...ch => 0167-Fix-up-linux-params-usage.patch | 6 +- ...=> 0168-Make-exit-take-a-return-code.patch | 14 +- ...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 | 14 +- ...port-btrfs_subvol-and-btrfs_subvolid.patch | 6 +- ...> 0176-grub2-btrfs-03-follow_default.patch | 6 +- ...=> 0177-grub2-btrfs-04-grub2-install.patch | 6 +- ...> 0178-grub2-btrfs-05-grub2-mkconfig.patch | 6 +- ... => 0179-grub2-btrfs-06-subvol-mount.patch | 6 +- ...ootable-Snapshot-submenu-in-grub.cfg.patch | 6 +- ...subvol-name-scheme-to-support-old-sn.patch | 13 +- ...-correctly-with-btrfs-snapshots-bsc-.patch | 6 +- ...ocate_pool-and-grub_efi_free_pool-wr.patch | 6 +- ...fi_.-memory-helpers-where-reasonable.patch | 6 +- ...5-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch | 6 +- ...c-sized-arrays-since-we-don-t-build-.patch | 6 +- ...nst.patch => 0187-don-t-ignore-const.patch | 6 +- ...=> 0188-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 +- ...191-editenv-handle-relative-symlinks.patch | 6 +- ...e-libgrub.pp-depend-on-config-util.h.patch | 6 +- ...-efi-as-HFS-on-ppc-machines-in-grub-.patch | 6 +- ...20_linux_xen.in-Add-xen_boot-command.patch | 6 +- ...-figure-out-whether-multiboot2-shoul.patch | 6 +- ...d-xen-or-multiboot-2-modules-as-need.patch | 6 +- ...lt-tsc-calibration-method-to-pmtimer.patch | 32 +++++ ...-calibration-not-take-51-seconds-to-.patch | 96 +++++++++++++ grub.patches | 135 +++++++++--------- grub2.spec | 6 +- 201 files changed, 732 insertions(+), 699 deletions(-) rename 0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch => 0131-Make-grub2-mkconfig-construct-titles-that-look-like-.patch (93%) delete mode 100644 0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch rename 0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch => 0132-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch (92%) rename 0134-tcp-add-window-scaling-support.patch => 0133-tcp-add-window-scaling-support.patch (95%) rename 0135-efinet-retransmit-if-our-device-is-busy.patch => 0134-efinet-retransmit-if-our-device-is-busy.patch (92%) rename 0136-Be-more-aggro-about-actually-using-the-configured-ne.patch => 0135-Be-more-aggro-about-actually-using-the-configured-ne.patch (98%) rename 0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch => 0136-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch (94%) rename 0138-Fix-security-issue-when-reading-username-and-passwor.patch => 0137-Fix-security-issue-when-reading-username-and-passwor.patch (89%) rename 0139-Warn-if-grub-password-will-not-be-read-1290803.patch => 0138-Warn-if-grub-password-will-not-be-read-1290803.patch (88%) rename 0140-Clean-up-grub-setpassword-documentation-1290799.patch => 0139-Clean-up-grub-setpassword-documentation-1290799.patch (93%) rename 0141-Fix-locale-issue-in-grub-setpassword-1294243.patch => 0140-Fix-locale-issue-in-grub-setpassword-1294243.patch (86%) rename 0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch => 0141-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch (86%) rename 0143-efiemu-Fix-compilation-failure.patch => 0142-efiemu-Fix-compilation-failure.patch (86%) rename 0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch => 0143-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch (94%) rename 0145-Add-a-url-parser.patch => 0144-Add-a-url-parser.patch (99%) rename 0146-efinet-and-bootp-add-support-for-dhcpv6.patch => 0145-efinet-and-bootp-add-support-for-dhcpv6.patch (99%) rename 0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch => 0146-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch (97%) rename 0148-Normalize-slashes-in-tftp-paths.patch => 0147-Normalize-slashes-in-tftp-paths.patch (92%) rename 0149-Fix-malformed-tftp-packets.patch => 0148-Fix-malformed-tftp-packets.patch (90%) rename 0150-Fix-race-in-EFI-validation.patch => 0149-Fix-race-in-EFI-validation.patch (95%) rename 0151-bz1374141-fix-incorrect-mask-for-ppc64.patch => 0150-bz1374141-fix-incorrect-mask-for-ppc64.patch (94%) rename 0152-Use-device-part-of-chainloader-target-if-present.patch => 0151-Use-device-part-of-chainloader-target-if-present.patch (88%) rename 0153-Add-secureboot-support-on-efi-chainloader.patch => 0152-Add-secureboot-support-on-efi-chainloader.patch (99%) rename 0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch => 0153-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch (99%) rename 0155-Make-grub_fatal-also-backtrace.patch => 0154-Make-grub_fatal-also-backtrace.patch (97%) rename 0156-Rework-linux-command.patch => 0155-Rework-linux-command.patch (96%) rename 0157-Rework-linux16-command.patch => 0156-Rework-linux16-command.patch (96%) rename 0158-Make-grub-editenv-build-again.patch => 0157-Make-grub-editenv-build-again.patch (87%) rename 0159-Fix-up-some-man-pages-rpmdiff-noticed.patch => 0158-Fix-up-some-man-pages-rpmdiff-noticed.patch (96%) rename 0160-Re-work-some-intricacies-of-PE-loading.patch => 0159-Re-work-some-intricacies-of-PE-loading.patch (98%) rename 0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch => 0160-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch (97%) rename 0162-linuxefi-fix-double-free-on-verification-failure.patch => 0161-linuxefi-fix-double-free-on-verification-failure.patch (82%) rename 0163-fix-machine-type-test-in-30_os-prober.in.patch => 0162-fix-machine-type-test-in-30_os-prober.in.patch (80%) rename 0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch => 0163-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch (90%) rename 0165-efi-chainloader-truncate-overlong-relocation-section.patch => 0164-efi-chainloader-truncate-overlong-relocation-section.patch (96%) rename 0166-linuxefi-minor-cleanups.patch => 0165-linuxefi-minor-cleanups.patch (96%) rename 0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch => 0166-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch (98%) rename 0168-Fix-up-linux-params-usage.patch => 0167-Fix-up-linux-params-usage.patch (91%) rename 0169-Make-exit-take-a-return-code.patch => 0168-Make-exit-take-a-return-code.patch (85%) rename 0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch => 0169-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch (88%) rename 0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch => 0170-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch (90%) rename 0172-Make-our-info-pages-say-grub2-where-appropriate.patch => 0171-Make-our-info-pages-say-grub2-where-appropriate.patch (99%) rename 0173-print-more-debug-info-in-our-module-loader.patch => 0172-print-more-debug-info-in-our-module-loader.patch (89%) rename 0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch => 0173-macos-just-build-chainloader-entries-don-t-try-any-x.patch (97%) rename 0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch => 0174-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch (98%) rename 0176-export-btrfs_subvol-and-btrfs_subvolid.patch => 0175-export-btrfs_subvol-and-btrfs_subvolid.patch (85%) rename 0177-grub2-btrfs-03-follow_default.patch => 0176-grub2-btrfs-03-follow_default.patch (97%) rename 0178-grub2-btrfs-04-grub2-install.patch => 0177-grub2-btrfs-04-grub2-install.patch (97%) rename 0179-grub2-btrfs-05-grub2-mkconfig.patch => 0178-grub2-btrfs-05-grub2-mkconfig.patch (96%) rename 0180-grub2-btrfs-06-subvol-mount.patch => 0179-grub2-btrfs-06-subvol-mount.patch (99%) rename 0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch => 0180-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch (86%) rename 0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch => 0181-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch (87%) rename 0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch => 0182-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch (98%) rename 0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch => 0183-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch (94%) rename 0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch => 0184-Use-grub_efi_.-memory-helpers-where-reasonable.patch (96%) rename 0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch => 0185-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch (92%) rename 0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch => 0186-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch (90%) rename 0188-don-t-ignore-const.patch => 0187-don-t-ignore-const.patch (82%) rename 0189-don-t-use-int-for-efi-status.patch => 0188-don-t-use-int-for-efi-status.patch (82%) rename 0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch => 0189-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch (86%) rename 0191-Clean-up-some-errors-in-the-linuxefi-loader.patch => 0190-Clean-up-some-errors-in-the-linuxefi-loader.patch (94%) rename 0192-editenv-handle-relative-symlinks.patch => 0191-editenv-handle-relative-symlinks.patch (90%) rename 0193-Make-libgrub.pp-depend-on-config-util.h.patch => 0192-Make-libgrub.pp-depend-on-config-util.h.patch (97%) rename 0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch => 0193-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch (89%) rename 0195-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch => 0194-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch (93%) rename 0196-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch => 0195-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch (87%) rename 0197-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch => 0196-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch (88%) create mode 100644 0197-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch create mode 100644 0198-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch diff --git a/0001-Bump-version-to-2.03.patch b/0001-Bump-version-to-2.03.patch index fb90090c..361f6e29 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/194] Bump version to 2.03 +Subject: [PATCH 001/198] 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.5 +2.14.3 diff --git a/0002-Remove-bashisms-from-tests.patch b/0002-Remove-bashisms-from-tests.patch index 6cfeef87..13c7601b 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/194] Remove bashisms from tests. +Subject: [PATCH 002/198] 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.5 +2.14.3 diff --git a/0003-fs-tester-make-sh-compatible.patch b/0003-fs-tester-make-sh-compatible.patch index 133c87a5..b46edafe 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/194] fs-tester: make sh-compatible +Subject: [PATCH 003/198] 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.5 +2.14.3 diff --git a/0004-support-busybox-date.patch b/0004-support-busybox-date.patch index 90071f5b..bc17c60d 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/194] support busybox date. +Subject: [PATCH 004/198] 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.5 +2.14.3 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 b4a5a392..9d409d70 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/194] Don't retrieve fstime when it's not useful. +Subject: [PATCH 005/198] 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.5 +2.14.3 diff --git a/0006-Support-lseek64.patch b/0006-Support-lseek64.patch index 8151cdfb..6d01bd3e 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/194] Support lseek64. +Subject: [PATCH 006/198] 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.5 +2.14.3 diff --git a/0007-Use-SHELL-rather-than-bin-sh.patch b/0007-Use-SHELL-rather-than-bin-sh.patch index 09cd1457..9dbb5efd 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/194] Use $(SHELL) rather than /bin/sh. +Subject: [PATCH 007/198] 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.5 +2.14.3 diff --git a/0008-po-Use-SHELL-rather-than-bin-sh.patch b/0008-po-Use-SHELL-rather-than-bin-sh.patch index 33c7e040..9543b076 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/194] po: Use @SHELL@ rather than /bin/sh. +Subject: [PATCH 008/198] po: Use @SHELL@ rather than /bin/sh. /bin/sh might not exist. --- @@ -22,5 +22,5 @@ index 3619458e8..e68e9da84 100644 srcdir = @srcdir@ -- -2.13.5 +2.14.3 diff --git a/0009-Add-termux-path-to-dict.patch b/0009-Add-termux-path-to-dict.patch index 07f4a6e1..96cf1a2a 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/194] Add termux path to dict. +Subject: [PATCH 009/198] 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.5 +2.14.3 diff --git a/0010-Fix-shebang-for-termux.patch b/0010-Fix-shebang-for-termux.patch index 1f93e9d9..a71faf3d 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/194] Fix shebang for termux. +Subject: [PATCH 010/198] 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.5 +2.14.3 diff --git a/0011-Add-strtoull-test.patch b/0011-Add-strtoull-test.patch index dca6c19f..3db34a23 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/194] Add strtoull test. +Subject: [PATCH 011/198] Add strtoull test. --- grub-core/Makefile.core.def | 5 +++++ @@ -11,18 +11,18 @@ diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 2dfa22a92..8dcd0e5a9 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def -@@ -1962,6 +1962,11 @@ module = { +@@ -1961,6 +1961,11 @@ module = { + common = tests/example_functional_test.c; }; - module = { ++module = { + name = strtoull_test; + common = tests/strtoull_test.c; +}; + -+module = { + module = { name = setjmp_test; common = tests/setjmp_test.c; - }; -- -2.13.5 +2.14.3 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 352f7abf..dfb6c45b 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/194] strtoull: Fix behaviour on chars between '9' and 'a'. +Subject: [PATCH 012/198] 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.5 +2.14.3 diff --git a/0013-Add-Virtual-LAN-support.patch b/0013-Add-Virtual-LAN-support.patch index 3a48d3a6..1e71f51e 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/194] Add Virtual LAN support. +Subject: [PATCH 013/198] 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.5 +2.14.3 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 20574b51..a30d8df5 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/194] mkimage: Pass layout to mkimage_generate_elfXX rather +Subject: [PATCH 014/198] 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.5 +2.14.3 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 18b666b0..9983fb95 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/194] Refactor arm-uboot code to make it genereic. +Subject: [PATCH 015/198] 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.5 +2.14.3 diff --git a/0016-coreboot-Split-parts-that-are-platform-independent.patch b/0016-coreboot-Split-parts-that-are-platform-independent.patch index 8b5dd40e..4fb20297 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/194] coreboot: Split parts that are platform-independent. +Subject: [PATCH 016/198] 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.5 +2.14.3 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 4d5ed38f..6559451e 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/194] Rename uboot/halt.c to dummy/halt.c. +Subject: [PATCH 017/198] 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.5 +2.14.3 diff --git a/0018-Rename-uboot-datetime-to-dummy-datetime.patch b/0018-Rename-uboot-datetime-to-dummy-datetime.patch index 2e93c365..a0ca5db4 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/194] Rename uboot/datetime to dummy/datetime. +Subject: [PATCH 018/198] 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.5 +2.14.3 diff --git a/0019-arm-coreboot-Start-new-port.patch b/0019-arm-coreboot-Start-new-port.patch index 295504eb..933a595f 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/194] arm-coreboot: Start new port. +Subject: [PATCH 019/198] 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.5 +2.14.3 diff --git a/0020-Add-support-for-device-tree-based-drivers.patch b/0020-Add-support-for-device-tree-based-drivers.patch index 5ee0abf3..f29234a8 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/194] Add support for device-tree-based drivers. +Subject: [PATCH 020/198] 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.5 +2.14.3 diff --git a/0021-arm-coreboot-Support-for-vexpress-timer.patch b/0021-arm-coreboot-Support-for-vexpress-timer.patch index d68cc32a..33f3fdb5 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/194] arm-coreboot: Support for vexpress timer. +Subject: [PATCH 021/198] 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.5 +2.14.3 diff --git a/0022-arm-coreboot-Export-FDT-routines.patch b/0022-arm-coreboot-Export-FDT-routines.patch index 063a1e90..621b2d61 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/194] arm-coreboot: Export FDT routines. +Subject: [PATCH 022/198] 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.5 +2.14.3 diff --git a/0023-at_keyboard-Split-protocol-from-controller-code.patch b/0023-at_keyboard-Split-protocol-from-controller-code.patch index 6091c615..2baa8c55 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/194] at_keyboard: Split protocol from controller code. +Subject: [PATCH 023/198] 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.5 +2.14.3 diff --git a/0024-arm_coreboot-Support-keyboard-for-vexpress.patch b/0024-arm_coreboot-Support-keyboard-for-vexpress.patch index 2cad8da7..65b38deb 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/194] arm_coreboot: Support keyboard for vexpress. +Subject: [PATCH 024/198] arm_coreboot: Support keyboard for vexpress. --- grub-core/Makefile.am | 1 + @@ -245,5 +245,5 @@ index 000000000..e4cda3056 + grub_fdtbus_register (&pl050); +} -- -2.13.5 +2.14.3 diff --git a/0025-arm_coreboot-Support-grub-mkstandalone.patch b/0025-arm_coreboot-Support-grub-mkstandalone.patch index b36403b5..182c7229 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/194] arm_coreboot: Support grub-mkstandalone. +Subject: [PATCH 025/198] 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.5 +2.14.3 diff --git a/0026-arm_coreboot-Support-loading-linux-images.patch b/0026-arm_coreboot-Support-loading-linux-images.patch index d503a7fc..a0783878 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/194] arm_coreboot: Support loading linux images. +Subject: [PATCH 026/198] 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.5 +2.14.3 diff --git a/0027-arm_coreboot-Support-DMA.patch b/0027-arm_coreboot-Support-DMA.patch index c8725a44..4c40b93d 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/194] arm_coreboot: Support DMA. +Subject: [PATCH 027/198] arm_coreboot: Support DMA. This is needed to support USB and some other busses. --- @@ -54,10 +54,11 @@ index 34154ccdb..af1c4bbf5 100644 void grub_arm_invalidate_icache_range_armv6 (grub_addr_t start, grub_addr_t end, grub_addr_t dlinesz); void grub_arm_invalidate_icache_range_armv7 (grub_addr_t start, grub_addr_t end, -@@ -253,6 +255,38 @@ grub_arch_sync_caches (void *address, grub_size_t len) +@@ -252,6 +254,38 @@ grub_arch_sync_caches (void *address, grub_size_t len) + } } - void ++void +grub_arch_sync_dma_caches (volatile void *address, grub_size_t len) +{ + grub_addr_t start = (grub_addr_t) address; @@ -89,10 +90,9 @@ index 34154ccdb..af1c4bbf5 100644 + } +} + -+void + void grub_arm_disable_caches_mmu (void) { - if (type == ARCH_UNKNOWN) diff --git a/grub-core/kern/arm/cache_armv7.S b/grub-core/kern/arm/cache_armv7.S index 1ef2754af..5ae76a3d8 100644 --- a/grub-core/kern/arm/cache_armv7.S @@ -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.5 +2.14.3 diff --git a/0028-ehci-Split-core-code-from-PCI-part.patch b/0028-ehci-Split-core-code-from-PCI-part.patch index cb6d1721..074849ff 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/194] ehci: Split core code from PCI part. +Subject: [PATCH 028/198] 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.5 +2.14.3 diff --git a/0029-arm_coreboot-Support-EHCI.patch b/0029-arm_coreboot-Support-EHCI.patch index 2b2a9849..6da884a9 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/194] arm_coreboot: Support EHCI. +Subject: [PATCH 029/198] arm_coreboot: Support EHCI. --- gentpl.py | 2 +- @@ -119,5 +119,5 @@ index 11d96481f..512ae1dd0 100644 #endif /* GRUB_USB_H */ -- -2.13.5 +2.14.3 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 dc40a0c1..8a48760d 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/194] Fix bug on FDT nodes with compatible property +Subject: [PATCH 030/198] 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.5 +2.14.3 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 01fae85a..3abaa3d0 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/194] fdtbus: Add ability to send/receive messages on +Subject: [PATCH 031/198] 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.5 +2.14.3 diff --git a/0032-rk3288_spi-Add-SPI-driver.patch b/0032-rk3288_spi-Add-SPI-driver.patch index 7190ac87..2414c85d 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/194] rk3288_spi: Add SPI driver +Subject: [PATCH 032/198] rk3288_spi: Add SPI driver --- grub-core/Makefile.core.def | 1 + @@ -161,5 +161,5 @@ index 09cd7fe32..269505342 100644 #endif /* ! ASM_FILE */ -- -2.13.5 +2.14.3 diff --git a/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch b/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch index e7ea0f44..df17282a 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/194] arm_coreboot: Add Chromebook keyboard driver. +Subject: [PATCH 033/198] arm_coreboot: Add Chromebook keyboard driver. --- grub-core/term/arm/cros.c | 125 +++++++++++++++++++++++ @@ -415,5 +415,5 @@ index 000000000..45a372572 + +#endif -- -2.13.5 +2.14.3 diff --git a/0034-Missing-parts-of-previous-commit.patch b/0034-Missing-parts-of-previous-commit.patch index 6278e35f..c13996df 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/194] Missing parts of previous commit +Subject: [PATCH 034/198] Missing parts of previous commit --- grub-core/Makefile.core.def | 2 ++ @@ -34,5 +34,5 @@ index 0126ff638..8d8c5b829 100644 } -- -2.13.5 +2.14.3 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 55940819..c2bc1685 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/194] coreboot: Changed cbmemc to support updated console +Subject: [PATCH 035/198] coreboot: Changed cbmemc to support updated console format from coreboot. --- @@ -94,5 +94,5 @@ index 129248c7f..cea9b8431 100644 } -- -2.13.5 +2.14.3 diff --git a/0036-at_keyboard-Fix-falco-chromebook-case.patch b/0036-at_keyboard-Fix-falco-chromebook-case.patch index 4d229e99..5251a4a2 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/194] at_keyboard: Fix falco chromebook case. +Subject: [PATCH 036/198] 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.5 +2.14.3 diff --git a/0037-sparc64-Close-cdboot-ihandle.patch b/0037-sparc64-Close-cdboot-ihandle.patch index 15b5b6e8..f8d979b3 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/194] sparc64: Close cdboot ihandle +Subject: [PATCH 037/198] 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.5 +2.14.3 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 f7e83c76..70ef5b38 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/194] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64 +Subject: [PATCH 038/198] 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.5 +2.14.3 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 d4e02fee..0df0fd39 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/194] arm64: Add "--nounzip" option support in xen_module +Subject: [PATCH 039/198] 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.5 +2.14.3 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 09297adf..0e6b2d70 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/194] util/grub.d/20_linux_xen.in: Add xen_boot command +Subject: [PATCH 040/198] 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.5 +2.14.3 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 1c8d209e..b3658ed8 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/194] arm64: Update the introduction of Xen boot commands +Subject: [PATCH 041/198] 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.5 +2.14.3 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 45219552..4e7b1c67 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/194] sparc64: Don't use devspec to determine the OBP path +Subject: [PATCH 042/198] 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.5 +2.14.3 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 45655051..14a8f428 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/194] Allow GRUB to mount ext2/3/4 filesystems that have +Subject: [PATCH 043/198] 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.5 +2.14.3 diff --git a/0044-ehci-Fix-compilation-for-amd64.patch b/0044-ehci-Fix-compilation-for-amd64.patch index accd423b..987f9d56 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/194] ehci: Fix compilation for amd64 +Subject: [PATCH 044/198] 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.5 +2.14.3 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 cd1f5089..f8debbdc 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/194] cache: Fix compilation for ppc, sparc and arm64 +Subject: [PATCH 045/198] 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.5 +2.14.3 diff --git a/0046-ehci-Fix-compilation-on-i386.patch b/0046-ehci-Fix-compilation-on-i386.patch index 52f4468c..4cf29d2c 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/194] ehci: Fix compilation on i386 +Subject: [PATCH 046/198] 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.5 +2.14.3 diff --git a/0047-crypto-Fix-use-after-free.patch b/0047-crypto-Fix-use-after-free.patch index b9a89408..a03d3dfb 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/194] crypto: Fix use after free. +Subject: [PATCH 047/198] 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.5 +2.14.3 diff --git a/0048-arm-efi-Fix-compilation.patch b/0048-arm-efi-Fix-compilation.patch index 2b37e39d..6d0725f2 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/194] arm-efi: Fix compilation +Subject: [PATCH 048/198] arm-efi: Fix compilation --- grub-core/loader/arm/linux.c | 8 ++++---- @@ -37,5 +37,5 @@ index 260cbf068..e64c79a95 100644 } -- -2.13.5 +2.14.3 diff --git a/0049-fdt-silence-clang-warning.patch b/0049-fdt-silence-clang-warning.patch index fc1f552b..dddfc1c3 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/194] fdt: silence clang warning. +Subject: [PATCH 049/198] fdt: silence clang warning. --- grub-core/lib/fdt.c | 3 ++- @@ -22,5 +22,5 @@ index bdc630244..2705f2629 100644 return 0; return token; -- -2.13.5 +2.14.3 diff --git a/0050-Fix-a-segfault-in-lsefi.patch b/0050-Fix-a-segfault-in-lsefi.patch index 348bb1a9..5b5a7475 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/194] Fix a segfault in lsefi +Subject: [PATCH 050/198] 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.5 +2.14.3 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 b7ab69cb..a4386814 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/194] zfs: remove size_t typedef and use grub_size_t +Subject: [PATCH 051/198] 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.5 +2.14.3 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 2174ca70..f91d4000 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/194] udf: Fix reading label, lvd.ident is dstring +Subject: [PATCH 052/198] 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.5 +2.14.3 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 5be7e283..9b184a73 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/194] * grub-core/fs/udf.c: Add support for UUID +Subject: [PATCH 053/198] * 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.5 +2.14.3 diff --git a/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch b/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch index 163c96a4..8da198c9 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/194] mkrescue: Check xorriso presence before doing +Subject: [PATCH 054/198] 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.5 +2.14.3 diff --git a/0055-Fail-if-xorriso-failed.patch b/0055-Fail-if-xorriso-failed.patch index 10382313..e01cb136 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/194] Fail if xorriso failed. +Subject: [PATCH 055/198] 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.5 +2.14.3 diff --git a/0056-efi-refactor-grub_efi_allocate_pages.patch b/0056-efi-refactor-grub_efi_allocate_pages.patch index 48b553f6..b0480d8b 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/194] efi: refactor grub_efi_allocate_pages +Subject: [PATCH 056/198] 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.5 +2.14.3 diff --git a/0057-Remove-grub_efi_allocate_pages.patch b/0057-Remove-grub_efi_allocate_pages.patch index a8202118..c4f87c28 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/194] Remove grub_efi_allocate_pages. +Subject: [PATCH 057/198] 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.5 +2.14.3 diff --git a/0058-efi-move-fdt-helper-library.patch b/0058-efi-move-fdt-helper-library.patch index b4b8b8d7..48f7ffb1 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/194] efi: move fdt helper library +Subject: [PATCH 058/198] 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.5 +2.14.3 diff --git a/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch b/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch index f584828f..5c119c23 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/194] efi: Add GRUB_PE32_MAGIC definition +Subject: [PATCH 059/198] 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.5 +2.14.3 diff --git a/0060-arm64-linux-loader-improve-type-portability.patch b/0060-arm64-linux-loader-improve-type-portability.patch index e34dbd06..15055d75 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/194] arm64 linux loader: improve type portability +Subject: [PATCH 060/198] 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.5 +2.14.3 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 c0c7207f..c57853c7 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/194] efi: change heap allocation type to +Subject: [PATCH 061/198] 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.5 +2.14.3 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 74fb5f69..aa04fed1 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/194] core: use GRUB_TERM_ definitions when handling term +Subject: [PATCH 062/198] 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.5 +2.14.3 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 b2d4ab61..0b1f7599 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/194] io: add a GRUB_GZ prefix to gzio specific defines +Subject: [PATCH 063/198] 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.5 +2.14.3 diff --git a/0064-info-in-builddir.patch b/0064-info-in-builddir.patch index 84cca1c7..aee3f39a 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/194] info-in-builddir +Subject: [PATCH 064/198] 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.5 +2.14.3 diff --git a/0065-re-write-.gitignore.patch b/0065-re-write-.gitignore.patch index e6d919af..e9192f88 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/194] re-write .gitignore +Subject: [PATCH 065/198] re-write .gitignore --- .gitignore | 352 ++++++++++++-------------------------- @@ -496,5 +496,5 @@ index 000000000..b7e1eb124 @@ -0,0 +1 @@ +grub -- -2.13.5 +2.14.3 diff --git a/0066-IBM-client-architecture-CAS-reboot-support.patch b/0066-IBM-client-architecture-CAS-reboot-support.patch index 71382088..4ca3e07f 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/194] IBM client architecture (CAS) reboot support +Subject: [PATCH 066/198] 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.5 +2.14.3 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 917ec592..200f5b04 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/194] for ppc, reset console display attr when clear screen +Subject: [PATCH 067/198] 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.5 +2.14.3 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 bbcf7763..7a17eef7 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/194] Disable GRUB video support for IBM power machines +Subject: [PATCH 068/198] 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.5 +2.14.3 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 33b11ed4..eae9b9ca 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/194] Honor a symlink when generating configuration by +Subject: [PATCH 069/198] 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.5 +2.14.3 diff --git a/0070-Move-bash-completion-script-922997.patch b/0070-Move-bash-completion-script-922997.patch index 6c33653d..f1428feb 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/194] Move bash completion script (#922997) +Subject: [PATCH 070/198] 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.5 +2.14.3 diff --git a/0071-Update-to-minilzo-2.08.patch b/0071-Update-to-minilzo-2.08.patch index 0bffbdd1..19e0a5f2 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/194] Update to minilzo-2.08 +Subject: [PATCH 071/198] 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.5 +2.14.3 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 04a51b21..2d56ef63 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/194] Allow "fallback" to include entries by title, not +Subject: [PATCH 072/198] 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.5 +2.14.3 diff --git a/0073-Add-GRUB_DISABLE_UUID.patch b/0073-Add-GRUB_DISABLE_UUID.patch index 94980501..a8faaf9b 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/194] Add GRUB_DISABLE_UUID. +Subject: [PATCH 073/198] 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.5 +2.14.3 diff --git a/0074-Make-exit-take-a-return-code.patch b/0074-Make-exit-take-a-return-code.patch index 51a19cf6..48ac129c 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/194] Make "exit" take a return code. +Subject: [PATCH 074/198] 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.5 +2.14.3 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 49b545dc..ceb5435f 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/194] Mark po/exclude.pot as binary so git won't try to +Subject: [PATCH 075/198] 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.5 +2.14.3 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 8fea6819..50c6437e 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/194] Make efi machines load an env block from a variable +Subject: [PATCH 076/198] 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.5 +2.14.3 diff --git a/0077-DHCP-client-ID-and-UUID-options-added.patch b/0077-DHCP-client-ID-and-UUID-options-added.patch index 3e984292..5cdc9290 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/194] DHCP client ID and UUID options added. +Subject: [PATCH 077/198] DHCP client ID and UUID options added. --- grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++----- @@ -141,5 +141,5 @@ index 1096b2432..e266bae23 100644 }; -- -2.13.5 +2.14.3 diff --git a/0078-trim-arp-packets-with-abnormal-size.patch b/0078-trim-arp-packets-with-abnormal-size.patch index ef000b16..c2f62d0a 100644 --- a/0078-trim-arp-packets-with-abnormal-size.patch +++ b/0078-trim-arp-packets-with-abnormal-size.patch @@ -1,7 +1,7 @@ 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/194] trim arp packets with abnormal size +Subject: [PATCH 078/198] 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. @@ -27,5 +27,5 @@ index 54306e3b1..2083b5a4b 100644 struct grub_net_buff nb_reply; struct arppkt *arp_reply; -- -2.13.5 +2.14.3 diff --git a/0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch b/0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch index 076026c3..4a7c8860 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 60262dc77512d017974f38768d7492b4588d54f0 Mon Sep 17 00:00:00 2001 From: Prarit Bhargava Date: Wed, 12 Mar 2014 10:58:16 -0400 -Subject: [PATCH 079/194] Fix bad test on GRUB_DISABLE_SUBMENU. +Subject: [PATCH 079/198] 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.5 +2.14.3 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 a80e1048..c87fe7ca 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 699b7db9cabfe5e2dd48e61fcb079a91df3af4a7 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 12 Jun 2013 11:51:49 -0400 -Subject: [PATCH 080/194] Add support for UEFI operating systems returned by +Subject: [PATCH 080/198] 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.5 +2.14.3 diff --git a/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch index bcaac73b..de58e27b 100644 --- a/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch +++ b/0081-Migrate-PPC-from-Yaboot-to-Grub2.patch @@ -1,7 +1,7 @@ From 91b2efdd5e9c3b0784d0a70282407324f07a30b8 Mon Sep 17 00:00:00 2001 From: Mark Hamzy Date: Wed, 28 Mar 2012 14:46:41 -0500 -Subject: [PATCH 081/194] Migrate PPC from Yaboot to Grub2 +Subject: [PATCH 081/198] 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. @@ -15,20 +15,20 @@ diff --git a/Makefile.util.def b/Makefile.util.def index f9caccb97..6d452da02 100644 --- a/Makefile.util.def +++ b/Makefile.util.def -@@ -487,6 +487,13 @@ script = { +@@ -486,6 +486,13 @@ script = { + condition = COND_HOST_LINUX; }; - script = { ++script = { + name = '20_ppc_terminfo'; + common = util/grub.d/20_ppc_terminfo.in; + installdir = grubconf; + condition = COND_HOST_LINUX; +}; + -+script = { + script = { name = '30_os-prober'; common = util/grub.d/30_os-prober.in; - installdir = grubconf; diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in new file mode 100644 index 000000000..10d665868 @@ -150,5 +150,5 @@ index 000000000..10d665868 + terminfo -g ${X}x${Y} ${TERMINAL} +EOF -- -2.13.5 +2.14.3 diff --git a/0082-Add-fw_path-variable-revised.patch b/0082-Add-fw_path-variable-revised.patch index 42cdf2b4..b6a4eef4 100644 --- a/0082-Add-fw_path-variable-revised.patch +++ b/0082-Add-fw_path-variable-revised.patch @@ -1,7 +1,7 @@ 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/194] Add fw_path variable (revised) +Subject: [PATCH 082/198] 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.5 +2.14.3 diff --git a/0083-Add-support-for-linuxefi.patch b/0083-Add-support-for-linuxefi.patch index ee42905c..260a980a 100644 --- a/0083-Add-support-for-linuxefi.patch +++ b/0083-Add-support-for-linuxefi.patch @@ -1,7 +1,7 @@ From 28136df7d90f865a8030a0ff6513dacb3096dc10 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 10 Jul 2012 11:58:52 -0400 -Subject: [PATCH 083/194] Add support for linuxefi +Subject: [PATCH 083/198] Add support for linuxefi --- grub-core/Makefile.core.def | 8 + @@ -16,10 +16,11 @@ diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 1eb86bed3..c653c71c5 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def -@@ -1765,6 +1765,14 @@ module = { +@@ -1764,6 +1764,14 @@ module = { + enable = x86_64_efi; }; - module = { ++module = { + name = linuxefi; + efi = loader/i386/efi/linux.c; + efi = lib/cmdline.c; @@ -27,10 +28,9 @@ index 1eb86bed3..c653c71c5 100644 + enable = x86_64_efi; +}; + -+module = { + module = { name = chain; efi = loader/efi/chainloader.c; - i386_pc = loader/i386/pc/chainloader.c; diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c index ac2a4c556..f5440cb1d 100644 --- a/grub-core/kern/efi/mm.c @@ -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.5 +2.14.3 diff --git a/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch b/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch index f4676d46..9794bef5 100644 --- a/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch +++ b/0084-Use-linuxefi-and-initrdefi-where-appropriate.patch @@ -1,7 +1,7 @@ From e915644108ed022ad0cc5d2d987f116d2605bcf2 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 16 Jul 2012 18:57:11 -0400 -Subject: [PATCH 084/194] Use "linuxefi" and "initrdefi" where appropriate. +Subject: [PATCH 084/198] 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.5 +2.14.3 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 2bff02f1..4af2ddef 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 b1eb9a8b9aa961bf6b6f40d6b4d22a5741f29ae4 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 23 Oct 2012 10:40:49 -0400 -Subject: [PATCH 085/194] Don't allow insmod when secure boot is enabled. +Subject: [PATCH 085/198] 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.5 +2.14.3 diff --git a/0086-Pass-x-hex-hex-straight-through-unmolested.patch b/0086-Pass-x-hex-hex-straight-through-unmolested.patch index 0f7da973..119fa904 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 cc8be4cafeb5a0af779afe5d2856da434c165612 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 1 Oct 2012 13:24:37 -0400 -Subject: [PATCH 086/194] Pass "\x[[:hex:]][[:hex:]]" straight through +Subject: [PATCH 086/198] Pass "\x[[:hex:]][[:hex:]]" straight through unmolested. --- @@ -179,5 +179,5 @@ index ab78ca87f..cf6cd6601 100644 case '$': if (escaped) -- -2.13.5 +2.14.3 diff --git a/0087-Add-X-option-to-printf-functions.patch b/0087-Add-X-option-to-printf-functions.patch index 37bf66b3..928141cc 100644 --- a/0087-Add-X-option-to-printf-functions.patch +++ b/0087-Add-X-option-to-printf-functions.patch @@ -1,7 +1,7 @@ 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/194] Add %X option to printf functions. +Subject: [PATCH 087/198] Add %X option to printf functions. --- grub-core/kern/misc.c | 7 +++++-- @@ -54,5 +54,5 @@ index 952411d5d..8344526be 100644 case 'd': { -- -2.13.5 +2.14.3 diff --git a/0088-Search-for-specific-config-file-for-netboot.patch b/0088-Search-for-specific-config-file-for-netboot.patch index c1c1d13e..8a4a61a9 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 30c15e39be47d60f6a4a45628a687911a9f11091 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 17:22:07 -0200 -Subject: [PATCH 088/194] Search for specific config file for netboot +Subject: [PATCH 088/198] 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.5 +2.14.3 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 b310fd0d..65c4f937 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 266c7e797971879dc229594556a687a79c92d3b6 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Tue, 22 Jan 2013 06:31:38 +0100 -Subject: [PATCH 089/194] blscfg: add blscfg module to parse Boot Loader +Subject: [PATCH 089/198] blscfg: add blscfg module to parse Boot Loader Specification snippets http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec @@ -24,10 +24,11 @@ diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index c653c71c5..7f3d5a2bf 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def -@@ -769,6 +769,14 @@ module = { +@@ -768,6 +768,14 @@ module = { + common = commands/blocklist.c; }; - module = { ++module = { + name = blscfg; + common = commands/blscfg.c; + enable = i386_efi; @@ -35,10 +36,9 @@ index c653c71c5..7f3d5a2bf 100644 + enable = i386_pc; +}; + -+module = { + module = { name = boot; common = commands/boot.c; - i386_pc = lib/i386/pc/biosnum.c; diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c new file mode 100644 index 000000000..4274aca5a @@ -247,5 +247,5 @@ index 000000000..4274aca5a + grub_unregister_extcmd (cmd); +} -- -2.13.5 +2.14.3 diff --git a/0090-Don-t-write-messages-to-the-screen.patch b/0090-Don-t-write-messages-to-the-screen.patch index 197f653b..736c8c92 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 6609ba848331d9153c554bb52f2ef0a33531cf55 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:30:20 -0400 -Subject: [PATCH 090/194] Don't write messages to the screen +Subject: [PATCH 090/198] 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.5 +2.14.3 diff --git a/0091-Don-t-print-GNU-GRUB-header.patch b/0091-Don-t-print-GNU-GRUB-header.patch index 538a0958..b93af732 100644 --- a/0091-Don-t-print-GNU-GRUB-header.patch +++ b/0091-Don-t-print-GNU-GRUB-header.patch @@ -1,7 +1,7 @@ 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/194] Don't print GNU GRUB header +Subject: [PATCH 091/198] Don't print GNU GRUB header No one cares. --- @@ -41,5 +41,5 @@ index b2654ef62..f57b7508a 100644 static void -- -2.13.5 +2.14.3 diff --git a/0092-Don-t-add-to-highlighted-row.patch b/0092-Don-t-add-to-highlighted-row.patch index caa2c803..4c1e810b 100644 --- a/0092-Don-t-add-to-highlighted-row.patch +++ b/0092-Don-t-add-to-highlighted-row.patch @@ -1,7 +1,7 @@ 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/194] Don't add '*' to highlighted row +Subject: [PATCH 092/198] 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.5 +2.14.3 diff --git a/0093-Message-string-cleanups.patch b/0093-Message-string-cleanups.patch index 4276a3f0..cd23a84b 100644 --- a/0093-Message-string-cleanups.patch +++ b/0093-Message-string-cleanups.patch @@ -1,7 +1,7 @@ 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/194] Message string cleanups +Subject: [PATCH 093/198] Message string cleanups Make use of terminology consistent. Remove jargon. --- @@ -67,5 +67,5 @@ index a3d1f23f6..64a83862f 100644 { grub_print_error (); -- -2.13.5 +2.14.3 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 6a277cef..c67e9fef 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 c2e1e09485a5773dc3639d34eadc3a07ebce8fe5 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:23 -0400 -Subject: [PATCH 094/194] Fix border spacing now that we aren't displaying it +Subject: [PATCH 094/198] 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.5 +2.14.3 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 71570ed1..d47f7bd0 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 e29b4dd346fa10dc6a073239ef1ed8fb32a0c838 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:49 -0400 -Subject: [PATCH 095/194] Use the correct indentation for the term help text +Subject: [PATCH 095/198] 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.5 +2.14.3 diff --git a/0096-Indent-menu-entries.patch b/0096-Indent-menu-entries.patch index 41bede59..4885cd6c 100644 --- a/0096-Indent-menu-entries.patch +++ b/0096-Indent-menu-entries.patch @@ -1,7 +1,7 @@ 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/194] Indent menu entries +Subject: [PATCH 096/198] 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.5 +2.14.3 diff --git a/0097-Fix-margins.patch b/0097-Fix-margins.patch index 58904ce6..8e93f578 100644 --- a/0097-Fix-margins.patch +++ b/0097-Fix-margins.patch @@ -1,7 +1,7 @@ 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/194] Fix margins +Subject: [PATCH 097/198] 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.5 +2.14.3 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 79715a97..94dc83ae 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 01757871cb2a7355a7f67e80f77a57fecba26f54 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 21 Jun 2013 14:44:08 -0400 -Subject: [PATCH 098/194] Use -2 instead of -1 for our right-hand margin, so +Subject: [PATCH 098/198] 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.5 +2.14.3 diff --git a/0099-Use-linux16-when-appropriate-880840.patch b/0099-Use-linux16-when-appropriate-880840.patch index c28450be..bcaea52b 100644 --- a/0099-Use-linux16-when-appropriate-880840.patch +++ b/0099-Use-linux16-when-appropriate-880840.patch @@ -1,7 +1,7 @@ From ac001b7b4cc1819186fbe2bc695cbe58d2077d0f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:05:07 -0400 -Subject: [PATCH 099/194] Use linux16 when appropriate (#880840) +Subject: [PATCH 099/198] 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.5 +2.14.3 diff --git a/0100-Enable-pager-by-default.-985860.patch b/0100-Enable-pager-by-default.-985860.patch index 8e15e9b3..5d9fa833 100644 --- a/0100-Enable-pager-by-default.-985860.patch +++ b/0100-Enable-pager-by-default.-985860.patch @@ -1,7 +1,7 @@ From cc60fb5b7693dabcf100c910d42b3ffe1816597f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:09:27 -0400 -Subject: [PATCH 100/194] Enable pager by default. (#985860) +Subject: [PATCH 100/198] Enable pager by default. (#985860) Signed-off-by: Peter Jones --- @@ -22,5 +22,5 @@ index 93a90233e..858b526c9 100644 load_env fi -- -2.13.5 +2.14.3 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 50162654..bae0ac19 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 f1cb6c5a7640406294b7dffab3c5e4a4afdaf745 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:13:27 -0400 -Subject: [PATCH 101/194] F10 doesn't work on serial, so don't tell the user to +Subject: [PATCH 101/198] 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.5 +2.14.3 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 0f5f81b6..f3c37dee 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 13c028af4104555993650dd9a26dd633c516d23f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 14 Mar 2011 14:27:42 -0400 -Subject: [PATCH 102/194] Don't say "GNU/Linux" in generated menus. +Subject: [PATCH 102/198] 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.5 +2.14.3 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 4c928e42..d84dfbf4 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 8b51cba8f5587746d1559bd6ec957db3e185c049 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 16:47:33 -0400 -Subject: [PATCH 103/194] Don't draw a border around the menu +Subject: [PATCH 103/198] 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.5 +2.14.3 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 c1462a37..07a3c23d 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 137250b0ef67150568074da35c568c6c649899f6 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 10:52:32 -0400 -Subject: [PATCH 104/194] Use the standard margin for the timeout string +Subject: [PATCH 104/198] 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.5 +2.14.3 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 00f419ad..cd5ec1a7 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 0464db837a67b88a761f100391b135a70b7054eb Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 13 Jan 2014 21:50:59 -0500 -Subject: [PATCH 105/194] Add .eh_frame to list of relocations stripped +Subject: [PATCH 105/198] 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.5 +2.14.3 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 ad3dae31..23c67fa4 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 fb582651ea4568d7226f96e6b618ad795430c842 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 13:12:23 -0500 -Subject: [PATCH 106/194] Make 10_linux work with our changes for linux16 and +Subject: [PATCH 106/198] 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.5 +2.14.3 diff --git a/0107-Don-t-print-during-fdt-loading-method.patch b/0107-Don-t-print-during-fdt-loading-method.patch index 425d882f..383cf925 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 40e56a4c2e879f5efcbcc36cf6a88ee1cb39d607 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 16:15:46 -0500 -Subject: [PATCH 107/194] Don't print during fdt loading method. +Subject: [PATCH 107/198] Don't print during fdt loading method. Signed-off-by: Peter Jones --- @@ -23,5 +23,5 @@ index 191aebe80..452a9f69d 100644 EOF fi -- -2.13.5 +2.14.3 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 63960feb..6450831b 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 ff25c6034ab8213d911414e666b7d44bc44496aa Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 30 Jun 2014 14:16:46 -0400 -Subject: [PATCH 108/194] Don't munge raw spaces when we're doing our cmdline +Subject: [PATCH 108/198] 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.5 +2.14.3 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 78b89d45..413442b5 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 2df38f07986a91d2a06cb3e432f9121d9f678f89 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 11 Feb 2014 11:14:50 -0500 -Subject: [PATCH 109/194] Don't require a password to boot entries generated by +Subject: [PATCH 109/198] 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.5 +2.14.3 diff --git a/0110-Don-t-emit-Booting-.-message.patch b/0110-Don-t-emit-Booting-.-message.patch index 01b4ffc7..f4d06792 100644 --- a/0110-Don-t-emit-Booting-.-message.patch +++ b/0110-Don-t-emit-Booting-.-message.patch @@ -1,7 +1,7 @@ From a72d4819fb7275cbf65b5de901c50d076bf861fd Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 09:37:49 -0500 -Subject: [PATCH 110/194] Don't emit "Booting ..." message. +Subject: [PATCH 110/198] 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.5 +2.14.3 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 76523468..ec3f88e7 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 6412d775976361b52c0914f6e5e3b0a4b99cdba9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 4 Mar 2014 11:00:23 -0500 -Subject: [PATCH 111/194] Replace a lot of man pages with slightly nicer ones. +Subject: [PATCH 111/198] 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.5 +2.14.3 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 f31b4fad..039918e3 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 acf4cfa6d1691a9476b36949af7e296080c88d25 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 19 Feb 2014 15:58:43 -0500 -Subject: [PATCH 112/194] use fw_path prefix when fallback searching for grub +Subject: [PATCH 112/198] 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.5 +2.14.3 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 89cb209a..d6b73579 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 b7aa57a2f879d185888e4d47f77a1a30370973f9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 6 Mar 2014 11:51:33 -0500 -Subject: [PATCH 113/194] Try mac/guid/etc before grub.cfg on tftp config +Subject: [PATCH 113/198] 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.5 +2.14.3 diff --git a/0114-Fix-convert-function-to-support-NVMe-devices.patch b/0114-Fix-convert-function-to-support-NVMe-devices.patch index 32d51c00..100df73f 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 69946054baab92385b9f6518cc78e94810b40c48 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 11:34:00 -0500 -Subject: [PATCH 114/194] Fix convert function to support NVMe devices +Subject: [PATCH 114/198] 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.5 +2.14.3 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 63326857..4640109c 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 f168a0803d8d35e431ef6888755f9b2622304846 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 10 Feb 2014 16:13:10 -0500 -Subject: [PATCH 115/194] Switch to use APM Mustang device tree, for hardware +Subject: [PATCH 115/198] 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.5 +2.14.3 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 fbd31920..1d37990b 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 6ec36777aae0c4afd98f67f22d4d511b447dbb02 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 12 Feb 2014 14:54:04 -0500 -Subject: [PATCH 116/194] Use the default device tree from the grub default +Subject: [PATCH 116/198] 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.5 +2.14.3 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 c6b0e431..e8599ae0 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 debcbbacd18bfbbcbd5fd9dce947f2cbce09c916 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Sat, 15 Feb 2014 15:10:22 -0500 -Subject: [PATCH 117/194] reopen SNP protocol for exclusive use by grub +Subject: [PATCH 117/198] 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.5 +2.14.3 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 e30bf4af..6a9f00ae 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 88892eedb9beb9d8c295329fad87edb339e4e27c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Mar 2016 15:13:59 -0500 -Subject: [PATCH 118/194] Revert "reopen SNP protocol for exclusive use by +Subject: [PATCH 118/198] 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.5 +2.14.3 diff --git a/0119-Add-grub_util_readlink.patch b/0119-Add-grub_util_readlink.patch index 953637db..5dfac40f 100644 --- a/0119-Add-grub_util_readlink.patch +++ b/0119-Add-grub_util_readlink.patch @@ -1,7 +1,7 @@ From 9c1af9c0a44353f6b72691456a4a2883246b6346 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:01:03 -0400 -Subject: [PATCH 119/194] Add grub_util_readlink() +Subject: [PATCH 119/198] 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.5 +2.14.3 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 a3838c49..a19f196a 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 5c54e71e4b4a3f8fbfedd5eca821238a7d80b491 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:38:00 -0400 -Subject: [PATCH 120/194] Make editenv chase symlinks including those across +Subject: [PATCH 120/198] 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.5 +2.14.3 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 8d8780b3..e9a586b9 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 7ca8e2b9e23a3588654d53a8e84bb22743896f80 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 14:23:23 -0400 -Subject: [PATCH 121/194] Generate OS and CLASS in 10_linux from +Subject: [PATCH 121/198] 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.5 +2.14.3 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 79281f4a..71dc18c5 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 e84a66eb07c96db182d57f4d40ff7c607a0e5296 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 15:52:08 -0400 -Subject: [PATCH 122/194] Minimize the sort ordering for .debug and -rescue- +Subject: [PATCH 122/198] 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.5 +2.14.3 diff --git a/0123-Load-arm-with-SB-enabled.patch b/0123-Load-arm-with-SB-enabled.patch index aff9066d..e43a8f5f 100644 --- a/0123-Load-arm-with-SB-enabled.patch +++ b/0123-Load-arm-with-SB-enabled.patch @@ -1,7 +1,7 @@ -From b21b80fe44eb379bb268c623ee092a9b776d11d9 Mon Sep 17 00:00:00 2001 +From 87206b6fc4fcb9ac5fb5778ec7c9fbb4ef1841b7 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 18 Sep 2014 11:26:14 -0400 -Subject: [PATCH 123/194] Load arm with SB enabled. +Subject: [PATCH 123/198] 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 | 115 ++++++++++++++++++++------------------ + grub-core/loader/arm64/linux.c | 116 ++++++++++++++++++++------------------ 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, 170 insertions(+), 90 deletions(-) + 6 files changed, 171 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..33345d375 100644 +index 746edd104..03ff83563 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..33345d375 100644 void *fdt; -@@ -100,6 +103,25 @@ finalize_params_linux (void) +@@ -100,6 +103,26 @@ finalize_params_linux (void) if (grub_fdt_install() != GRUB_ERR_NONE) goto failure; @@ -86,7 +86,8 @@ index 746edd104..33345d375 100644 + loaded_image->load_options_size = len = + (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t); + loaded_image->load_options = -+ grub_efi_allocate_any_pages (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"); + @@ -97,7 +98,7 @@ index 746edd104..33345d375 100644 return GRUB_ERR_NONE; failure: -@@ -107,72 +129,47 @@ failure: +@@ -107,72 +130,47 @@ failure: return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT"); } @@ -198,7 +199,7 @@ index 746edd104..33345d375 100644 } static grub_err_t -@@ -249,6 +246,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), +@@ -249,6 +247,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), { grub_file_t file = 0; struct grub_arm64_linux_kernel_header lh; @@ -206,7 +207,7 @@ index 746edd104..33345d375 100644 grub_dl_ref (my_mod); -@@ -293,6 +291,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), +@@ -293,6 +292,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), grub_dprintf ("linux", "kernel @ %p\n", kernel_addr); @@ -422,5 +423,5 @@ index 000000000..d9ede3677 + +#endif /* ! GRUB_EFI_LINUX_HEADER */ -- -2.13.5 +2.14.3 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 4279e1a1..ce9979e3 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 8fd7dd327b69530d901168cb02827a894f1f9cf7 Mon Sep 17 00:00:00 2001 +From 2d50086f8689da717502383fc3f29678493a054b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 3 Oct 2014 11:08:03 -0400 -Subject: [PATCH 124/194] Try $prefix if $fw_path doesn't work. +Subject: [PATCH 124/198] Try $prefix if $fw_path doesn't work. Related: rhbz#1148652 @@ -207,5 +207,5 @@ index 7d9c4f09b..b69f9e738 100644 } -- -2.13.5 +2.14.3 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 57ac7b96..f4306456 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 577f38ceb2f1676cb8e63a1d461eb9d6a9936385 Mon Sep 17 00:00:00 2001 +From ce7e8db6a534b0b3653ec8a20bdd5550500706f4 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 16:34:51 -0400 -Subject: [PATCH 125/194] Update info with grub.cfg netboot selection order +Subject: [PATCH 125/198] 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.5 +2.14.3 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 6e733bf4..31bc5be7 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 42c78f4a2f3359b415eff631712a0400c2042522 Mon Sep 17 00:00:00 2001 +From 3bafdc90cd92f95c0dbc373ae9f408d5f6883ec3 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 14:14:19 -0400 -Subject: [PATCH 126/194] Use Distribution Package Sort for grub2-mkconfig +Subject: [PATCH 126/198] 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.5 +2.14.3 diff --git a/0127-Handle-rssd-storage-devices.patch b/0127-Handle-rssd-storage-devices.patch index f686ec03..0993e71a 100644 --- a/0127-Handle-rssd-storage-devices.patch +++ b/0127-Handle-rssd-storage-devices.patch @@ -1,7 +1,7 @@ -From 1dbfe2b96218a579d8da9ba8418857f0cf030890 Mon Sep 17 00:00:00 2001 +From 8f42cdcaaffec149276d2a5a3faa2540432edc4c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 30 Jun 2015 15:50:41 -0400 -Subject: [PATCH 127/194] Handle rssd storage devices. +Subject: [PATCH 127/198] 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.5 +2.14.3 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 3563c28f..f8286f86 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 f6c0a92a360a92e58b3e90120ddbd1e183eccb50 Mon Sep 17 00:00:00 2001 +From 1daf969815f1487e02a78725e592b4d973641a4f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 27 Oct 2014 09:22:55 -0400 -Subject: [PATCH 128/194] Try to emit linux16/initrd16 and linuxefi/initrdefi +Subject: [PATCH 128/198] 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.5 +2.14.3 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 ab644ed7..93fe76e1 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 12fd265ed00dcbe26e423800fc6b7058f48163db Mon Sep 17 00:00:00 2001 +From 114b6f132798b8819e899e3dc7988519dedc07e2 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 28 Apr 2015 11:15:03 -0400 -Subject: [PATCH 129/194] Make grub2-mkconfig construct titles that look like +Subject: [PATCH 129/198] 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.5 +2.14.3 diff --git a/0130-Add-friendly-grub2-password-config-tool-985962.patch b/0130-Add-friendly-grub2-password-config-tool-985962.patch index ad60457f..104346f8 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 dda4c69e2fb3c12f838866740eb04142975df9a3 Mon Sep 17 00:00:00 2001 +From b970cde9a609dce14c52145aaa61b87299f55086 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Thu, 25 Jun 2015 11:13:11 -0400 -Subject: [PATCH 130/194] Add friendly grub2 password config tool (#985962) +Subject: [PATCH 130/198] 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 @@ -38,33 +38,33 @@ diff --git a/Makefile.util.def b/Makefile.util.def index d846b81b5..226c46b2d 100644 --- a/Makefile.util.def +++ b/Makefile.util.def -@@ -440,6 +440,12 @@ script = { +@@ -439,6 +439,12 @@ script = { + installdir = grubconf; }; - script = { ++script = { + name = '01_users'; + common = util/grub.d/01_users.in; + installdir = grubconf; +}; + -+script = { + script = { name = '10_windows'; common = util/grub.d/10_windows.in; - installdir = grubconf; -@@ -722,6 +728,13 @@ script = { +@@ -721,6 +727,13 @@ script = { + installdir = sbin; }; - script = { ++script = { + name = grub-setpassword; + common = util/grub-setpassword.in; + mansection = 8; + installdir = sbin; +}; + -+script = { + script = { name = grub-mkconfig_lib; common = util/grub-mkconfig_lib.in; - installdir = noinst; diff --git a/configure.ac b/configure.ac index 49427cbf9..196084004 100644 --- a/configure.ac @@ -271,5 +271,5 @@ index 000000000..db2f44bfb +fi +EOF -- -2.13.5 +2.14.3 diff --git a/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0131-Make-grub2-mkconfig-construct-titles-that-look-like-.patch similarity index 93% rename from 0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch rename to 0131-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index 27196bb1..48d26f47 100644 --- a/0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0131-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -1,7 +1,7 @@ -From 1e3b125bce76027722c7ac9844298646f9a6e42d Mon Sep 17 00:00:00 2001 +From 28c26e2c86d4b1218004d9e73ba3350704548e32 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 +Subject: [PATCH 131/198] 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.5 +2.14.3 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 deleted file mode 100644 index b9ffcb69..00000000 --- a/0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch +++ /dev/null @@ -1,103 +0,0 @@ -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 - GRUB_MACHINE_EFI - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1150698 - -HyperV Gen2 virtual machines have no PIT; guest code should rely on UEFI -services instead. - -Signed-off-by: RHEL Ninjas ---- - 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..48c013860 100644 ---- a/grub-core/kern/i386/tsc.c -+++ b/grub-core/kern/i386/tsc.c -@@ -24,6 +24,17 @@ - #include - #include - #include -+#ifdef GRUB_MACHINE_XEN -+# include -+#else -+# ifdef GRUB_MACHINE_EFI -+# include -+# include -+# else -+# include -+# endif -+#endif -+#include - - /* This defines the value TSC had at the epoch (that is, when we calibrated it). */ - static grub_uint64_t tsc_boot_time; -@@ -33,6 +44,44 @@ static grub_uint64_t tsc_boot_time; - in 32-bit. */ - grub_uint32_t grub_tsc_rate; - -+#ifndef GRUB_MACHINE_XEN -+ -+static void -+grub_stall (grub_uint16_t tics) -+{ -+# ifdef GRUB_MACHINE_EFI -+ grub_uint64_t microseconds; -+ -+ microseconds = (grub_uint64_t)tics * 1000 * 1000 * 3 / 3579545; -+ efi_call_1 (grub_efi_system_table->boot_services->stall, microseconds); -+# else -+ /* Disable timer2 gate and speaker. */ -+ grub_outb (grub_inb (GRUB_PIT_SPEAKER_PORT) -+ & ~ (GRUB_PIT_SPK_DATA | GRUB_PIT_SPK_TMR2), -+ GRUB_PIT_SPEAKER_PORT); -+ -+ /* Set tics. */ -+ grub_outb (GRUB_PIT_CTRL_SELECT_2 | GRUB_PIT_CTRL_READLOAD_WORD, -+ GRUB_PIT_CTRL); -+ grub_outb (tics & 0xff, GRUB_PIT_COUNTER_2); -+ grub_outb (tics >> 8, GRUB_PIT_COUNTER_2); -+ -+ /* Enable timer2 gate, keep speaker disabled. */ -+ grub_outb ((grub_inb (GRUB_PIT_SPEAKER_PORT) & ~ GRUB_PIT_SPK_DATA) -+ | GRUB_PIT_SPK_TMR2, -+ GRUB_PIT_SPEAKER_PORT); -+ -+ /* Wait. */ -+ while ((grub_inb (GRUB_PIT_SPEAKER_PORT) & GRUB_PIT_SPK_TMR2_LATCH) == 0x00); -+ -+ /* Disable timer2 gate and speaker. */ -+ grub_outb (grub_inb (GRUB_PIT_SPEAKER_PORT) -+ & ~ (GRUB_PIT_SPK_DATA | GRUB_PIT_SPK_TMR2), -+ GRUB_PIT_SPEAKER_PORT); -+# endif -+} -+#endif -+ - static grub_uint64_t - grub_tsc_get_time_ms (void) - { -@@ -46,7 +95,15 @@ grub_tsc_get_time_ms (void) - static int - calibrate_tsc_hardcode (void) - { -- grub_tsc_rate = 5368;/* 800 MHz */ -+ /* First calibrate the TSC rate (relative, not absolute time). */ -+ grub_uint64_t end_tsc; -+ -+ tsc_boot_time = grub_get_tsc (); -+ grub_stall (0xffff); -+ end_tsc = grub_get_tsc (); -+ -+ grub_tsc_rate = grub_divmod64 ((55ULL << 32), end_tsc - tsc_boot_time, 0); -+ - return 1; - } - --- -2.13.5 - diff --git a/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch b/0132-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch similarity index 92% rename from 0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch rename to 0132-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch index bc3104d4..295896eb 100644 --- a/0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch +++ b/0132-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch @@ -1,7 +1,7 @@ -From fbfd5d8ed8993f3da4555b69a6018393be20b259 Mon Sep 17 00:00:00 2001 +From 000e91150ac5831e54e0cd1176c113f5358a7876 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 +Subject: [PATCH 132/198] 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.5 +2.14.3 diff --git a/0134-tcp-add-window-scaling-support.patch b/0133-tcp-add-window-scaling-support.patch similarity index 95% rename from 0134-tcp-add-window-scaling-support.patch rename to 0133-tcp-add-window-scaling-support.patch index 6ea60e95..237a1a89 100644 --- a/0134-tcp-add-window-scaling-support.patch +++ b/0133-tcp-add-window-scaling-support.patch @@ -1,7 +1,7 @@ -From bb693d96ccfdd5a2bd79ae67325c75b81679fae7 Mon Sep 17 00:00:00 2001 +From e6aef714ded4e1b93464368eae39f7354e0053e6 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 +Subject: [PATCH 133/198] 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.5 +2.14.3 diff --git a/0135-efinet-retransmit-if-our-device-is-busy.patch b/0134-efinet-retransmit-if-our-device-is-busy.patch similarity index 92% rename from 0135-efinet-retransmit-if-our-device-is-busy.patch rename to 0134-efinet-retransmit-if-our-device-is-busy.patch index ce672547..69038804 100644 --- a/0135-efinet-retransmit-if-our-device-is-busy.patch +++ b/0134-efinet-retransmit-if-our-device-is-busy.patch @@ -1,7 +1,7 @@ -From 0fd33baa9fa8db6b8868a9691dc08a683bade47b Mon Sep 17 00:00:00 2001 +From 44d4ff84eddb7cc679b8bfa6799824df6d43d413 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 +Subject: [PATCH 134/198] 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.5 +2.14.3 diff --git a/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch b/0135-Be-more-aggro-about-actually-using-the-configured-ne.patch similarity index 98% rename from 0136-Be-more-aggro-about-actually-using-the-configured-ne.patch rename to 0135-Be-more-aggro-about-actually-using-the-configured-ne.patch index b4e6f2fc..320cea5f 100644 --- a/0136-Be-more-aggro-about-actually-using-the-configured-ne.patch +++ b/0135-Be-more-aggro-about-actually-using-the-configured-ne.patch @@ -1,7 +1,7 @@ -From 6296e091d9568b7334b5ba2392968ea839e404ba Mon Sep 17 00:00:00 2001 +From 457789395b36baa8348b4594f9dc9fc2e8c5ef6c 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* +Subject: [PATCH 135/198] 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.5 +2.14.3 diff --git a/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch b/0136-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch similarity index 94% rename from 0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch rename to 0136-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch index c42470e3..00651e62 100644 --- a/0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch +++ b/0136-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch @@ -1,7 +1,7 @@ -From e1e6bdda43fd14f2a8a2dfe8352469921c820e0b Mon Sep 17 00:00:00 2001 +From cc02f809a13a9efa0f3c6295f7dd0ea29cc030b9 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 +Subject: [PATCH 136/198] efinet: add filter for the first exclusive reopen of SNP --- @@ -59,5 +59,5 @@ index a3ce4c67c..b870d3f19 100644 } } -- -2.13.5 +2.14.3 diff --git a/0138-Fix-security-issue-when-reading-username-and-passwor.patch b/0137-Fix-security-issue-when-reading-username-and-passwor.patch similarity index 89% rename from 0138-Fix-security-issue-when-reading-username-and-passwor.patch rename to 0137-Fix-security-issue-when-reading-username-and-passwor.patch index e0ec9d18..585fd2dd 100644 --- a/0138-Fix-security-issue-when-reading-username-and-passwor.patch +++ b/0137-Fix-security-issue-when-reading-username-and-passwor.patch @@ -1,7 +1,7 @@ -From 7b470ffd69ab31874f04d8f4518f8feea592a16d Mon Sep 17 00:00:00 2001 +From 1f03d841b2872f5118fc7cbde39f0f19021d16ae 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 +Subject: [PATCH 137/198] 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.5 +2.14.3 diff --git a/0139-Warn-if-grub-password-will-not-be-read-1290803.patch b/0138-Warn-if-grub-password-will-not-be-read-1290803.patch similarity index 88% rename from 0139-Warn-if-grub-password-will-not-be-read-1290803.patch rename to 0138-Warn-if-grub-password-will-not-be-read-1290803.patch index a308304a..21e62b45 100644 --- a/0139-Warn-if-grub-password-will-not-be-read-1290803.patch +++ b/0138-Warn-if-grub-password-will-not-be-read-1290803.patch @@ -1,7 +1,7 @@ -From e49580ec2f0a1898df2dc54a99ee7a148f8f6a87 Mon Sep 17 00:00:00 2001 +From d2367e799a35076aa94b940ee04c88df616f9278 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) +Subject: [PATCH 138/198] 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.5 +2.14.3 diff --git a/0140-Clean-up-grub-setpassword-documentation-1290799.patch b/0139-Clean-up-grub-setpassword-documentation-1290799.patch similarity index 93% rename from 0140-Clean-up-grub-setpassword-documentation-1290799.patch rename to 0139-Clean-up-grub-setpassword-documentation-1290799.patch index ac5ea2c7..71b73caa 100644 --- a/0140-Clean-up-grub-setpassword-documentation-1290799.patch +++ b/0139-Clean-up-grub-setpassword-documentation-1290799.patch @@ -1,7 +1,7 @@ -From ccef3063f3e6d95f8caa0154dc91a278d3f54dd1 Mon Sep 17 00:00:00 2001 +From 2166377a018bc26bc565fecf76d31057a3533603 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) +Subject: [PATCH 139/198] 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.5 +2.14.3 diff --git a/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch b/0140-Fix-locale-issue-in-grub-setpassword-1294243.patch similarity index 86% rename from 0141-Fix-locale-issue-in-grub-setpassword-1294243.patch rename to 0140-Fix-locale-issue-in-grub-setpassword-1294243.patch index 7a732d6f..4a8f9722 100644 --- a/0141-Fix-locale-issue-in-grub-setpassword-1294243.patch +++ b/0140-Fix-locale-issue-in-grub-setpassword-1294243.patch @@ -1,7 +1,7 @@ -From 149d7c90af749a5b2f0a958ea364785319fd290a Mon Sep 17 00:00:00 2001 +From 27f304a75c966a1daad262d34c84c7de0c5dab69 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) +Subject: [PATCH 140/198] 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.5 +2.14.3 diff --git a/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch b/0141-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch similarity index 86% rename from 0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch rename to 0141-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch index 2cbb4a43..43c7dcb2 100644 --- a/0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch +++ b/0141-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch @@ -1,7 +1,7 @@ -From 30420391d9c42ee08d0d68b13de70a4f63b01ec8 Mon Sep 17 00:00:00 2001 +From cd5e17c01c996bcf446e16978e37569aa0d889dd 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 +Subject: [PATCH 141/198] 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.5 +2.14.3 diff --git a/0143-efiemu-Fix-compilation-failure.patch b/0142-efiemu-Fix-compilation-failure.patch similarity index 86% rename from 0143-efiemu-Fix-compilation-failure.patch rename to 0142-efiemu-Fix-compilation-failure.patch index 4a516a0c..5e682149 100644 --- a/0143-efiemu-Fix-compilation-failure.patch +++ b/0142-efiemu-Fix-compilation-failure.patch @@ -1,7 +1,7 @@ -From 0588a88adbd4fd4482a02f717c76b4b3753bd653 Mon Sep 17 00:00:00 2001 +From 54e9e666d32c0a18a7cc529cda86686462f04151 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 +Subject: [PATCH 142/198] efiemu: Fix compilation failure (cherry picked from commit b6a03dfd327489d53ee07c6d7d593b99c7b7cb62) @@ -26,5 +26,5 @@ index 92e7df7e5..52a032f7b 100644 GRUB_EFI_PERSISTENT_MEMORY); default: -- -2.13.5 +2.14.3 diff --git a/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0143-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch similarity index 94% rename from 0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch rename to 0143-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index 14fdce1a..a20e12b4 100644 --- a/0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0143-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,7 +1,7 @@ -From 7766b66bf1f1c7c586026be98883e60e2cc943b9 Mon Sep 17 00:00:00 2001 +From e5df22a8207a4b09c7bc89a7ac92719a529c2a63 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 +Subject: [PATCH 143/198] 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.5 +2.14.3 diff --git a/0145-Add-a-url-parser.patch b/0144-Add-a-url-parser.patch similarity index 99% rename from 0145-Add-a-url-parser.patch rename to 0144-Add-a-url-parser.patch index 34d7f3f0..13537da5 100644 --- a/0145-Add-a-url-parser.patch +++ b/0144-Add-a-url-parser.patch @@ -1,7 +1,7 @@ -From af7f8bf044711fbbd3568b43e1ce31cdd6282561 Mon Sep 17 00:00:00 2001 +From 283d44e07b5c02cd87a0eec5cdd596306a9c1b41 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. +Subject: [PATCH 144/198] 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.5 +2.14.3 diff --git a/0146-efinet-and-bootp-add-support-for-dhcpv6.patch b/0145-efinet-and-bootp-add-support-for-dhcpv6.patch similarity index 99% rename from 0146-efinet-and-bootp-add-support-for-dhcpv6.patch rename to 0145-efinet-and-bootp-add-support-for-dhcpv6.patch index 4be841c1..122e92b7 100644 --- a/0146-efinet-and-bootp-add-support-for-dhcpv6.patch +++ b/0145-efinet-and-bootp-add-support-for-dhcpv6.patch @@ -1,7 +1,7 @@ -From f809be3900ca1d95892f00d0c5dc8b975b510ef6 Mon Sep 17 00:00:00 2001 +From 89b9b60f3bf638786a686eb86344a73523168034 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 +Subject: [PATCH 145/198] 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.5 +2.14.3 diff --git a/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0146-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch similarity index 97% rename from 0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch rename to 0146-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch index 7ca2092f..6358372f 100644 --- a/0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +++ b/0146-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch @@ -1,7 +1,7 @@ -From a037c9021bf1b24299a521d0c40643600ddc437e Mon Sep 17 00:00:00 2001 +From 38b9ded25e7f0b2b0265759bbf3a69e07df50eb9 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 +Subject: [PATCH 146/198] 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 @@ -40,20 +40,20 @@ diff --git a/Makefile.util.def b/Makefile.util.def index 226c46b2d..ed27351eb 100644 --- a/Makefile.util.def +++ b/Makefile.util.def -@@ -714,6 +714,13 @@ script = { +@@ -713,6 +713,13 @@ script = { + installdir = sbin; }; - script = { ++script = { + name = grub-get-kernel-settings; + common = util/grub-get-kernel-settings.in; + mansection = 3; + installdir = sbin; +}; + -+script = { + script = { name = grub-set-default; common = util/grub-set-default.in; - mansection = 8; diff --git a/configure.ac b/configure.ac index 3c4b9a19b..40be70019 100644 --- a/configure.ac @@ -78,10 +78,11 @@ diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completi index 44bf135b9..5c4acd496 100644 --- a/util/bash-completion.d/grub-completion.bash.in +++ b/util/bash-completion.d/grub-completion.bash.in -@@ -265,6 +265,28 @@ unset __grub_sparc64_setup_program +@@ -264,6 +264,28 @@ have ${__grub_sparc64_setup_program} && \ + unset __grub_sparc64_setup_program - # ++# +# grub-get-kernel-settings +# +_grub_get_kernel_settings () { @@ -103,10 +104,9 @@ index 44bf135b9..5c4acd496 100644 +unset __grub_get_kernel_settings_program + + -+# + # # grub-install # - _grub_install () { diff --git a/util/grub-get-kernel-settings.3 b/util/grub-get-kernel-settings.3 new file mode 100644 index 000000000..ba33330e2 @@ -299,5 +299,5 @@ index 584ad1f46..c9bf223f2 100644 fi -- -2.13.5 +2.14.3 diff --git a/0148-Normalize-slashes-in-tftp-paths.patch b/0147-Normalize-slashes-in-tftp-paths.patch similarity index 92% rename from 0148-Normalize-slashes-in-tftp-paths.patch rename to 0147-Normalize-slashes-in-tftp-paths.patch index 19c4bef0..9d63df57 100644 --- a/0148-Normalize-slashes-in-tftp-paths.patch +++ b/0147-Normalize-slashes-in-tftp-paths.patch @@ -1,7 +1,7 @@ -From 56569789e125711b56b6a2100ee901660aa57668 Mon Sep 17 00:00:00 2001 +From 17fc1314e398d7ab2f3ae5a6d1114543653e8a91 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. +Subject: [PATCH 147/198] 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.5 +2.14.3 diff --git a/0149-Fix-malformed-tftp-packets.patch b/0148-Fix-malformed-tftp-packets.patch similarity index 90% rename from 0149-Fix-malformed-tftp-packets.patch rename to 0148-Fix-malformed-tftp-packets.patch index b21a08cc..eb70fadc 100644 --- a/0149-Fix-malformed-tftp-packets.patch +++ b/0148-Fix-malformed-tftp-packets.patch @@ -1,7 +1,7 @@ -From b62f9afe0f9b424237b68812d283aadc076109a1 Mon Sep 17 00:00:00 2001 +From 94758538586b3fb2602d41c5ccc0b58769a09933 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 +Subject: [PATCH 148/198] 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.5 +2.14.3 diff --git a/0150-Fix-race-in-EFI-validation.patch b/0149-Fix-race-in-EFI-validation.patch similarity index 95% rename from 0150-Fix-race-in-EFI-validation.patch rename to 0149-Fix-race-in-EFI-validation.patch index 4ae0d3ce..862108a2 100644 --- a/0150-Fix-race-in-EFI-validation.patch +++ b/0149-Fix-race-in-EFI-validation.patch @@ -1,7 +1,7 @@ -From 6e1e394239abeb37940cf7fcbadddec9980061aa Mon Sep 17 00:00:00 2001 +From bb2ea94b6dcccec798e8728c51d53786f2fe0d2c 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 +Subject: [PATCH 149/198] 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.5 +2.14.3 diff --git a/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0150-bz1374141-fix-incorrect-mask-for-ppc64.patch similarity index 94% rename from 0151-bz1374141-fix-incorrect-mask-for-ppc64.patch rename to 0150-bz1374141-fix-incorrect-mask-for-ppc64.patch index 4245e142..2dd5b560 100644 --- a/0151-bz1374141-fix-incorrect-mask-for-ppc64.patch +++ b/0150-bz1374141-fix-incorrect-mask-for-ppc64.patch @@ -1,7 +1,7 @@ -From 7e592062f2f97bb488bfe454e522c5cef9b2702f Mon Sep 17 00:00:00 2001 +From 09a5e37fe9bbe1b7cf7fe0a1211e06de555b0b54 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 +Subject: [PATCH 150/198] 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.5 +2.14.3 diff --git a/0152-Use-device-part-of-chainloader-target-if-present.patch b/0151-Use-device-part-of-chainloader-target-if-present.patch similarity index 88% rename from 0152-Use-device-part-of-chainloader-target-if-present.patch rename to 0151-Use-device-part-of-chainloader-target-if-present.patch index f8ebfe51..8b8cef86 100644 --- a/0152-Use-device-part-of-chainloader-target-if-present.patch +++ b/0151-Use-device-part-of-chainloader-target-if-present.patch @@ -1,7 +1,7 @@ -From 88db52c0af846192d0e8ae56cf9b5ef041feeb4a Mon Sep 17 00:00:00 2001 +From 79da61bd99b4cd4c817eeb022bd9f7d3e1d38258 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. +Subject: [PATCH 151/198] 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.5 +2.14.3 diff --git a/0153-Add-secureboot-support-on-efi-chainloader.patch b/0152-Add-secureboot-support-on-efi-chainloader.patch similarity index 99% rename from 0153-Add-secureboot-support-on-efi-chainloader.patch rename to 0152-Add-secureboot-support-on-efi-chainloader.patch index e58c4578..367b9610 100644 --- a/0153-Add-secureboot-support-on-efi-chainloader.patch +++ b/0152-Add-secureboot-support-on-efi-chainloader.patch @@ -1,7 +1,7 @@ -From ec51ea2e584230bfcac463b3355e76bb6cb0b89b Mon Sep 17 00:00:00 2001 +From cffa3c44d259122720382c8d2c08ff3e57b00de4 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 +Subject: [PATCH 152/198] 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.5 +2.14.3 diff --git a/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0153-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch similarity index 99% rename from 0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch rename to 0153-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch index 30c52b86..07cce9db 100644 --- a/0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +++ b/0153-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch @@ -1,7 +1,7 @@ -From 2a279098464fb9c45491c0cd44a35ff88c9ea644 Mon Sep 17 00:00:00 2001 +From a59984e248881a8c47d0c6035ce3dc062fa2113f 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 +Subject: [PATCH 153/198] 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.5 +2.14.3 diff --git a/0155-Make-grub_fatal-also-backtrace.patch b/0154-Make-grub_fatal-also-backtrace.patch similarity index 97% rename from 0155-Make-grub_fatal-also-backtrace.patch rename to 0154-Make-grub_fatal-also-backtrace.patch index 407aa56f..63a50c1a 100644 --- a/0155-Make-grub_fatal-also-backtrace.patch +++ b/0154-Make-grub_fatal-also-backtrace.patch @@ -1,7 +1,7 @@ -From 482aef96798dec0896902dace1b1be71b1a12455 Mon Sep 17 00:00:00 2001 +From 37e08ec93e219ece7547b3d4bdbd594eb691fe1a 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. +Subject: [PATCH 154/198] Make grub_fatal() also backtrace. --- grub-core/Makefile.core.def | 3 ++ @@ -171,5 +171,5 @@ index c3e03c727..c67273db3 100644 #include #include -- -2.13.5 +2.14.3 diff --git a/0156-Rework-linux-command.patch b/0155-Rework-linux-command.patch similarity index 96% rename from 0156-Rework-linux-command.patch rename to 0155-Rework-linux-command.patch index 164f0d2e..be04b0af 100644 --- a/0156-Rework-linux-command.patch +++ b/0155-Rework-linux-command.patch @@ -1,7 +1,7 @@ -From a6c2dfdf5ea765938849dc7f54a685de0ef21193 Mon Sep 17 00:00:00 2001 +From b7c180177336f1979385e02651ba41f7ee79fefc 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 +Subject: [PATCH 155/198] 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.5 +2.14.3 diff --git a/0157-Rework-linux16-command.patch b/0156-Rework-linux16-command.patch similarity index 96% rename from 0157-Rework-linux16-command.patch rename to 0156-Rework-linux16-command.patch index c7b0460a..6359ee5c 100644 --- a/0157-Rework-linux16-command.patch +++ b/0156-Rework-linux16-command.patch @@ -1,7 +1,7 @@ -From fe4560a74b419441cc337e6395fd42f988616b32 Mon Sep 17 00:00:00 2001 +From 60e7a1d746e39f10808a1cbd2c4928624026fbf1 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 +Subject: [PATCH 156/198] 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.5 +2.14.3 diff --git a/0158-Make-grub-editenv-build-again.patch b/0157-Make-grub-editenv-build-again.patch similarity index 87% rename from 0158-Make-grub-editenv-build-again.patch rename to 0157-Make-grub-editenv-build-again.patch index e7206ca7..0e7cbee0 100644 --- a/0158-Make-grub-editenv-build-again.patch +++ b/0157-Make-grub-editenv-build-again.patch @@ -1,7 +1,7 @@ -From a06e773669c63d8d32f54e17b31a7af66320a708 Mon Sep 17 00:00:00 2001 +From 587b65a7c706440b5e8592922d36173cb77e6b6e 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. +Subject: [PATCH 157/198] 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.5 +2.14.3 diff --git a/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0158-Fix-up-some-man-pages-rpmdiff-noticed.patch similarity index 96% rename from 0159-Fix-up-some-man-pages-rpmdiff-noticed.patch rename to 0158-Fix-up-some-man-pages-rpmdiff-noticed.patch index 58a29a69..2a4f71a7 100644 --- a/0159-Fix-up-some-man-pages-rpmdiff-noticed.patch +++ b/0158-Fix-up-some-man-pages-rpmdiff-noticed.patch @@ -1,7 +1,7 @@ -From 37e1a445f41ebf79242310e5f9a39573118aa21b Mon Sep 17 00:00:00 2001 +From c3d456a824ccf8c728cae4f50254239bafaf50a1 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. +Subject: [PATCH 158/198] 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.5 +2.14.3 diff --git a/0160-Re-work-some-intricacies-of-PE-loading.patch b/0159-Re-work-some-intricacies-of-PE-loading.patch similarity index 98% rename from 0160-Re-work-some-intricacies-of-PE-loading.patch rename to 0159-Re-work-some-intricacies-of-PE-loading.patch index c1ae027f..a4c37139 100644 --- a/0160-Re-work-some-intricacies-of-PE-loading.patch +++ b/0159-Re-work-some-intricacies-of-PE-loading.patch @@ -1,7 +1,7 @@ -From 47e691b7f6e3035ff6658ea1c414661ee53eab02 Mon Sep 17 00:00:00 2001 +From 982d11a87ce05b6e4305b03a29945843311007d0 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. +Subject: [PATCH 159/198] 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.5 +2.14.3 diff --git a/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch b/0160-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch similarity index 97% rename from 0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch rename to 0160-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch index c39a2489..89d404b9 100644 --- a/0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch +++ b/0160-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch @@ -1,7 +1,7 @@ -From 654a7f0c5b1f89d8b77524faf5cda08b56d493c8 Mon Sep 17 00:00:00 2001 +From 91943cb164e03979132310784ad802ea9dc3bbd9 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 +Subject: [PATCH 160/198] 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 33345d375..ad39a3015 100644 +index 03ff83563..34f34e65a 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c -@@ -247,6 +247,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), +@@ -248,6 +248,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 33345d375..ad39a3015 100644 grub_dl_ref (my_mod); -@@ -291,7 +292,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), +@@ -292,7 +293,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), grub_dprintf ("linux", "kernel @ %p\n", kernel_addr); @@ -190,10 +190,11 @@ index 4b77a7d5a..b977c7b55 100644 context.reloc_dir->size); reloc_base = image_address (buffer_aligned, context.image_size, context.reloc_dir->rva); -@@ -797,9 +802,55 @@ grub_secureboot_chainloader_unload (void) +@@ -796,10 +801,56 @@ grub_secureboot_chainloader_unload (void) + return GRUB_ERR_NONE; } - static grub_err_t ++static grub_err_t +grub_load_and_start_image(void *boot_image) +{ + grub_efi_boot_services_t *b; @@ -233,7 +234,7 @@ index 4b77a7d5a..b977c7b55 100644 + return 0; +} + -+static grub_err_t + static grub_err_t grub_secureboot_chainloader_boot (void) { - handle_image ((void *)address, fsize); @@ -409,5 +410,5 @@ index d9ede3677..0033d9305 100644 grub_err_t EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset, -- -2.13.5 +2.14.3 diff --git a/0162-linuxefi-fix-double-free-on-verification-failure.patch b/0161-linuxefi-fix-double-free-on-verification-failure.patch similarity index 82% rename from 0162-linuxefi-fix-double-free-on-verification-failure.patch rename to 0161-linuxefi-fix-double-free-on-verification-failure.patch index 41b7912f..c3ec3b29 100644 --- a/0162-linuxefi-fix-double-free-on-verification-failure.patch +++ b/0161-linuxefi-fix-double-free-on-verification-failure.patch @@ -1,7 +1,7 @@ -From 45e38084c55932c6039dfa1cb464ea12fd03488f Mon Sep 17 00:00:00 2001 +From 0e8eb89517d9621b2595f7d2b152f711309600ee 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. +Subject: [PATCH 161/198] linuxefi: fix double free on verification failure. Signed-off-by: Peter Jones --- @@ -21,5 +21,5 @@ index 82f75b7f3..010bf982d 100644 } -- -2.13.5 +2.14.3 diff --git a/0163-fix-machine-type-test-in-30_os-prober.in.patch b/0162-fix-machine-type-test-in-30_os-prober.in.patch similarity index 80% rename from 0163-fix-machine-type-test-in-30_os-prober.in.patch rename to 0162-fix-machine-type-test-in-30_os-prober.in.patch index 0fc8d921..1ae6f173 100644 --- a/0163-fix-machine-type-test-in-30_os-prober.in.patch +++ b/0162-fix-machine-type-test-in-30_os-prober.in.patch @@ -1,7 +1,7 @@ -From 939ff26ad26a6d3d17eb4d02a6c4cd263a3b107f Mon Sep 17 00:00:00 2001 +From 5661d4a67e4b13da0dc375946f07a56bb577e0f4 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 +Subject: [PATCH 162/198] 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.5 +2.14.3 diff --git a/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch b/0163-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch similarity index 90% rename from 0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch rename to 0163-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch index 3fb9e4d5..a96effde 100644 --- a/0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch +++ b/0163-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch @@ -1,7 +1,7 @@ -From 64b1750a0d12280b7ac2612858680a99a673e24b Mon Sep 17 00:00:00 2001 +From a8b65c0ac1e2ddd001e8b837c798f1b135f2a522 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 +Subject: [PATCH 163/198] 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.5 +2.14.3 diff --git a/0165-efi-chainloader-truncate-overlong-relocation-section.patch b/0164-efi-chainloader-truncate-overlong-relocation-section.patch similarity index 96% rename from 0165-efi-chainloader-truncate-overlong-relocation-section.patch rename to 0164-efi-chainloader-truncate-overlong-relocation-section.patch index d0193931..39de070b 100644 --- a/0165-efi-chainloader-truncate-overlong-relocation-section.patch +++ b/0164-efi-chainloader-truncate-overlong-relocation-section.patch @@ -1,7 +1,7 @@ -From c073cea489549ce6b2398a14c407ff83f0a2962c Mon Sep 17 00:00:00 2001 +From a503341b2bb28a86d940305fb91e3c3827e15f0f 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 +Subject: [PATCH 164/198] 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.5 +2.14.3 diff --git a/0166-linuxefi-minor-cleanups.patch b/0165-linuxefi-minor-cleanups.patch similarity index 96% rename from 0166-linuxefi-minor-cleanups.patch rename to 0165-linuxefi-minor-cleanups.patch index 954754ec..6795bbb1 100644 --- a/0166-linuxefi-minor-cleanups.patch +++ b/0165-linuxefi-minor-cleanups.patch @@ -1,7 +1,7 @@ -From 93df822a82a37726833b977c4409141e1d8af3c9 Mon Sep 17 00:00:00 2001 +From 2d1e45c97ab97cc924769095521664192e8196ed 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 +Subject: [PATCH 165/198] linuxefi: minor cleanups Signed-off-by: Peter Jones --- @@ -85,5 +85,5 @@ index 010bf982d..8b5a817b9 100644 return grub_errno; } -- -2.13.5 +2.14.3 diff --git a/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/0166-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch similarity index 98% rename from 0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch rename to 0166-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch index 32d4cfa5..143c6a37 100644 --- a/0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch +++ b/0166-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch @@ -1,7 +1,7 @@ -From c78c850158eedb26c82b4dabccb8a4b1f7daf458 Mon Sep 17 00:00:00 2001 +From 7f34f8d670e4dccf341de5acf388cfa79c7361fd 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. +Subject: [PATCH 166/198] 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.5 +2.14.3 diff --git a/0168-Fix-up-linux-params-usage.patch b/0167-Fix-up-linux-params-usage.patch similarity index 91% rename from 0168-Fix-up-linux-params-usage.patch rename to 0167-Fix-up-linux-params-usage.patch index 8bb6ac58..1244c531 100644 --- a/0168-Fix-up-linux-params-usage.patch +++ b/0167-Fix-up-linux-params-usage.patch @@ -1,7 +1,7 @@ -From 54fec7b1d6e7240e3ab5740abe7b14ebc6cad047 Mon Sep 17 00:00:00 2001 +From 45a648d1dc7a63cbff180848ca6ab6e26365de11 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... +Subject: [PATCH 167/198] 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.5 +2.14.3 diff --git a/0169-Make-exit-take-a-return-code.patch b/0168-Make-exit-take-a-return-code.patch similarity index 85% rename from 0169-Make-exit-take-a-return-code.patch rename to 0168-Make-exit-take-a-return-code.patch index f6ddea79..c0941473 100644 --- a/0169-Make-exit-take-a-return-code.patch +++ b/0168-Make-exit-take-a-return-code.patch @@ -1,7 +1,7 @@ -From c281b1fc8f2533f7655c83d43d772092b9d74f7b Mon Sep 17 00:00:00 2001 +From 71af399a49085b805028f1faadda16b503ce46a0 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. +Subject: [PATCH 168/198] 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 @@ -18,19 +18,19 @@ diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c index 55ea5a11c..7e47ec812 100644 --- a/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c -@@ -73,6 +73,12 @@ grub_exit (int retval __attribute__((unused))) +@@ -72,6 +72,12 @@ grub_exit (int retval __attribute__((unused))) + grub_reboot (); } - void ++void +grub_exit (int retval __attribute__((unused))) +{ + grub_reboot (); +} + -+void + void grub_machine_init (void) { - } diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c index 5ce89a40c..04371ac49 100644 --- a/grub-core/kern/misc.c @@ -52,5 +52,5 @@ index 5ce89a40c..04371ac49 100644 grub_fatal (const char *fmt, ...) { -- -2.13.5 +2.14.3 diff --git a/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch b/0169-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch similarity index 88% rename from 0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch rename to 0169-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch index 8a925870..7c9568bb 100644 --- a/0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch +++ b/0169-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch @@ -1,7 +1,7 @@ -From b9e2b2aa41a486c550c5bb9849f4e7587d1493e4 Mon Sep 17 00:00:00 2001 +From 6246598c06a27ca40a6101e39fb788d1a02976d7 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 +Subject: [PATCH 169/198] 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 ad39a3015..59ff9cc05 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) @@ -41,5 +41,5 @@ index ad39a3015..59ff9cc05 100644 if (node < 1) goto failure; -- -2.13.5 +2.14.3 diff --git a/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch b/0170-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch similarity index 90% rename from 0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch rename to 0170-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch index 28929070..eda242c7 100644 --- a/0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch +++ b/0170-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch @@ -1,7 +1,7 @@ -From 56b10ac84eb7f4e260ec6f6efecc35e9fabc6b95 Mon Sep 17 00:00:00 2001 +From c293c4a99ef27e210014b4c87f0330df40571a4c 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 +Subject: [PATCH 170/198] 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.5 +2.14.3 diff --git a/0172-Make-our-info-pages-say-grub2-where-appropriate.patch b/0171-Make-our-info-pages-say-grub2-where-appropriate.patch similarity index 99% rename from 0172-Make-our-info-pages-say-grub2-where-appropriate.patch rename to 0171-Make-our-info-pages-say-grub2-where-appropriate.patch index dff116bd..887e7601 100644 --- a/0172-Make-our-info-pages-say-grub2-where-appropriate.patch +++ b/0171-Make-our-info-pages-say-grub2-where-appropriate.patch @@ -1,7 +1,7 @@ -From 497e06f02e9576c9cbfd560e8fb25567aaff6e4e Mon Sep 17 00:00:00 2001 +From 12e056f068df6a17ddee61959a3d5da409366a91 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. +Subject: [PATCH 171/198] 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.5 +2.14.3 diff --git a/0173-print-more-debug-info-in-our-module-loader.patch b/0172-print-more-debug-info-in-our-module-loader.patch similarity index 89% rename from 0173-print-more-debug-info-in-our-module-loader.patch rename to 0172-print-more-debug-info-in-our-module-loader.patch index ed768010..0b0c1fbe 100644 --- a/0173-print-more-debug-info-in-our-module-loader.patch +++ b/0172-print-more-debug-info-in-our-module-loader.patch @@ -1,7 +1,7 @@ -From 409a1fe49689976f464e3db82cb48c6488b78864 Mon Sep 17 00:00:00 2001 +From 10d3df4413dde0edf41ba1adeba50ef62577d967 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. +Subject: [PATCH 172/198] print more debug info in our module loader. Signed-off-by: Peter Jones --- @@ -40,5 +40,5 @@ index 684ca93f8..1f3ac5e1d 100644 } -- -2.13.5 +2.14.3 diff --git a/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0173-macos-just-build-chainloader-entries-don-t-try-any-x.patch similarity index 97% rename from 0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch rename to 0173-macos-just-build-chainloader-entries-don-t-try-any-x.patch index f5fde3d2..81f07964 100644 --- a/0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch +++ b/0173-macos-just-build-chainloader-entries-don-t-try-any-x.patch @@ -1,7 +1,7 @@ -From ebfc7bb290eb5be7919107d93ee6d03f3030d599 Mon Sep 17 00:00:00 2001 +From f92f6c050e5c1bfc3146dd674dc37ac12cbb1c76 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 +Subject: [PATCH 173/198] 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.5 +2.14.3 diff --git a/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0174-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch similarity index 98% rename from 0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch rename to 0174-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch index 404cec8d..c825be9f 100644 --- a/0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch +++ b/0174-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch @@ -1,7 +1,7 @@ -From 6dc076ff0e9487566885473b9b65f56ef3e02a1b Mon Sep 17 00:00:00 2001 +From 1a7e8fd6eaff05a32889e48e9fae6f9c80219a04 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 +Subject: [PATCH 174/198] 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. @@ -166,10 +166,11 @@ index 4849c1ceb..38facf3cb 100644 return data; } -@@ -1233,6 +1318,91 @@ get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key, +@@ -1232,6 +1317,91 @@ get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key, + return GRUB_ERR_NONE; } - static grub_err_t ++static grub_err_t +find_pathname(struct grub_btrfs_data *data, grub_uint64_t objectid, + grub_uint64_t fs_root, const char *name, char **pathname) +{ @@ -254,10 +255,9 @@ index 4849c1ceb..38facf3cb 100644 + return 0; +} + -+static grub_err_t + static grub_err_t find_path (struct grub_btrfs_data *data, const char *path, struct grub_btrfs_key *key, - grub_uint64_t *tree, grub_uint8_t *type) @@ -1250,14 +1420,26 @@ find_path (struct grub_btrfs_data *data, char *origpath = NULL; unsigned symlinks_max = 32; @@ -697,5 +697,5 @@ index 9d93fb6c1..234ad9767 100644 }; -- -2.13.5 +2.14.3 diff --git a/0176-export-btrfs_subvol-and-btrfs_subvolid.patch b/0175-export-btrfs_subvol-and-btrfs_subvolid.patch similarity index 85% rename from 0176-export-btrfs_subvol-and-btrfs_subvolid.patch rename to 0175-export-btrfs_subvol-and-btrfs_subvolid.patch index c7a481ec..6e0edd89 100644 --- a/0176-export-btrfs_subvol-and-btrfs_subvolid.patch +++ b/0175-export-btrfs_subvol-and-btrfs_subvolid.patch @@ -1,7 +1,7 @@ -From 28b70d9386749173ecfd3b153e6a8be36238405f Mon Sep 17 00:00:00 2001 +From e32ed89b520f2cbe6303ba78242cb1c645ab8cb6 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 +Subject: [PATCH 175/198] 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.5 +2.14.3 diff --git a/0177-grub2-btrfs-03-follow_default.patch b/0176-grub2-btrfs-03-follow_default.patch similarity index 97% rename from 0177-grub2-btrfs-03-follow_default.patch rename to 0176-grub2-btrfs-03-follow_default.patch index 5676ffc7..dc1e498f 100644 --- a/0177-grub2-btrfs-03-follow_default.patch +++ b/0176-grub2-btrfs-03-follow_default.patch @@ -1,7 +1,7 @@ -From 33d2bbf28d14971e531276fce042dadd4239de4e Mon Sep 17 00:00:00 2001 +From 6c59dbc93e8757b6b79d93e3e3cd97a506778682 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 +Subject: [PATCH 176/198] 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.5 +2.14.3 diff --git a/0178-grub2-btrfs-04-grub2-install.patch b/0177-grub2-btrfs-04-grub2-install.patch similarity index 97% rename from 0178-grub2-btrfs-04-grub2-install.patch rename to 0177-grub2-btrfs-04-grub2-install.patch index 3c899fd1..f16a4b14 100644 --- a/0178-grub2-btrfs-04-grub2-install.patch +++ b/0177-grub2-btrfs-04-grub2-install.patch @@ -1,7 +1,7 @@ -From ddf05a259df3e5c43ea0714abf227bdb82dd34a5 Mon Sep 17 00:00:00 2001 +From fab60e6bf20b1759145eab3056846dfba3610a62 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 +Subject: [PATCH 177/198] 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.5 +2.14.3 diff --git a/0179-grub2-btrfs-05-grub2-mkconfig.patch b/0178-grub2-btrfs-05-grub2-mkconfig.patch similarity index 96% rename from 0179-grub2-btrfs-05-grub2-mkconfig.patch rename to 0178-grub2-btrfs-05-grub2-mkconfig.patch index 9a50f20c..46a9ce24 100644 --- a/0179-grub2-btrfs-05-grub2-mkconfig.patch +++ b/0178-grub2-btrfs-05-grub2-mkconfig.patch @@ -1,7 +1,7 @@ -From 8cc6f3420b5a42871cfc2bc7bdfed60b34eac4a8 Mon Sep 17 00:00:00 2001 +From 54f7769a22e9f82a9c894746e61d86f33d226218 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 +Subject: [PATCH 178/198] 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.5 +2.14.3 diff --git a/0180-grub2-btrfs-06-subvol-mount.patch b/0179-grub2-btrfs-06-subvol-mount.patch similarity index 99% rename from 0180-grub2-btrfs-06-subvol-mount.patch rename to 0179-grub2-btrfs-06-subvol-mount.patch index f949871f..ba6a364f 100644 --- a/0180-grub2-btrfs-06-subvol-mount.patch +++ b/0179-grub2-btrfs-06-subvol-mount.patch @@ -1,7 +1,7 @@ -From 67ac693c0da060226ab012074ee33156e7ebf338 Mon Sep 17 00:00:00 2001 +From a27ef49601c7c4c58dc23663df1e0c1c960481af 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 +Subject: [PATCH 179/198] 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.5 +2.14.3 diff --git a/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch b/0180-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch similarity index 86% rename from 0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch rename to 0180-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch index 563f8158..6d440578 100644 --- a/0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch +++ b/0180-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch @@ -1,7 +1,7 @@ -From 36e3d3d7c8bc32cae3e3f86d3b89e0db5e9a330c Mon Sep 17 00:00:00 2001 +From 24ffe7f751ba5ca1fcaef235f104c385091af25f 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. +Subject: [PATCH 180/198] 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.5 +2.14.3 diff --git a/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0181-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch similarity index 87% rename from 0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch rename to 0181-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch index 196bdc0a..03ae1593 100644 --- a/0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch +++ b/0181-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch @@ -1,7 +1,7 @@ -From f26ee91138d132c84068bc6afb362eabc5d0af13 Mon Sep 17 00:00:00 2001 +From 7cfb7a4b2d8c90ef6aa17c32b059eb2c5ed45b3d 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 +Subject: [PATCH 181/198] Fallback to old subvol name scheme to support old snapshot config Ref: bsc#953538 @@ -13,10 +13,11 @@ diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c index d111147e8..a5c000805 100644 --- a/grub-core/fs/btrfs.c +++ b/grub-core/fs/btrfs.c -@@ -925,10 +925,40 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path) +@@ -924,11 +924,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path) + return GRUB_ERR_NONE; } - static grub_err_t ++static grub_err_t +lookup_root_by_name_fallback(struct grub_btrfs_data *data, const char *path) +{ + grub_err_t err; @@ -35,7 +36,7 @@ index d111147e8..a5c000805 100644 + return GRUB_ERR_NONE; +} + -+static grub_err_t + static grub_err_t btrfs_handle_subvol(struct grub_btrfs_data *data __attribute__ ((unused))) { if (btrfs_default_subvol) @@ -56,5 +57,5 @@ index d111147e8..a5c000805 100644 if (btrfs_default_subvolid) return lookup_root_by_id(data, btrfs_default_subvolid); -- -2.13.5 +2.14.3 diff --git a/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0182-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch similarity index 98% rename from 0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch rename to 0182-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch index c4b5a576..baa00d4b 100644 --- a/0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch +++ b/0182-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch @@ -1,7 +1,7 @@ -From 2fd2c751861ecc2350d3bcb81228b3e663778dd1 Mon Sep 17 00:00:00 2001 +From c7fb2b491daae42caa1395d724b956f6f2f892af 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 +Subject: [PATCH 182/198] 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.5 +2.14.3 diff --git a/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0183-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch similarity index 94% rename from 0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch rename to 0183-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch index a57c2c32..68208523 100644 --- a/0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch +++ b/0183-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch @@ -1,7 +1,7 @@ -From ab2832aae2c1aa27d95a18c9a15ea6e5b630cca9 Mon Sep 17 00:00:00 2001 +From ac370b7bd9060c8e2aaaf91c2099ca89b8b65f14 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() +Subject: [PATCH 183/198] 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.5 +2.14.3 diff --git a/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0184-Use-grub_efi_.-memory-helpers-where-reasonable.patch similarity index 96% rename from 0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch rename to 0184-Use-grub_efi_.-memory-helpers-where-reasonable.patch index 9c44fe22..f25a3582 100644 --- a/0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch +++ b/0184-Use-grub_efi_.-memory-helpers-where-reasonable.patch @@ -1,7 +1,7 @@ -From 38441515e97a0ae8bf668a747b40cd839821887a Mon Sep 17 00:00:00 2001 +From 81550ebac8fea549c1bbc149688be17ce195bc08 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. +Subject: [PATCH 184/198] 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.5 +2.14.3 diff --git a/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0185-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch similarity index 92% rename from 0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch rename to 0185-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch index feff5eac..ba5df435 100644 --- a/0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch +++ b/0185-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch @@ -1,7 +1,7 @@ -From 03c01ad6ac50624a9cb9b061dbb9b46e590c6b1e Mon Sep 17 00:00:00 2001 +From ab3ef81acf4ee5cdf7a1e21db794cdb2e71c49a5 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. +Subject: [PATCH 185/198] 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.5 +2.14.3 diff --git a/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch b/0186-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch similarity index 90% rename from 0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch rename to 0186-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch index 0a1bc5f8..a781cdf4 100644 --- a/0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch +++ b/0186-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch @@ -1,7 +1,7 @@ -From 4bb62c765c1456e33181b704a01008d8df42817f Mon Sep 17 00:00:00 2001 +From 8bda2ce6ce3a91a0d84b0489679522add72780ef 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 +Subject: [PATCH 186/198] 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.5 +2.14.3 diff --git a/0188-don-t-ignore-const.patch b/0187-don-t-ignore-const.patch similarity index 82% rename from 0188-don-t-ignore-const.patch rename to 0187-don-t-ignore-const.patch index 60c67e16..070f8e93 100644 --- a/0188-don-t-ignore-const.patch +++ b/0187-don-t-ignore-const.patch @@ -1,7 +1,7 @@ -From a87adc91140a81b55728d0519bb14ace5ed7d3e3 Mon Sep 17 00:00:00 2001 +From 47309830cd0c84bbb565004bd06d5aef3c9c0f57 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 +Subject: [PATCH 187/198] don't ignore const --- grub-core/net/tftp.c | 2 +- @@ -21,5 +21,5 @@ index dcd824943..f90071353 100644 while (*src != '\0') { -- -2.13.5 +2.14.3 diff --git a/0189-don-t-use-int-for-efi-status.patch b/0188-don-t-use-int-for-efi-status.patch similarity index 82% rename from 0189-don-t-use-int-for-efi-status.patch rename to 0188-don-t-use-int-for-efi-status.patch index 5cd9d759..4a3514ef 100644 --- a/0189-don-t-use-int-for-efi-status.patch +++ b/0188-don-t-use-int-for-efi-status.patch @@ -1,7 +1,7 @@ -From 5f6a3933dfc6e3fff9aef089eea365f40e3c830c Mon Sep 17 00:00:00 2001 +From 1e16b840df6b6d1cfb3429fbac8440b507ff07a6 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 +Subject: [PATCH 188/198] 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.5 +2.14.3 diff --git a/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0189-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch similarity index 86% rename from 0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch rename to 0189-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch index 5d155b27..8e6aece1 100644 --- a/0190-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +++ b/0189-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch @@ -1,7 +1,7 @@ -From 25ef0f18c77e5a5080f04e34a84aa801f21fb893 Mon Sep 17 00:00:00 2001 +From 9e5389a4074b38ef9d27177b40092fca515b2d2b 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. +Subject: [PATCH 189/198] 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.5 +2.14.3 diff --git a/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch b/0190-Clean-up-some-errors-in-the-linuxefi-loader.patch similarity index 94% rename from 0191-Clean-up-some-errors-in-the-linuxefi-loader.patch rename to 0190-Clean-up-some-errors-in-the-linuxefi-loader.patch index 8139d8a2..6a80da74 100644 --- a/0191-Clean-up-some-errors-in-the-linuxefi-loader.patch +++ b/0190-Clean-up-some-errors-in-the-linuxefi-loader.patch @@ -1,7 +1,7 @@ -From 813a5703360d35260eae8f3916a66f1c1087320f Mon Sep 17 00:00:00 2001 +From 1351ba7ec388e9449b209c76fad61e6b9792044e 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 +Subject: [PATCH 190/198] 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.5 +2.14.3 diff --git a/0192-editenv-handle-relative-symlinks.patch b/0191-editenv-handle-relative-symlinks.patch similarity index 90% rename from 0192-editenv-handle-relative-symlinks.patch rename to 0191-editenv-handle-relative-symlinks.patch index 4c72fe71..fefaa390 100644 --- a/0192-editenv-handle-relative-symlinks.patch +++ b/0191-editenv-handle-relative-symlinks.patch @@ -1,7 +1,7 @@ -From ed676cb54536f5ed2948babe61afff197de5083f Mon Sep 17 00:00:00 2001 +From 9141af91bed0d27afa0f87ed6ac5965bed6f791a 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 +Subject: [PATCH 191/198] 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.5 +2.14.3 diff --git a/0193-Make-libgrub.pp-depend-on-config-util.h.patch b/0192-Make-libgrub.pp-depend-on-config-util.h.patch similarity index 97% rename from 0193-Make-libgrub.pp-depend-on-config-util.h.patch rename to 0192-Make-libgrub.pp-depend-on-config-util.h.patch index 651971b5..eb789c12 100644 --- a/0193-Make-libgrub.pp-depend-on-config-util.h.patch +++ b/0192-Make-libgrub.pp-depend-on-config-util.h.patch @@ -1,7 +1,7 @@ -From e4b316bd39c8a93c146f0d4c4c570170084a7404 Mon Sep 17 00:00:00 2001 +From 210eb8d06d2b1db324ef0e158000c4590035fea3 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 +Subject: [PATCH 192/198] Make libgrub.pp depend on config-util.h If you build with "make -j48" a lot, sometimes you see: @@ -44,5 +44,5 @@ index 7795baeb6..c7b0e6a9c 100644 -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1) CLEANFILES += libgrub.pp -- -2.13.5 +2.14.3 diff --git a/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0193-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch similarity index 89% rename from 0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch rename to 0193-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch index 843ecb56..32320702 100644 --- a/0194-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch +++ b/0193-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch @@ -1,7 +1,7 @@ -From 5ca7869ea68cc03697596c106949f5636daef8d8 Mon Sep 17 00:00:00 2001 +From d47f8b7d1d9bf708cfd989d20cc0fd87ba72c058 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 +Subject: [PATCH 193/198] 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 @@ -40,5 +40,5 @@ index cd84a72b9..48f2abc3e 100644 { free (d); -- -2.13.5 +2.14.3 diff --git a/0195-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch b/0194-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch similarity index 93% rename from 0195-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch rename to 0194-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch index 159ec4e8..5fd55b43 100644 --- a/0195-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch +++ b/0194-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch @@ -1,7 +1,7 @@ -From f107e84be87038bf5bf8795c0f2005e11f35c145 Mon Sep 17 00:00:00 2001 +From 40e6d913ad65d357a13205d3392f613ac52508c2 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Mon, 28 Aug 2017 13:51:14 -0400 -Subject: [PATCH 195/197] Fix util/grub.d/20_linux_xen.in: Add xen_boot command +Subject: [PATCH 194/198] Fix util/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64 Commit d33045ce7ffcb7c1e4a60c14d5ca64b36e3c5abe introduced @@ -58,5 +58,5 @@ index 462f8e1f8..9b1bd7169 100644 while [ "x$list" != "x" ] ; do linux=`version_find_latest $list` -- -2.14.2 +2.14.3 diff --git a/0196-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch b/0195-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch similarity index 87% rename from 0196-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch rename to 0195-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch index 4716cb9d..d5ac4420 100644 --- a/0196-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch +++ b/0195-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch @@ -1,7 +1,7 @@ -From 51950b35f078393fd60e0940d1764876da0def7f Mon Sep 17 00:00:00 2001 +From ac0fa764dfdd5e45ccda6f91c6e136e84e284c4a Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Mon, 28 Aug 2017 13:59:12 -0400 -Subject: [PATCH 196/197] Use grub-file to figure out whether multiboot2 should +Subject: [PATCH 195/198] Use grub-file to figure out whether multiboot2 should be used for Xen.gz The multiboot2 is much more preferable than multiboot. Especiall @@ -29,5 +29,5 @@ index 9b1bd7169..fae1ffe94 100644 while [ "x$list" != "x" ] ; do linux=`version_find_latest $list` -- -2.14.2 +2.14.3 diff --git a/0197-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/0196-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch similarity index 88% rename from 0197-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch rename to 0196-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch index 4d888753..8a63c9c6 100644 --- a/0197-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch +++ b/0196-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch @@ -1,7 +1,7 @@ -From 5eb993630ba5349eef2bcd22680219cdb851cc73 Mon Sep 17 00:00:00 2001 +From b0260d2f586390b19294f5b98194c9e78a33ccad Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 19 Oct 2017 11:29:11 -0400 -Subject: [PATCH 197/197] 20_linux_xen: load xen or multiboot{,2} modules as +Subject: [PATCH 196/198] 20_linux_xen: load xen or multiboot{,2} modules as needed. Signed-off-by: Peter Jones @@ -31,5 +31,5 @@ index fae1ffe94..fc53bd542 100644 EOF fi -- -2.14.2 +2.14.3 diff --git a/0197-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch b/0197-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch new file mode 100644 index 00000000..06448a56 --- /dev/null +++ b/0197-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch @@ -0,0 +1,32 @@ +From 5b1b2603175923e8d1eac701308d220ac39ad8c7 Mon Sep 17 00:00:00 2001 +From: "David E. Box" +Date: Fri, 15 Sep 2017 15:37:05 -0700 +Subject: [PATCH 197/198] tsc: Change default tsc calibration method to pmtimer + on EFI systems + +On efi systems, make pmtimer based tsc calibration the default over the +pit. This prevents Grub from hanging on Intel SoC systems that power gate +the pit. + +Signed-off-by: David E. Box +Reviewed-by: Daniel Kiper +--- + grub-core/kern/i386/tsc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c +index 2e85289d8..f266eb131 100644 +--- a/grub-core/kern/i386/tsc.c ++++ b/grub-core/kern/i386/tsc.c +@@ -68,7 +68,7 @@ grub_tsc_init (void) + #ifdef GRUB_MACHINE_XEN + (void) (grub_tsc_calibrate_from_xen () || calibrate_tsc_hardcode()); + #elif defined (GRUB_MACHINE_EFI) +- (void) (grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode()); ++ (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode()); + #elif defined (GRUB_MACHINE_COREBOOT) + (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || calibrate_tsc_hardcode()); + #else +-- +2.14.3 + diff --git a/0198-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch b/0198-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch new file mode 100644 index 00000000..dda57272 --- /dev/null +++ b/0198-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch @@ -0,0 +1,96 @@ +From 8df97294d653219ad03ac031c01b723ed7f6556d Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Tue, 7 Nov 2017 17:12:17 -0500 +Subject: [PATCH 198/198] Make pmtimer tsc calibration not take 51 seconds to + fail. + +On my laptop running at 2.4GHz, if I run a VM where tsc calibration +using pmtimer will fail presuming a broken pmtimer, it takes ~51 seconds +to do so (as measured with the stopwatch on my phone), with a tsc delta +of 0x1cd1c85300, or around 125 billion cycles. + +If instead of trying to wait for 5-200ms to show up on the pmtimer, we try +to wait for 5-200us, it decides it's broken in ~0x7998f9e TSCs, aka ~2 +million cycles, or more or less instantly. + +Additionally, this reading the pmtimer was returning 0xffffffff anyway, +and that's obviously an invalid return. I've added a check for that and +0 so we don't bother waiting for the test if what we're seeing is dead +pins with no response at all. + +Signed-off-by: Peter Jones +--- + grub-core/kern/i386/tsc_pmtimer.c | 43 ++++++++++++++++++++++++++++++--------- + 1 file changed, 33 insertions(+), 10 deletions(-) + +diff --git a/grub-core/kern/i386/tsc_pmtimer.c b/grub-core/kern/i386/tsc_pmtimer.c +index c9c361699..609402b83 100644 +--- a/grub-core/kern/i386/tsc_pmtimer.c ++++ b/grub-core/kern/i386/tsc_pmtimer.c +@@ -38,30 +38,53 @@ grub_pmtimer_wait_count_tsc (grub_port_t pmtimer, + grub_uint64_t start_tsc; + grub_uint64_t end_tsc; + int num_iter = 0; ++ int bad_reads = 0; + +- start = grub_inl (pmtimer) & 0xffffff; ++ start = grub_inl (pmtimer) & 0x3fff; + last = start; + end = start + num_pm_ticks; + start_tsc = grub_get_tsc (); + while (1) + { +- cur = grub_inl (pmtimer) & 0xffffff; ++ cur = grub_inl (pmtimer); ++ ++ /* If we get 10 reads in a row that are obviously dead pins, there's no ++ reason to do this thousands of times. ++ */ ++ if (cur == 0xffffffff || cur == 0) ++ { ++ bad_reads++; ++ grub_dprintf ("pmtimer", "cur: 0x%08x bad_reads: %d\n", cur, bad_reads); ++ ++ if (bad_reads == 10) ++ return 0; ++ } ++ else if (bad_reads) ++ bad_reads = 0; ++ ++ cur &= 0x3fff; ++ + if (cur < last) +- cur |= 0x1000000; ++ cur |= 0x4000; + num_iter++; + if (cur >= end) + { + end_tsc = grub_get_tsc (); ++ grub_dprintf ("pmtimer", "tsc delta is 0x%016lx\n", ++ end_tsc - start_tsc); + return end_tsc - start_tsc; + } +- /* Check for broken PM timer. +- 50000000 TSCs is between 5 ms (10GHz) and 200 ms (250 MHz) +- if after this time we still don't have 1 ms on pmtimer, then +- pmtimer is broken. ++ /* Check for broken PM timer. 5000 TSCs is between 5us (10GHz) and ++ 200us (250 MHz). If after this time we still don't have 1us on ++ pmtimer, then pmtimer is broken. + */ +- if ((num_iter & 0xffffff) == 0 && grub_get_tsc () - start_tsc > 5000000) { +- return 0; +- } ++ end_tsc = grub_get_tsc(); ++ if ((num_iter & 0x3fff) == 0 && end_tsc - start_tsc > 5000) ++ { ++ grub_dprintf ("pmtimer", "tsc delta is 0x%016lx\n", ++ end_tsc - start_tsc); ++ return 0; ++ } + } + } + +-- +2.14.3 + diff --git a/grub.patches b/grub.patches index 1bba5695..cae311ae 100644 --- a/grub.patches +++ b/grub.patches @@ -128,70 +128,71 @@ Patch0127: 0127-Handle-rssd-storage-devices.patch Patch0128: 0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch Patch0129: 0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch Patch0130: 0130-Add-friendly-grub2-password-config-tool-985962.patch -Patch0131: 0131-calibrate_tsc-use-the-Stall-EFI-boot-service-on-GRUB.patch -Patch0132: 0132-Make-grub2-mkconfig-construct-titles-that-look-like-.patch -Patch0133: 0133-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch -Patch0134: 0134-tcp-add-window-scaling-support.patch -Patch0135: 0135-efinet-retransmit-if-our-device-is-busy.patch -Patch0136: 0136-Be-more-aggro-about-actually-using-the-configured-ne.patch -Patch0137: 0137-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch -Patch0138: 0138-Fix-security-issue-when-reading-username-and-passwor.patch -Patch0139: 0139-Warn-if-grub-password-will-not-be-read-1290803.patch -Patch0140: 0140-Clean-up-grub-setpassword-documentation-1290799.patch -Patch0141: 0141-Fix-locale-issue-in-grub-setpassword-1294243.patch -Patch0142: 0142-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch -Patch0143: 0143-efiemu-Fix-compilation-failure.patch -Patch0144: 0144-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch -Patch0145: 0145-Add-a-url-parser.patch -Patch0146: 0146-efinet-and-bootp-add-support-for-dhcpv6.patch -Patch0147: 0147-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch -Patch0148: 0148-Normalize-slashes-in-tftp-paths.patch -Patch0149: 0149-Fix-malformed-tftp-packets.patch -Patch0150: 0150-Fix-race-in-EFI-validation.patch -Patch0151: 0151-bz1374141-fix-incorrect-mask-for-ppc64.patch -Patch0152: 0152-Use-device-part-of-chainloader-target-if-present.patch -Patch0153: 0153-Add-secureboot-support-on-efi-chainloader.patch -Patch0154: 0154-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch -Patch0155: 0155-Make-grub_fatal-also-backtrace.patch -Patch0156: 0156-Rework-linux-command.patch -Patch0157: 0157-Rework-linux16-command.patch -Patch0158: 0158-Make-grub-editenv-build-again.patch -Patch0159: 0159-Fix-up-some-man-pages-rpmdiff-noticed.patch -Patch0160: 0160-Re-work-some-intricacies-of-PE-loading.patch -Patch0161: 0161-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch -Patch0162: 0162-linuxefi-fix-double-free-on-verification-failure.patch -Patch0163: 0163-fix-machine-type-test-in-30_os-prober.in.patch -Patch0164: 0164-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch -Patch0165: 0165-efi-chainloader-truncate-overlong-relocation-section.patch -Patch0166: 0166-linuxefi-minor-cleanups.patch -Patch0167: 0167-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch -Patch0168: 0168-Fix-up-linux-params-usage.patch -Patch0169: 0169-Make-exit-take-a-return-code.patch -Patch0170: 0170-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch -Patch0171: 0171-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch -Patch0172: 0172-Make-our-info-pages-say-grub2-where-appropriate.patch -Patch0173: 0173-print-more-debug-info-in-our-module-loader.patch -Patch0174: 0174-macos-just-build-chainloader-entries-don-t-try-any-x.patch -Patch0175: 0175-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch -Patch0176: 0176-export-btrfs_subvol-and-btrfs_subvolid.patch -Patch0177: 0177-grub2-btrfs-03-follow_default.patch -Patch0178: 0178-grub2-btrfs-04-grub2-install.patch -Patch0179: 0179-grub2-btrfs-05-grub2-mkconfig.patch -Patch0180: 0180-grub2-btrfs-06-subvol-mount.patch -Patch0181: 0181-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch -Patch0182: 0182-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch -Patch0183: 0183-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch -Patch0184: 0184-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch -Patch0185: 0185-Use-grub_efi_.-memory-helpers-where-reasonable.patch -Patch0186: 0186-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch -Patch0187: 0187-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch -Patch0188: 0188-don-t-ignore-const.patch -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 -Patch0195: 0195-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch -Patch0196: 0196-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch -Patch0197: 0197-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch +Patch0131: 0131-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +Patch0132: 0132-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch +Patch0133: 0133-tcp-add-window-scaling-support.patch +Patch0134: 0134-efinet-retransmit-if-our-device-is-busy.patch +Patch0135: 0135-Be-more-aggro-about-actually-using-the-configured-ne.patch +Patch0136: 0136-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch +Patch0137: 0137-Fix-security-issue-when-reading-username-and-passwor.patch +Patch0138: 0138-Warn-if-grub-password-will-not-be-read-1290803.patch +Patch0139: 0139-Clean-up-grub-setpassword-documentation-1290799.patch +Patch0140: 0140-Fix-locale-issue-in-grub-setpassword-1294243.patch +Patch0141: 0141-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch +Patch0142: 0142-efiemu-Fix-compilation-failure.patch +Patch0143: 0143-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +Patch0144: 0144-Add-a-url-parser.patch +Patch0145: 0145-efinet-and-bootp-add-support-for-dhcpv6.patch +Patch0146: 0146-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +Patch0147: 0147-Normalize-slashes-in-tftp-paths.patch +Patch0148: 0148-Fix-malformed-tftp-packets.patch +Patch0149: 0149-Fix-race-in-EFI-validation.patch +Patch0150: 0150-bz1374141-fix-incorrect-mask-for-ppc64.patch +Patch0151: 0151-Use-device-part-of-chainloader-target-if-present.patch +Patch0152: 0152-Add-secureboot-support-on-efi-chainloader.patch +Patch0153: 0153-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +Patch0154: 0154-Make-grub_fatal-also-backtrace.patch +Patch0155: 0155-Rework-linux-command.patch +Patch0156: 0156-Rework-linux16-command.patch +Patch0157: 0157-Make-grub-editenv-build-again.patch +Patch0158: 0158-Fix-up-some-man-pages-rpmdiff-noticed.patch +Patch0159: 0159-Re-work-some-intricacies-of-PE-loading.patch +Patch0160: 0160-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch +Patch0161: 0161-linuxefi-fix-double-free-on-verification-failure.patch +Patch0162: 0162-fix-machine-type-test-in-30_os-prober.in.patch +Patch0163: 0163-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch +Patch0164: 0164-efi-chainloader-truncate-overlong-relocation-section.patch +Patch0165: 0165-linuxefi-minor-cleanups.patch +Patch0166: 0166-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch +Patch0167: 0167-Fix-up-linux-params-usage.patch +Patch0168: 0168-Make-exit-take-a-return-code.patch +Patch0169: 0169-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch +Patch0170: 0170-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch +Patch0171: 0171-Make-our-info-pages-say-grub2-where-appropriate.patch +Patch0172: 0172-print-more-debug-info-in-our-module-loader.patch +Patch0173: 0173-macos-just-build-chainloader-entries-don-t-try-any-x.patch +Patch0174: 0174-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch +Patch0175: 0175-export-btrfs_subvol-and-btrfs_subvolid.patch +Patch0176: 0176-grub2-btrfs-03-follow_default.patch +Patch0177: 0177-grub2-btrfs-04-grub2-install.patch +Patch0178: 0178-grub2-btrfs-05-grub2-mkconfig.patch +Patch0179: 0179-grub2-btrfs-06-subvol-mount.patch +Patch0180: 0180-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch +Patch0181: 0181-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch +Patch0182: 0182-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch +Patch0183: 0183-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch +Patch0184: 0184-Use-grub_efi_.-memory-helpers-where-reasonable.patch +Patch0185: 0185-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch +Patch0186: 0186-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch +Patch0187: 0187-don-t-ignore-const.patch +Patch0188: 0188-don-t-use-int-for-efi-status.patch +Patch0189: 0189-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +Patch0190: 0190-Clean-up-some-errors-in-the-linuxefi-loader.patch +Patch0191: 0191-editenv-handle-relative-symlinks.patch +Patch0192: 0192-Make-libgrub.pp-depend-on-config-util.h.patch +Patch0193: 0193-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch +Patch0194: 0194-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch +Patch0195: 0195-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch +Patch0196: 0196-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch +Patch0197: 0197-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch +Patch0198: 0198-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch diff --git a/grub2.spec b/grub2.spec index 8d907ead..8bdef5a9 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -454,6 +454,10 @@ fi %endif %changelog +* Wed Jan 17 2018 Peter Jones - 2.02-20 +- Pull in patches for Apollo Lake hardware + Resolves: rhbz#1519311 + * Tue Oct 24 2017 Peter Jones - 2.02-19 - Handle xen module loading (somewhat) better Resolves: rhbz#1486002 From dc3a93bf0e9b1c1f82af95477fd4537579652567 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 18 Jan 2018 14:03:23 -0500 Subject: [PATCH 3/5] Fix some efi modules bugs - Fix grub2-efi-modules provides/obsoletes generation Resolves: rhbz#1506704 - *Also* build grub-efi-ia32{,-*,!-modules} packages for i686 builds Resolves: rhbz#1502312 Signed-off-by: Peter Jones --- grub.macros | 38 +++++++++++++++++++++++++++++--------- grub2.spec | 8 +++++++- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/grub.macros b/grub.macros index 44c68863..df825b9d 100644 --- a/grub.macros +++ b/grub.macros @@ -61,15 +61,9 @@ %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} +%global efi_arch x86_64 %{ix86} ia64 %{efi_only} %ifarch %{efi_arch} %global with_efi_arch 1 %else @@ -96,6 +90,17 @@ %global legacy_provides -l %endif +%ifarch %{ix86} +%global efiarch ia32 +%global target_cpu_name i386 +%global grub_target_name i386-efi +%global package_arch efi-ia32 + +%global legacy_target_cpu_name i386 +%global legacy_package_arch pc +%global platform pc +%endif + %ifarch x86_64 %global efiarch x64 %global target_cpu_name %{_arch} @@ -140,6 +145,13 @@ %global grubefiname grub%{efiarch}.efi %global grubeficdname gcd%{efiarch}.efi %global grubefiarch %{target_cpu_name}-efi +%ifarch %{ix86} +%global with_efi_modules 0 +%global without_efi_modules 1 +%else +%global with_efi_modules 1 +%global without_efi_modules 0 +%endif %endif %if 0%{?alt_efi_arch:1} @@ -233,16 +245,18 @@ Provides: %{name}-efi = %{evr} \ This subpackage provides support for %{1} systems. \ \ %{expand:%%{?!buildsubdir:%%define buildsubdir grub-%{1}-%{tarversion}}}\ +%{expand:%if 0%{?with_efi_modules} \ %{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}} \ +Provides: %{name}-efi-modules = %{evr} \ +Obsoletes: %{name}-efi-modules < %{evr} \ %{expand:%%description %{1}-modules} \ %{desc} \ This subpackage provides support for rebuilding your own grub.efi. \ +%endif} \ \ %{expand:%%package %{1}-cdboot} \ Summary: Files used to boot removeable media with EFI \ @@ -480,12 +494,18 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \ %ghost %config(noreplace) /boot/efi/EFI/%{efidir}/grub.cfg \ /boot/grub2/grubenv \ %ghost %config(noreplace) %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grubenv \ +%{expand:%if 0%{?without_efi_modules} \ +%exclude %{_libdir}/grub/%{6} \ +%exclude %{_libdir}/grub/%{6}/* \ +%endif} \ \ +%{expand:%if 0%{?with_efi_modules} \ %{expand:%%files %{1}-modules} \ %defattr(-,root,root,-) \ %dir %{_libdir}/grub/%{6}/ \ %{_libdir}/grub/%{6}/* \ %exclude %{_libdir}/grub/%{6}/*.module \ +%endif} \ \ %{expand:%%files %{1}-cdboot} \ %defattr(-,root,root,-) \ diff --git a/grub2.spec b/grub2.spec index 8bdef5a9..242cd99b 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -454,6 +454,12 @@ fi %endif %changelog +* Thu Jan 18 2018 Peter Jones - 2.02-21 +- Fix grub2-efi-modules provides/obsoletes generation + Resolves: rhbz#1506704 +- *Also* build grub-efi-ia32{,-*,!-modules} packages for i686 builds + Resolves: rhbz#1502312 + * Wed Jan 17 2018 Peter Jones - 2.02-20 - Pull in patches for Apollo Lake hardware Resolves: rhbz#1519311 From 087ddf4309877610a4a7539ee2f4d315969afd3d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 23 Jan 2018 13:25:23 -0500 Subject: [PATCH 4/5] Fix a merge error from 2.02-21 that affected kernel loading on Aarch64. Fix a merge error from 2.02-21 that affected kernel loading on Aarch64. Related: rhbz#1519311 Related: rhbz#1506704 Related: rhbz#1502312 Signed-off-by: Peter Jones --- 0123-Load-arm-with-SB-enabled.patch | 11 +++++------ grub2.spec | 8 +++++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/0123-Load-arm-with-SB-enabled.patch b/0123-Load-arm-with-SB-enabled.patch index e43a8f5f..f4dd7b6b 100644 --- a/0123-Load-arm-with-SB-enabled.patch +++ b/0123-Load-arm-with-SB-enabled.patch @@ -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); diff --git a/grub2.spec b/grub2.spec index 242cd99b..95509fd3 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -454,6 +454,12 @@ fi %endif %changelog +* Tue Jan 23 2018 Peter Jones - 2.02-22 +- Fix a merge error from 2.02-21 that affected kernel loading on Aarch64. + Related: rhbz#1519311 + Related: rhbz#1506704 + Related: rhbz#1502312 + * Thu Jan 18 2018 Peter Jones - 2.02-21 - Fix grub2-efi-modules provides/obsoletes generation Resolves: rhbz#1506704 From dd51c3973604537828b191d1a82cec94a5c1195e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 27 Feb 2018 12:27:45 -0500 Subject: [PATCH 5/5] Fix directory/file permissions on /boot/efi/* to match what the filesystem enforces. Signed-off-by: Peter Jones --- grub.macros | 14 +++++++------- grub2.spec | 8 ++++++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/grub.macros b/grub.macros index df825b9d..cd877845 100644 --- a/grub.macros +++ b/grub.macros @@ -488,10 +488,10 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \ %{expand:%%files %{1}} \ %defattr(-,root,root,-) \ %config(noreplace) %{_sysconfdir}/%{name}-efi.cfg \ -%dir %attr(0755,root,root)/boot/efi/EFI/%{efidir} \ -/boot/efi/EFI/%{efidir}/%{2} \ -%attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts \ -%ghost %config(noreplace) /boot/efi/EFI/%{efidir}/grub.cfg \ +%dir %attr(0700,root,root)/boot/efi/EFI/%{efidir} \ +%attr(0700,root,root)/boot/efi/EFI/%{efidir}/%{2} \ +%attr(0700,root,root)/boot/efi/EFI/%{efidir}/fonts \ +%attr(0700,root,root) %ghost %config(noreplace) /boot/efi/EFI/%{efidir}/grub.cfg \ /boot/grub2/grubenv \ %ghost %config(noreplace) %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grubenv \ %{expand:%if 0%{?without_efi_modules} \ @@ -508,7 +508,7 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \ %endif} \ \ %{expand:%%files %{1}-cdboot} \ -%defattr(-,root,root,-) \ -%attr(0755,root,root)/boot/efi/EFI/%{efidir}/%{3} \ -%attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts \ +%defattr(0700,root,root,-) \ +%attr(0700,root,root)/boot/efi/EFI/%{efidir}/%{3} \ +%attr(0700,root,root)/boot/efi/EFI/%{efidir}/fonts \ %{nil} diff --git a/grub2.spec b/grub2.spec index 95509fd3..a2ff9e2f 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -314,7 +314,7 @@ fi %exclude /boot/%{name}/themes/system/* %attr(0700,root,root) %dir /boot/grub2 %exclude /boot/grub2/* -%dir %attr(0755,root,root) /boot/efi/EFI/%{efidir} +%dir %attr(0700,root,root) /boot/efi/EFI/%{efidir} %exclude /boot/efi/EFI/%{efidir}/* %license COPYING %ghost %config(noreplace) /boot/grub2/grubenv @@ -454,6 +454,10 @@ fi %endif %changelog +* Tue Feb 27 2018 Peter Jones - 2.02-23 +- Fix directory/file permissions on /boot/efi/* to match what the filesystem + enforces. + * Tue Jan 23 2018 Peter Jones - 2.02-22 - Fix a merge error from 2.02-21 that affected kernel loading on Aarch64. Related: rhbz#1519311