From e602a0629dc2d243ae3c4ae64ea36dddabc27937 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Mon, 17 Jan 2022 23:06:55 +0000
Subject: [PATCH] Update patches; minor changes at most, if correct

Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
 ...ecureboot-support-on-efi-chainloader.patch |  41 +-
 ...loaders-that-link-in-efi-mode-honor-.patch |   2 +-
 ...ient-architecture-CAS-reboot-support.patch |  14 +-
 ...nsole-display-attr-when-clear-screen.patch |   2 +
 ...video-support-for-IBM-power-machines.patch |   3 +
 0018-Migrate-PPC-from-Yaboot-to-Grub2.patch   |   7 +-
 0019-Add-fw_path-variable-revised.patch       |   3 +
 0027-Don-t-emit-Booting-.-message.patch       |  49 ---
 ...f-man-pages-with-slightly-nicer-ones.patch |   0
 ...ix-when-fallback-searching-for-grub-.patch |   0
 ...-before-grub.cfg-on-tftp-config-file.patch |   0
 ...CLASS-in-10_linux-from-etc-os-releas.patch |   0
 ...t-ordering-for-.debug-and-rescue-ker.patch |   0
 ...2-Try-prefix-if-fw_path-doesn-t-work.patch |   0
 ...33-Use-rpm-s-sort-for-grub2-mkconfig.patch |  69 ++--
 ...fig-construct-titles-that-look-like-.patch |   0
 ...ly-grub2-password-config-tool-985962.patch |   6 +-
 ... 0036-tcp-add-window-scaling-support.patch |   0
 ...net-and-bootp-add-support-for-dhcpv6.patch |   0
 ...rnel-settings-and-use-it-in-10_linux.patch |   6 +-
 ...1374141-fix-incorrect-mask-for-ppc64.patch |   3 +
 ... 0040-Make-grub_fatal-also-backtrace.patch |   0
 ...ix-up-some-man-pages-rpmdiff-noticed.patch |   2 +-
 ...fo-pages-say-grub2-where-appropriate.patch |   0
 ...-chainloader-entries-don-t-try-any-x.patch |   0
 ...-Add-ability-to-boot-from-subvolumes.patch |   0
 ...port-btrfs_subvol-and-btrfs_subvolid.patch |   0
 ...> 0046-grub2-btrfs-03-follow_default.patch |   0
 ...=> 0047-grub2-btrfs-04-grub2-install.patch |   0
 ...> 0048-grub2-btrfs-05-grub2-mkconfig.patch |   0
 ... => 0049-grub2-btrfs-06-subvol-mount.patch |   0
 ...subvol-name-scheme-to-support-old-sn.patch |   0
 ...-correctly-with-btrfs-snapshots-bsc-.patch |   0
 ...ocate_pool-and-grub_efi_free_pool-wr.patch |   0
 ...fi_.-memory-helpers-where-reasonable.patch |  14 +-
 ...4-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch |   4 +-
 ...=> 0055-don-t-use-int-for-efi-status.patch |   0
 ...INIT-declare-its-function-prototypes.patch |   0
 ...-efi-as-HFS-on-ppc-machines-in-grub-.patch |   0
 ...d-xen-or-multiboot-2-modules-as-need.patch |   0
 ...-calibration-not-take-51-seconds-to-.patch |   0
 ...060-align-struct-efi_variable-better.patch |   0
 ...061-Add-BLS-support-to-grub-mkconfig.patch |   6 +-
 ...-backtrace-on-grub_abort-for-grub-em.patch |   0
 ...nux-and-initrd-commands-for-grub-emu.patch |   0
 ...h => 0064-Add-grub2-switch-to-blscfg.patch |   4 +-
 ...patch => 0065-make-better-backtraces.patch |   2 +-
 ...w-our-startup-message-if-debug-is-se.patch |   0
 ...-some-minor-include-path-weirdnesses.patch |   0
 ...it-possible-to-enabled-build-id-sha1.patch |   2 +-
 ...f-grub_dprintf-without-the-file-line.patch |   0
 ...dprintf-that-tells-us-load-addresses.patch |   0
 ...tch => 0071-Fixup-for-newer-compiler.patch |   0
 ...-export-the-start-and-_start-symbols.patch |   0
 ...tch => 0073-Fixup-for-newer-compiler.patch |   0
 ...pport-for-non-Ethernet-network-cards.patch |   0
 ...racketed-ipv6-addrs-and-port-numbers.patch |   0
 ...=> 0076-bootp-New-net_bootp6-command.patch |   0
 ...=> 0077-efinet-UEFI-IPv6-PXE-support.patch |   0
 ...078-grub.texi-Add-net_bootp6-doument.patch |   0
 ...essing-DHCPACK-packet-from-HTTP-Boot.patch |   0
 ...etting-network-from-UEFI-device-path.patch |   0
 ...etting-DNS-server-from-UEFI-protocol.patch |   0
 ...82-Support-UEFI-networking-protocols.patch |   0
 ...> 0083-AUDIT-0-http-boot-tracker-bug.patch |   0
 ...-incr-command-to-increment-integer-v.patch |   0
 ...h => 0085-Add-auto-hide-menu-support.patch |   2 +-
 ...> 0086-Add-grub-set-bootflag-utility.patch |  16 +-
 ...b-boot-indeterminate.service-example.patch |   0
 ...h => 0088-gentpl-add-disable-support.patch |   0
 ... => 0089-gentpl-add-pc-firmware-type.patch |   0
 ...e-the-firmware-acceleration-for-http.patch |   0
 ...ot_url-reflect-the-protocol-hostname.patch |   0
 ...n-tell-configure-which-cflags-utils-.patch |   4 +-
 ...make-it-possible-to-run-checkers-on-.patch |   0
 ...94-Rework-how-the-fdt-command-builds.patch |  19 +-
 ...able-non-wordsize-allocations-on-arm.patch |   2 +-
 ...nd-prefix-when-HTTP-path-is-relative.patch |   0
 ...=> 0097-Make-grub_error-more-verbose.patch |   0
 ...eset-an-alias-for-the-reboot-command.patch |   0
 ....patch => 0099-Add-a-version-command.patch |   2 +-
 ...dprintf-and-nerf-dprintf-in-script.c.patch |   0
 ...-Better-memory-allocation-and-error-.patch |   0
 ...tter-locations-for-kernel-and-initrd.patch |  17 +-
 ...p-all-the-places-Wsign-compare-error.patch |   0
 ...gn-compare-Wno-conversion-Wno-error-.patch |   4 +-
 ...ce-buffers-for-reading-to-addresses-.patch |   0
 ...-arrange-grub_cmd_linux-a-little-bit.patch |   0
 ...e-our-own-allocator-for-kernel-stuff.patch |   0
 ...itrd-params-cmdline-allocations-abov.patch |   0
 ... => 0109-Fix-getroot.c-s-trampolines.patch |   0
 ...not-allow-stack-trampolines-anywhere.patch |   4 +-
 ...tch => 0111-Reimplement-boot_counter.patch |   2 +-
 ...ntry-selection-based-on-ID-and-title.patch |   2 +-
 ...try-users-option-argument-to-be-opti.patch |   0
 ...export-env-and-efi-load-env-commands.patch |   0
 ...le-to-subtract-conditions-from-debug.patch |   0
 ...bles-from-the-initial-context-when-c.patch |   2 +-
 ...-boot-success-reset-from-menu-auto-h.patch |   2 +-
 ...ix-systemctl-kexec-exit-status-check.patch |   0
 ...b-emu-linux-loader-messages-as-debug.patch |   0
 ...t-boot-commands-will-only-return-on-.patch |   2 +-
 ... => 0121-Do-better-in-bootstrap.conf.patch |   0
 ...ferences-for-fdt-when-building-with-.patch |  41 --
 ...0122-Use-git-to-apply-gnulib-patches.patch |   0
 ...g-Update-comment-about-running-as-ro.patch |   0
 ...g-Write-new-env-to-tmpfile-and-then-.patch |   0
 ...-error-with-the-fdt-module-on-risc-v.patch |  40 --
 ...indeterminate-getting-set-on-boot_su.patch |  10 +-
 ... => 0126-Add-start-symbol-for-RISC-V.patch |   0
 ...conf-Force-autogen.sh-to-use-python3.patch |   0
 ...fw-http-_path-variables-to-make-them.patch |   0
 ..._EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch |  24 --
 ...-literal-IPv6-addresses-in-square-br.patch |   0
 ...ader-Define-machine-types-for-RISC-V.patch |  31 --
 ...o-specify-a-port-number-in-addresses.patch |   0
 ...mprove-check-to-detect-literal-IPv6-.patch |   0
 ...debug-message-if-parsing-the-address.patch |   0
 ...so-accept-F8-as-a-user-interrupt-key.patch |   0
 ...se-address-before-jumping-to-the-PE-.patch |   0
 ...ate-TPM-measurement-errors-to-the-ve.patch |   0
 ...maximum-bounce-buffer-size-to-16-MiB.patch |   0
 ...fix-when-the-HTTP-path-is-relative-a.patch |   0
 ...turn-in-efi-export-env-and-efi-load-.patch |   0
 ...p-fix-some-allocation-error-checking.patch |   0
 ...p-fix-some-allocation-error-checking.patch |   0
 ...g.c-fix-some-potential-allocation-ov.patch |   0
 ...integer-overflows-in-grub_cmd_initrd.patch |   0
 ...rnel-validation-without-shim-protoco.patch |   0
 ...ar-pointers-in-grub-core-net-bootp.c.patch |   0
 ...ointers-in-grub-core-net-efi-ip4_con.patch |   0
 ...ointers-in-grub-core-net-efi-ip6_con.patch |   0
 ...-pointers-in-grub-core-net-efi-net.c.patch |   0
 ...-pointers-in-grub-core-net-efi-pxe.c.patch |   0
 ...gration-scripts-to-make-systemctl-re.patch |   2 +-
 ...ion.sh-Also-set-old-menu_show_once-g.patch |   0
 ...set-1-when-keyboard-is-in-Translate-.patch |   0
 ...ll-disable-support-for-EFI-platforms.patch |   0
 ...imestamps-configure-flag-to-prepend-.patch |   6 +-
 ...ements-to-grub_disk_open-and-grub_di.patch |   0
 ...on-grub_debug_is_enabled-void-return.patch |   0
 ...ear-screen-when-debugging-is-enabled.patch |   0
 ..._-instrumentation-new-file-debug-tag.patch |   0
 ...-Avoiding-many-unecessary-open-close.patch |   0
 ...-implements-fibre-channel-discovery-.patch |   0
 ...erpc-enables-device-mapper-discovery.patch |   0
 ...fallback_set-var-to-force-the-set-ma.patch |   0
 ...igning-grub-with-an-appended-signatu.patch |   0
 ...rub-Document-signing-grub-under-UEFI.patch |   0
 ...nt-signing-grub-with-an-appended-sig.patch |   0
 ...e-grub_dl_set_persistent-for-the-emu.patch |   0
 ...patch => 0166-pgp-factor-out-rsa_pad.patch |   0
 ...rage-for-grub_crypto_pk_-to-crypto.c.patch |   0
 ...p-tweaks-in-preparation-for-libtasn1.patch |   0
 ...0169-libtasn1-import-libtasn1-4.16.0.patch |   0
 ...asn1-disable-code-not-needed-in-grub.patch |   0
 ...tasn1-changes-for-grub-compatibility.patch |   0
 ...72-libtasn1-compile-into-asn1-module.patch |   0
 ...3-test_asn1-test-module-for-libtasn1.patch |   4 +-
 ...-support-embedding-x509-certificates.patch |   0
 ...res-import-GNUTLS-s-ASN.1-descriptio.patch |   0
 ...res-parse-PKCS-7-signedData-and-X.50.patch |   0
 ...res-support-verifying-appended-signa.patch |   0
 ...pended-signatures-verification-tests.patch |   0
 ...79-appended-signatures-documentation.patch |   0
 ...er-lockdown-based-on-ibm-secure-boot.patch |   0
 ...275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch |   0
 ...h => 0182-ieee1275-claim-more-memory.patch |   0
 ...-memory-with-ibm-client-architecture.patch |   0
 ...-Also-handle-the-Extended-Key-Usage-.patch |   0
 ...eee1275-ofdisk-retry-on-open-failure.patch |   0
 ...ainloading-EFI-apps-from-loop-mounts.patch |   0
 ...> 0187-efinet-Add-DHCP-proxy-support.patch |   0
 ...gnore-checksum-seed-incompat-feature.patch |   0
 ...-cmdline-when-generating-legacy-menu.patch |   2 +-
 ... 0190-Suppress-gettext-error-message.patch |   0
 ...nu_auto_hide.in-fix-a-then-than-typo.patch |  26 --
 ...d-Always-use-boot-grub2-user.cfg-as-.patch |   0
 0192-Fix-disabling-grub-rpm-sort.patch        |  62 ---
 ...for-EFI-at-runtime-instead-of-config.patch |   0
 ...-Don-t-check-for-rpmvercmp-in-librpm.patch |  57 ---
 ...or-if-boot-to-firmware-setup-is-not-.patch |   0
 ...x-EFI-loader-kernel-image-allocation.patch |  35 +-
 ...over-the-device-to-read-the-config-f.patch |   0
 ...etting-of-prefix-for-signed-binary-c.patch |  25 +-
 ...adable-filesystem-with-v4-superblock.patch |   0
 ...module-name-on-license-check-failure.patch |   0
 ...s.timer-Only-run-if-not-in-a-contain.patch |  32 --
 ...pc-ieee1275-load-grub-at-4MB-not-2MB.patch |   0
 ...-mkconfig-restore-umask-for-grub.cfg.patch |   7 +-
 ...Remove-outdated-URL-for-BLS-document.patch |  28 --
 ...btrfs-Use-full-btrfs-bootloader-area.patch |  13 +-
 ...ix-signed-grub-special-case-for-Powe.patch |  43 ---
 ...r-the-PE-magic-for-the-compiled-arch.patch |  63 ---
 grub.patches                                  | 362 +++++++++---------
 grub2.spec                                    |   5 +-
 196 files changed, 427 insertions(+), 810 deletions(-)
 delete mode 100644 0027-Don-t-emit-Booting-.-message.patch
 rename 0028-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch => 0027-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch (100%)
 rename 0029-use-fw_path-prefix-when-fallback-searching-for-grub-.patch => 0028-use-fw_path-prefix-when-fallback-searching-for-grub-.patch (100%)
 rename 0030-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch => 0029-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch (100%)
 rename 0031-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch => 0030-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch (100%)
 rename 0032-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch => 0031-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch (100%)
 rename 0033-Try-prefix-if-fw_path-doesn-t-work.patch => 0032-Try-prefix-if-fw_path-doesn-t-work.patch (100%)
 rename 0034-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch => 0033-Use-rpm-s-sort-for-grub2-mkconfig.patch (87%)
 rename 0035-Make-grub2-mkconfig-construct-titles-that-look-like-.patch => 0034-Make-grub2-mkconfig-construct-titles-that-look-like-.patch (100%)
 rename 0036-Add-friendly-grub2-password-config-tool-985962.patch => 0035-Add-friendly-grub2-password-config-tool-985962.patch (98%)
 rename 0037-tcp-add-window-scaling-support.patch => 0036-tcp-add-window-scaling-support.patch (100%)
 rename 0038-efinet-and-bootp-add-support-for-dhcpv6.patch => 0037-efinet-and-bootp-add-support-for-dhcpv6.patch (100%)
 rename 0039-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch => 0038-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch (98%)
 rename 0040-bz1374141-fix-incorrect-mask-for-ppc64.patch => 0039-bz1374141-fix-incorrect-mask-for-ppc64.patch (95%)
 rename 0041-Make-grub_fatal-also-backtrace.patch => 0040-Make-grub_fatal-also-backtrace.patch (100%)
 rename 0042-Fix-up-some-man-pages-rpmdiff-noticed.patch => 0041-Fix-up-some-man-pages-rpmdiff-noticed.patch (99%)
 rename 0043-Make-our-info-pages-say-grub2-where-appropriate.patch => 0042-Make-our-info-pages-say-grub2-where-appropriate.patch (100%)
 rename 0044-macos-just-build-chainloader-entries-don-t-try-any-x.patch => 0043-macos-just-build-chainloader-entries-don-t-try-any-x.patch (100%)
 rename 0045-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch => 0044-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch (100%)
 rename 0046-export-btrfs_subvol-and-btrfs_subvolid.patch => 0045-export-btrfs_subvol-and-btrfs_subvolid.patch (100%)
 rename 0047-grub2-btrfs-03-follow_default.patch => 0046-grub2-btrfs-03-follow_default.patch (100%)
 rename 0048-grub2-btrfs-04-grub2-install.patch => 0047-grub2-btrfs-04-grub2-install.patch (100%)
 rename 0049-grub2-btrfs-05-grub2-mkconfig.patch => 0048-grub2-btrfs-05-grub2-mkconfig.patch (100%)
 rename 0050-grub2-btrfs-06-subvol-mount.patch => 0049-grub2-btrfs-06-subvol-mount.patch (100%)
 rename 0051-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch => 0050-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch (100%)
 rename 0052-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch => 0051-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch (100%)
 rename 0053-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch => 0052-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch (100%)
 rename 0054-Use-grub_efi_.-memory-helpers-where-reasonable.patch => 0053-Use-grub_efi_.-memory-helpers-where-reasonable.patch (89%)
 rename 0055-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch => 0054-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch (94%)
 rename 0056-don-t-use-int-for-efi-status.patch => 0055-don-t-use-int-for-efi-status.patch (100%)
 rename 0057-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch => 0056-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch (100%)
 rename 0058-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch => 0057-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch (100%)
 rename 0059-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch => 0058-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch (100%)
 rename 0060-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch => 0059-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch (100%)
 rename 0061-align-struct-efi_variable-better.patch => 0060-align-struct-efi_variable-better.patch (100%)
 rename 0062-Add-BLS-support-to-grub-mkconfig.patch => 0061-Add-BLS-support-to-grub-mkconfig.patch (98%)
 rename 0063-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch => 0062-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch (100%)
 rename 0064-Add-linux-and-initrd-commands-for-grub-emu.patch => 0063-Add-linux-and-initrd-commands-for-grub-emu.patch (100%)
 rename 0065-Add-grub2-switch-to-blscfg.patch => 0064-Add-grub2-switch-to-blscfg.patch (99%)
 rename 0066-make-better-backtraces.patch => 0065-make-better-backtraces.patch (99%)
 rename 0067-normal-don-t-draw-our-startup-message-if-debug-is-se.patch => 0066-normal-don-t-draw-our-startup-message-if-debug-is-se.patch (100%)
 rename 0068-Work-around-some-minor-include-path-weirdnesses.patch => 0067-Work-around-some-minor-include-path-weirdnesses.patch (100%)
 rename 0069-Make-it-possible-to-enabled-build-id-sha1.patch => 0068-Make-it-possible-to-enabled-build-id-sha1.patch (98%)
 rename 0070-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch => 0069-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch (100%)
 rename 0071-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch => 0070-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch (100%)
 rename 0072-Fixup-for-newer-compiler.patch => 0071-Fixup-for-newer-compiler.patch (100%)
 rename 0073-Don-t-attempt-to-export-the-start-and-_start-symbols.patch => 0072-Don-t-attempt-to-export-the-start-and-_start-symbols.patch (100%)
 rename 0074-Fixup-for-newer-compiler.patch => 0073-Fixup-for-newer-compiler.patch (100%)
 rename 0075-Add-support-for-non-Ethernet-network-cards.patch => 0074-Add-support-for-non-Ethernet-network-cards.patch (100%)
 rename 0076-net-read-bracketed-ipv6-addrs-and-port-numbers.patch => 0075-net-read-bracketed-ipv6-addrs-and-port-numbers.patch (100%)
 rename 0077-bootp-New-net_bootp6-command.patch => 0076-bootp-New-net_bootp6-command.patch (100%)
 rename 0078-efinet-UEFI-IPv6-PXE-support.patch => 0077-efinet-UEFI-IPv6-PXE-support.patch (100%)
 rename 0079-grub.texi-Add-net_bootp6-doument.patch => 0078-grub.texi-Add-net_bootp6-doument.patch (100%)
 rename 0080-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch => 0079-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch (100%)
 rename 0081-efinet-Setting-network-from-UEFI-device-path.patch => 0080-efinet-Setting-network-from-UEFI-device-path.patch (100%)
 rename 0082-efinet-Setting-DNS-server-from-UEFI-protocol.patch => 0081-efinet-Setting-DNS-server-from-UEFI-protocol.patch (100%)
 rename 0083-Support-UEFI-networking-protocols.patch => 0082-Support-UEFI-networking-protocols.patch (100%)
 rename 0084-AUDIT-0-http-boot-tracker-bug.patch => 0083-AUDIT-0-http-boot-tracker-bug.patch (100%)
 rename 0085-grub-editenv-Add-incr-command-to-increment-integer-v.patch => 0084-grub-editenv-Add-incr-command-to-increment-integer-v.patch (100%)
 rename 0086-Add-auto-hide-menu-support.patch => 0085-Add-auto-hide-menu-support.patch (99%)
 rename 0087-Add-grub-set-bootflag-utility.patch => 0086-Add-grub-set-bootflag-utility.patch (95%)
 rename 0088-docs-Add-grub-boot-indeterminate.service-example.patch => 0087-docs-Add-grub-boot-indeterminate.service-example.patch (100%)
 rename 0089-gentpl-add-disable-support.patch => 0088-gentpl-add-disable-support.patch (100%)
 rename 0090-gentpl-add-pc-firmware-type.patch => 0089-gentpl-add-pc-firmware-type.patch (100%)
 rename 0091-efinet-also-use-the-firmware-acceleration-for-http.patch => 0090-efinet-also-use-the-firmware-acceleration-for-http.patch (100%)
 rename 0092-efi-http-Make-root_url-reflect-the-protocol-hostname.patch => 0091-efi-http-Make-root_url-reflect-the-protocol-hostname.patch (100%)
 rename 0093-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch => 0092-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch (98%)
 rename 0094-module-verifier-make-it-possible-to-run-checkers-on-.patch => 0093-module-verifier-make-it-possible-to-run-checkers-on-.patch (100%)
 rename 0095-Rework-how-the-fdt-command-builds.patch => 0094-Rework-how-the-fdt-command-builds.patch (84%)
 rename 0096-Disable-non-wordsize-allocations-on-arm.patch => 0095-Disable-non-wordsize-allocations-on-arm.patch (97%)
 rename 0097-Prepend-prefix-when-HTTP-path-is-relative.patch => 0096-Prepend-prefix-when-HTTP-path-is-relative.patch (100%)
 rename 0098-Make-grub_error-more-verbose.patch => 0097-Make-grub_error-more-verbose.patch (100%)
 rename 0099-Make-reset-an-alias-for-the-reboot-command.patch => 0098-Make-reset-an-alias-for-the-reboot-command.patch (100%)
 rename 0100-Add-a-version-command.patch => 0099-Add-a-version-command.patch (99%)
 rename 0101-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch => 0100-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch (100%)
 rename 0102-arm-arm64-loader-Better-memory-allocation-and-error-.patch => 0101-arm-arm64-loader-Better-memory-allocation-and-error-.patch (100%)
 rename 0103-Try-to-pick-better-locations-for-kernel-and-initrd.patch => 0102-Try-to-pick-better-locations-for-kernel-and-initrd.patch (91%)
 rename 0104-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch => 0103-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch (100%)
 rename 0105-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch => 0104-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch (95%)
 rename 0106-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch => 0105-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch (100%)
 rename 0107-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch => 0106-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch (100%)
 rename 0108-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch => 0107-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch (100%)
 rename 0109-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch => 0108-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch (100%)
 rename 0110-Fix-getroot.c-s-trampolines.patch => 0109-Fix-getroot.c-s-trampolines.patch (100%)
 rename 0111-Do-not-allow-stack-trampolines-anywhere.patch => 0110-Do-not-allow-stack-trampolines-anywhere.patch (93%)
 rename 0112-Reimplement-boot_counter.patch => 0111-Reimplement-boot_counter.patch (99%)
 rename 0113-Fix-menu-entry-selection-based-on-ID-and-title.patch => 0112-Fix-menu-entry-selection-based-on-ID-and-title.patch (99%)
 rename 0114-Make-the-menu-entry-users-option-argument-to-be-opti.patch => 0113-Make-the-menu-entry-users-option-argument-to-be-opti.patch (100%)
 rename 0115-Add-efi-export-env-and-efi-load-env-commands.patch => 0114-Add-efi-export-env-and-efi-load-env-commands.patch (100%)
 rename 0116-Make-it-possible-to-subtract-conditions-from-debug.patch => 0115-Make-it-possible-to-subtract-conditions-from-debug.patch (100%)
 rename 0117-Export-all-variables-from-the-initial-context-when-c.patch => 0116-Export-all-variables-from-the-initial-context-when-c.patch (97%)
 rename 0118-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch => 0117-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch (99%)
 rename 0119-Fix-systemctl-kexec-exit-status-check.patch => 0118-Fix-systemctl-kexec-exit-status-check.patch (100%)
 rename 0120-Print-grub-emu-linux-loader-messages-as-debug.patch => 0119-Print-grub-emu-linux-loader-messages-as-debug.patch (100%)
 rename 0121-Don-t-assume-that-boot-commands-will-only-return-on-.patch => 0120-Don-t-assume-that-boot-commands-will-only-return-on-.patch (98%)
 rename 0123-Do-better-in-bootstrap.conf.patch => 0121-Do-better-in-bootstrap.conf.patch (100%)
 delete mode 100644 0122-Fix-undefined-references-for-fdt-when-building-with-.patch
 rename 0124-Use-git-to-apply-gnulib-patches.patch => 0122-Use-git-to-apply-gnulib-patches.patch (100%)
 rename 0126-grub-set-bootflag-Update-comment-about-running-as-ro.patch => 0123-grub-set-bootflag-Update-comment-about-running-as-ro.patch (100%)
 rename 0127-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch => 0124-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch (100%)
 delete mode 100644 0125-Fix-build-error-with-the-fdt-module-on-risc-v.patch
 rename 0128-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch => 0125-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch (91%)
 rename 0131-Add-start-symbol-for-RISC-V.patch => 0126-Add-start-symbol-for-RISC-V.patch (100%)
 rename 0132-bootstrap.conf-Force-autogen.sh-to-use-python3.patch => 0127-bootstrap.conf-Force-autogen.sh-to-use-python3.patch (100%)
 rename 0133-efi-http-Export-fw-http-_path-variables-to-make-them.patch => 0128-efi-http-Export-fw-http-_path-variables-to-make-them.patch (100%)
 delete mode 100644 0129-Also-define-GRUB_EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch
 rename 0134-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch => 0129-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch (100%)
 delete mode 100644 0130-chainloader-Define-machine-types-for-RISC-V.patch
 rename 0135-efi-net-Allow-to-specify-a-port-number-in-addresses.patch => 0130-efi-net-Allow-to-specify-a-port-number-in-addresses.patch (100%)
 rename 0136-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch => 0131-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch (100%)
 rename 0137-efi-net-Print-a-debug-message-if-parsing-the-address.patch => 0132-efi-net-Print-a-debug-message-if-parsing-the-address.patch (100%)
 rename 0138-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch => 0133-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch (100%)
 rename 0139-efi-Set-image-base-address-before-jumping-to-the-PE-.patch => 0134-efi-Set-image-base-address-before-jumping-to-the-PE-.patch (100%)
 rename 0140-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch => 0135-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch (100%)
 rename 0141-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch => 0136-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch (100%)
 rename 0142-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch => 0137-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch (100%)
 rename 0143-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch => 0138-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch (100%)
 rename 0144-efi-dhcp-fix-some-allocation-error-checking.patch => 0139-efi-dhcp-fix-some-allocation-error-checking.patch (100%)
 rename 0145-efi-http-fix-some-allocation-error-checking.patch => 0140-efi-http-fix-some-allocation-error-checking.patch (100%)
 rename 0146-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch => 0141-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch (100%)
 rename 0147-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch => 0142-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch (100%)
 rename 0148-linuxefi-fail-kernel-validation-without-shim-protoco.patch => 0143-linuxefi-fail-kernel-validation-without-shim-protoco.patch (100%)
 rename 0149-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch => 0144-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch (100%)
 rename 0150-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch => 0145-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch (100%)
 rename 0151-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch => 0146-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch (100%)
 rename 0152-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch => 0147-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch (100%)
 rename 0153-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch => 0148-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch (100%)
 rename 0154-Add-systemd-integration-scripts-to-make-systemctl-re.patch => 0149-Add-systemd-integration-scripts-to-make-systemctl-re.patch (99%)
 rename 0155-systemd-integration.sh-Also-set-old-menu_show_once-g.patch => 0150-systemd-integration.sh-Also-set-old-menu_show_once-g.patch (100%)
 rename 0156-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch => 0151-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch (100%)
 rename 0157-grub-install-disable-support-for-EFI-platforms.patch => 0152-grub-install-disable-support-for-EFI-platforms.patch (100%)
 rename 0158-New-with-debug-timestamps-configure-flag-to-prepend-.patch => 0153-New-with-debug-timestamps-configure-flag-to-prepend-.patch (96%)
 rename 0159-Added-debug-statements-to-grub_disk_open-and-grub_di.patch => 0154-Added-debug-statements-to-grub_disk_open-and-grub_di.patch (100%)
 rename 0160-Introduce-function-grub_debug_is_enabled-void-return.patch => 0155-Introduce-function-grub_debug_is_enabled-void-return.patch (100%)
 rename 0161-Don-t-clear-screen-when-debugging-is-enabled.patch => 0156-Don-t-clear-screen-when-debugging-is-enabled.patch (100%)
 rename 0162-grub_file_-instrumentation-new-file-debug-tag.patch => 0157-grub_file_-instrumentation-new-file-debug-tag.patch (100%)
 rename 0163-ieee1275-Avoiding-many-unecessary-open-close.patch => 0158-ieee1275-Avoiding-many-unecessary-open-close.patch (100%)
 rename 0164-ieee1275-powerpc-implements-fibre-channel-discovery-.patch => 0159-ieee1275-powerpc-implements-fibre-channel-discovery-.patch (100%)
 rename 0165-ieee1275-powerpc-enables-device-mapper-discovery.patch => 0160-ieee1275-powerpc-enables-device-mapper-discovery.patch (100%)
 rename 0166-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch => 0161-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch (100%)
 rename 0167-Add-suport-for-signing-grub-with-an-appended-signatu.patch => 0162-Add-suport-for-signing-grub-with-an-appended-signatu.patch (100%)
 rename 0168-docs-grub-Document-signing-grub-under-UEFI.patch => 0163-docs-grub-Document-signing-grub-under-UEFI.patch (100%)
 rename 0169-docs-grub-Document-signing-grub-with-an-appended-sig.patch => 0164-docs-grub-Document-signing-grub-with-an-appended-sig.patch (100%)
 rename 0170-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch => 0165-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch (100%)
 rename 0171-pgp-factor-out-rsa_pad.patch => 0166-pgp-factor-out-rsa_pad.patch (100%)
 rename 0172-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch => 0167-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch (100%)
 rename 0173-posix_wrap-tweaks-in-preparation-for-libtasn1.patch => 0168-posix_wrap-tweaks-in-preparation-for-libtasn1.patch (100%)
 rename 0174-libtasn1-import-libtasn1-4.16.0.patch => 0169-libtasn1-import-libtasn1-4.16.0.patch (100%)
 rename 0175-libtasn1-disable-code-not-needed-in-grub.patch => 0170-libtasn1-disable-code-not-needed-in-grub.patch (100%)
 rename 0176-libtasn1-changes-for-grub-compatibility.patch => 0171-libtasn1-changes-for-grub-compatibility.patch (100%)
 rename 0177-libtasn1-compile-into-asn1-module.patch => 0172-libtasn1-compile-into-asn1-module.patch (100%)
 rename 0178-test_asn1-test-module-for-libtasn1.patch => 0173-test_asn1-test-module-for-libtasn1.patch (99%)
 rename 0179-grub-install-support-embedding-x509-certificates.patch => 0174-grub-install-support-embedding-x509-certificates.patch (100%)
 rename 0180-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch => 0175-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch (100%)
 rename 0181-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch => 0176-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch (100%)
 rename 0182-appended-signatures-support-verifying-appended-signa.patch => 0177-appended-signatures-support-verifying-appended-signa.patch (100%)
 rename 0183-appended-signatures-verification-tests.patch => 0178-appended-signatures-verification-tests.patch (100%)
 rename 0184-appended-signatures-documentation.patch => 0179-appended-signatures-documentation.patch (100%)
 rename 0185-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch => 0180-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch (100%)
 rename 0186-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch => 0181-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch (100%)
 rename 0187-ieee1275-claim-more-memory.patch => 0182-ieee1275-claim-more-memory.patch (100%)
 rename 0188-ieee1275-request-memory-with-ibm-client-architecture.patch => 0183-ieee1275-request-memory-with-ibm-client-architecture.patch (100%)
 rename 0189-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch => 0184-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch (100%)
 rename 0190-ieee1275-ofdisk-retry-on-open-failure.patch => 0185-ieee1275-ofdisk-retry-on-open-failure.patch (100%)
 rename 0194-Allow-chainloading-EFI-apps-from-loop-mounts.patch => 0186-Allow-chainloading-EFI-apps-from-loop-mounts.patch (100%)
 rename 0195-efinet-Add-DHCP-proxy-support.patch => 0187-efinet-Add-DHCP-proxy-support.patch (100%)
 rename 0196-fs-ext2-Ignore-checksum-seed-incompat-feature.patch => 0188-fs-ext2-Ignore-checksum-seed-incompat-feature.patch (100%)
 rename 0197-Don-t-update-the-cmdline-when-generating-legacy-menu.patch => 0189-Don-t-update-the-cmdline-when-generating-legacy-menu.patch (97%)
 rename 0198-Suppress-gettext-error-message.patch => 0190-Suppress-gettext-error-message.patch (100%)
 delete mode 100644 0191-01_menu_auto_hide.in-fix-a-then-than-typo.patch
 rename 0200-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch => 0191-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch (100%)
 delete mode 100644 0192-Fix-disabling-grub-rpm-sort.patch
 rename 0202-templates-Check-for-EFI-at-runtime-instead-of-config.patch => 0192-templates-Check-for-EFI-at-runtime-instead-of-config.patch (100%)
 delete mode 100644 0193-Don-t-check-for-rpmvercmp-in-librpm.patch
 rename 0203-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch => 0193-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch (100%)
 rename 0204-arm64-Fix-EFI-loader-kernel-image-allocation.patch => 0194-arm64-Fix-EFI-loader-kernel-image-allocation.patch (81%)
 rename 0205-normal-main-Discover-the-device-to-read-the-config-f.patch => 0195-normal-main-Discover-the-device-to-read-the-config-f.patch (100%)
 rename 0206-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch => 0196-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch (71%)
 rename 0209-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch => 0197-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch (100%)
 rename 0210-Print-module-name-on-license-check-failure.patch => 0198-Print-module-name-on-license-check-failure.patch (100%)
 delete mode 100644 0199-grub-boot-success.timer-Only-run-if-not-in-a-contain.patch
 rename 0211-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch => 0199-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch (100%)
 rename 0212-grub-mkconfig-restore-umask-for-grub.cfg.patch => 0200-grub-mkconfig-restore-umask-for-grub.cfg.patch (91%)
 delete mode 100644 0201-Remove-outdated-URL-for-BLS-document.patch
 rename 0213-fs-btrfs-Use-full-btrfs-bootloader-area.patch => 0201-fs-btrfs-Use-full-btrfs-bootloader-area.patch (96%)
 delete mode 100644 0207-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
 delete mode 100644 0208-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch

diff --git a/0007-Add-secureboot-support-on-efi-chainloader.patch b/0007-Add-secureboot-support-on-efi-chainloader.patch
index bfb5a9b6..6826cce1 100644
--- a/0007-Add-secureboot-support-on-efi-chainloader.patch
+++ b/0007-Add-secureboot-support-on-efi-chainloader.patch
@@ -164,15 +164,30 @@ following branches:
 
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1347291
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+
+Also:
+
+commit cc06f149fbd2d8c1da1e83173d21629ba97e0d92
+Author: Raymund Will <rw@suse.com>
+
+chainloader: Define machine types for RISC-V
+
+The commit "Add secureboot support on efi chainloader" didn't add machine
+types for RISC-V, so this patch adds them.
+
+Note, that grub-core/loader/riscv/linux.c is skipped because Linux is not
+supported yet. This patch might need a new revision once that's the case.
+
+Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
 ---
  grub-core/kern/efi/efi.c           |  14 +-
  grub-core/loader/arm64/linux.c     |   4 +-
- grub-core/loader/efi/chainloader.c | 816 +++++++++++++++++++++++++++++++++----
+ grub-core/loader/efi/chainloader.c | 820 +++++++++++++++++++++++++++++++++----
  grub-core/loader/efi/linux.c       |  25 +-
  grub-core/loader/i386/efi/linux.c  |  17 +-
  include/grub/efi/linux.h           |   2 +-
  include/grub/efi/pe32.h            |  52 ++-
- 7 files changed, 840 insertions(+), 90 deletions(-)
+ 7 files changed, 844 insertions(+), 90 deletions(-)
 
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
 index 35b8f670602..4a2259aa1c7 100644
@@ -226,7 +241,7 @@ index a312c668685..04994d5c67d 100644
        grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
        goto fail;
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 2bd80f4db3d..b54cf6986fc 100644
+index 2bd80f4db3d..e6a8d4ad0e9 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -32,6 +32,8 @@
@@ -261,7 +276,7 @@ index 2bd80f4db3d..b54cf6986fc 100644
  
    grub_dl_unref (my_mod);
    return GRUB_ERR_NONE;
-@@ -213,20 +221,690 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
+@@ -213,20 +221,694 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
    return file_path;
  }
  
@@ -376,6 +391,10 @@ index 2bd80f4db3d..b54cf6986fc 100644
 +  GRUB_PE32_MACHINE_I386;
 +#elif defined(__ia64__)
 +  GRUB_PE32_MACHINE_IA64;
++#elif defined(__riscv) && (__riscv_xlen == 32)
++  GRUB_PE32_MACHINE_RISCV32;
++#elif defined(__riscv) && (__riscv_xlen == 64)
++  GRUB_PE32_MACHINE_RISCV64;
 +#else
 +#error this architecture is not supported by grub2
 +#endif
@@ -955,7 +974,7 @@ index 2bd80f4db3d..b54cf6986fc 100644
  
    if (argc == 0)
      return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
-@@ -238,15 +916,45 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -238,15 +920,45 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    address = 0;
    image_handle = 0;
    file_path = 0;
@@ -1003,7 +1022,7 @@ index 2bd80f4db3d..b54cf6986fc 100644
    if (! dev)
      goto fail;
  
-@@ -283,17 +991,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -283,17 +995,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    if (! file_path)
      goto fail;
  
@@ -1024,7 +1043,7 @@ index 2bd80f4db3d..b54cf6986fc 100644
  
    status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ANY_PAGES,
  			      GRUB_EFI_LOADER_CODE,
-@@ -307,7 +1012,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -307,7 +1016,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
      }
  
    boot_image = (void *) ((grub_addr_t) address);
@@ -1033,7 +1052,7 @@ index 2bd80f4db3d..b54cf6986fc 100644
      {
        if (grub_errno == GRUB_ERR_NONE)
  	grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
-@@ -317,7 +1022,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -317,7 +1026,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
      }
  
  #if defined (__i386__) || defined (__x86_64__)
@@ -1042,7 +1061,7 @@ index 2bd80f4db3d..b54cf6986fc 100644
      {
        struct grub_macho_fat_header *head = boot_image;
        if (head->magic
-@@ -326,6 +1031,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -326,6 +1035,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  	  grub_uint32_t i;
  	  struct grub_macho_fat_arch *archs
  	    = (struct grub_macho_fat_arch *) (head + 1);
@@ -1057,7 +1076,7 @@ index 2bd80f4db3d..b54cf6986fc 100644
  	  for (i = 0; i < grub_cpu_to_le32 (head->nfat_arch); i++)
  	    {
  	      if (GRUB_MACHO_CPUTYPE_IS_HOST_CURRENT (archs[i].cputype))
-@@ -340,79 +1053,39 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -340,79 +1057,39 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
  	      > ~grub_cpu_to_le32 (archs[i].size)
  	      || grub_cpu_to_le32 (archs[i].offset)
  	      + grub_cpu_to_le32 (archs[i].size)
@@ -1154,7 +1173,7 @@ index 2bd80f4db3d..b54cf6986fc 100644
    if (dev)
      grub_device_close (dev);
  
-@@ -424,6 +1097,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
+@@ -424,6 +1101,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
    if (address)
      efi_call_2 (b->free_pages, address, pages);
  
diff --git a/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
index 3182fe99..030c71c9 100644
--- a/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
+++ b/0008-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
@@ -193,7 +193,7 @@ index 74888c463ba..585f2b57385 100644
    grub_unregister_command (cmd);
  }
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index b54cf6986fc..3ff305b1d32 100644
+index e6a8d4ad0e9..07c4937898d 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -34,6 +34,7 @@
diff --git a/0011-IBM-client-architecture-CAS-reboot-support.patch b/0011-IBM-client-architecture-CAS-reboot-support.patch
index eaaf9a42..431a443b 100644
--- a/0011-IBM-client-architecture-CAS-reboot-support.patch
+++ b/0011-IBM-client-architecture-CAS-reboot-support.patch
@@ -7,16 +7,20 @@ This is an implementation of IBM client architecture (CAS) reboot for GRUB.
 
 There are cases where the POWER firmware must reboot in order to support
 specific features requested by a kernel. The kernel calls
-ibm,client-architecture-support and it may either return or reboot with the new
-feature set. eg:
+ibm,client-architecture-support and it may either return or reboot with
+the new feature set. eg:
 
 Calling ibm,client-architecture-support.../
 Elapsed time since release of system processors: 70959 mins 50 secs
 Welcome to GRUB!
 
-Instead of return to the GRUB menu, it will check if the flag for CAS reboot is
-set. If so, grub will automatically boot the last booted kernel using the same
-parameters
+Instead of return to the GRUB menu, it will check if the flag for CAS
+reboot is set. If so, grub will automatically boot the last booted
+kernel using the same parameters
+
+Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
+[rharwood@redhat.com: commit message rewrap]
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/kern/ieee1275/openfw.c | 63 ++++++++++++++++++++++++++++++++++++++++
  grub-core/normal/main.c          | 19 ++++++++++++
diff --git a/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch
index c8bb9d3c..c8ccc7e2 100644
--- a/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch
+++ b/0012-for-ppc-reset-console-display-attr-when-clear-screen.patch
@@ -10,6 +10,8 @@ This should fix this bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=908519
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
+Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/term/terminfo.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch
index 430f6002..e8aa3678 100644
--- a/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch
+++ b/0013-Disable-GRUB-video-support-for-IBM-power-machines.patch
@@ -5,6 +5,9 @@ Subject: [PATCH] Disable GRUB video support for IBM power machines
 
 Should fix the problem in bugzilla:
 https://bugzilla.redhat.com/show_bug.cgi?id=973205
+
+Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/kern/ieee1275/cmain.c  | 5 ++++-
  grub-core/video/ieee1275.c       | 9 ++++++---
diff --git a/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch
index ee8c7abf..5cbe731b 100644
--- a/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch
+++ b/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch
@@ -3,8 +3,11 @@ From: Mark Hamzy <hamzy@us.ibm.com>
 Date: Wed, 28 Mar 2012 14:46:41 -0500
 Subject: [PATCH] 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.
+Add configuration support for serial terminal consoles.  This will set
+the maximum screen size so that text is not overwritten.
+
+Signed-off-by: Mark Hamzy <hamzy@us.ibm.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  Makefile.util.def              |   7 +++
  util/grub.d/20_ppc_terminfo.in | 114 +++++++++++++++++++++++++++++++++++++++++
diff --git a/0019-Add-fw_path-variable-revised.patch b/0019-Add-fw_path-variable-revised.patch
index df9ef830..a8491e8c 100644
--- a/0019-Add-fw_path-variable-revised.patch
+++ b/0019-Add-fw_path-variable-revised.patch
@@ -8,6 +8,9 @@ found. It was originally written by Matthew Garrett, and adapted to fix the
 "No modules are loaded on grub2 network boot" issue:
 
 https://bugzilla.redhat.com/show_bug.cgi?id=857936
+
+Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/kern/main.c   | 13 ++++++-------
  grub-core/normal/main.c | 25 ++++++++++++++++++++++++-
diff --git a/0027-Don-t-emit-Booting-.-message.patch b/0027-Don-t-emit-Booting-.-message.patch
deleted file mode 100644
index 4133b526..00000000
--- a/0027-Don-t-emit-Booting-.-message.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 18 Feb 2014 09:37:49 -0500
-Subject: [PATCH] Don't emit "Booting ..." message.
-
-UI team still hates this stuff, so we're disabling it for RHEL 7.
-
-Resolves: rhbz#1023142
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/normal/menu.c       | 4 +++-
- grub-core/normal/menu_entry.c | 3 ---
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index d7a222e681b..37d753d8081 100644
---- a/grub-core/normal/menu.c
-+++ b/grub-core/normal/menu.c
-@@ -838,12 +838,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
- 
- /* Callback invoked immediately before a menu entry is executed.  */
- static void
--notify_booting (grub_menu_entry_t entry,
-+notify_booting (grub_menu_entry_t __attribute__((unused)) entry,
- 		void *userdata __attribute__((unused)))
- {
-+#if 0
-   grub_printf ("  ");
-   grub_printf_ (N_("Booting `%s'"), entry->title);
-   grub_printf ("\n\n");
-+#endif
- }
- 
- /* Callback invoked when a default menu entry executed because of a timeout
-diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
-index 50eef918cf6..de64a367c4e 100644
---- a/grub-core/normal/menu_entry.c
-+++ b/grub-core/normal/menu_entry.c
-@@ -1176,9 +1176,6 @@ run (struct screen *screen)
-   char *dummy[1] = { NULL };
- 
-   grub_cls ();
--  grub_printf ("  ");
--  grub_printf_ (N_("Booting a command list"));
--  grub_printf ("\n\n");
- 
-   errs_before = grub_err_printed_errors;
- 
diff --git a/0028-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch b/0027-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
similarity index 100%
rename from 0028-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
rename to 0027-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
diff --git a/0029-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0028-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
similarity index 100%
rename from 0029-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
rename to 0028-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
diff --git a/0030-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0029-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
similarity index 100%
rename from 0030-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
rename to 0029-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
diff --git a/0031-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0030-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
similarity index 100%
rename from 0031-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
rename to 0030-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
diff --git a/0032-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0031-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
similarity index 100%
rename from 0032-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
rename to 0031-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
diff --git a/0033-Try-prefix-if-fw_path-doesn-t-work.patch b/0032-Try-prefix-if-fw_path-doesn-t-work.patch
similarity index 100%
rename from 0033-Try-prefix-if-fw_path-doesn-t-work.patch
rename to 0032-Try-prefix-if-fw_path-doesn-t-work.patch
diff --git a/0034-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch b/0033-Use-rpm-s-sort-for-grub2-mkconfig.patch
similarity index 87%
rename from 0034-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
rename to 0033-Use-rpm-s-sort-for-grub2-mkconfig.patch
index 78a6fa1b..ff1c13ec 100644
--- a/0034-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
+++ b/0033-Use-rpm-s-sort-for-grub2-mkconfig.patch
@@ -1,23 +1,26 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Robert Marshall <rmarshall@redhat.com>
 Date: Mon, 16 Mar 2015 14:14:19 -0400
-Subject: [PATCH] Use Distribution Package Sort for grub2-mkconfig (#1124074)
+Subject: [PATCH] Use rpm's sort for grub2-mkconfig
 
-Users reported that newly installed kernels on their systems installed
-with grub-mkconfig would not appear on the grub boot list in order
-starting with the most recent. Added an option for rpm-based systems to
-use the rpm-sort library to sort kernels instead.
-
-Resolves rhbz#1124074
+Add an option for rpm-based systems to use the rpm-sort library to sort
+kernels.  This avoids problems due to discrepancies between `sort -V`
+and rpm.
 
 Signed-off-by: Robert Marshall <rmarshall@redhat.com>
 [pjones: fix --enable-rpm-sort configure option]
 Signed-off-by: Peter Jones <pjones@redhat.com>
 [thierry.vignaud: fix build with rpm-4.16]
 Signed-off-by: Thierry Vignaud <thierry.vignaud@gmail.com>
+[tim: fix disabling grub-rpm-sort by ./configure]
+Signed-off-by: Tim Landscheidt <tim@tim-landscheidt.de>
+[javierm: don't check for rpmvercmp in librpm]
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+[rharwood: commit message]
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- configure.ac              |  38 +++++++
- Makefile.util.def         |  16 +++
+ configure.ac              |  37 ++++++
+ Makefile.util.def         |  17 +++
  util/grub-rpm-sort.c      | 281 ++++++++++++++++++++++++++++++++++++++++++++++
  util/grub-mkconfig_lib.in |  11 +-
  util/grub-rpm-sort.8      |  12 ++
@@ -26,7 +29,7 @@ Signed-off-by: Thierry Vignaud <thierry.vignaud@gmail.com>
  create mode 100644 util/grub-rpm-sort.8
 
 diff --git a/configure.ac b/configure.ac
-index bec8535af70..fdcb452581c 100644
+index bec8535af70..643a13f9147 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
@@ -45,7 +48,7 @@ index bec8535af70..fdcb452581c 100644
  grub_TRANSFORM([grub-reboot.3])
  grub_TRANSFORM([grub-render-label.3])
  grub_TRANSFORM([grub-script-check.3])
-@@ -1860,6 +1862,42 @@ fi
+@@ -1860,6 +1862,35 @@ fi
  
  AC_SUBST([LIBDEVMAPPER])
  
@@ -54,6 +57,8 @@ index bec8535af70..fdcb452581c 100644
 +                              [enable native rpm sorting of kernels in grub (default=guessed)])])
 +if test x"$enable_rpm_sort" = xno ; then
 +  rpm_sort_excuse="explicitly disabled"
++else
++  enable_rpm_sort=yes
 +fi
 +
 +if test x"$rpm_sort_excuse" = x ; then
@@ -63,24 +68,15 @@ index bec8535af70..fdcb452581c 100644
 +fi
 +
 +if test x"$rpm_sort_excuse" = x ; then
-+  # Check for rpm library.
-+  AC_CHECK_LIB([rpm], [rpmvercmp], [],
-+               [rpm_sort_excuse="rpmlib missing rpmvercmp"])
++  # Check for rpmio library.
++  AC_CHECK_LIB([rpmio], [rpmvercmp], [],
++               [rpm_sort_excuse="rpmio missing rpmvercmp"])
 +fi
 +
 +if test x"$rpm_sort_excuse" = x ; then
-+   LIBRPM="-lrpm";
-+   AC_DEFINE([HAVE_RPM], [1],
-+             [Define to 1 if you have the rpm library.])
-+fi
-+
-+if test x"$LIBRPM" = x ; then
-+  # Check for rpm library.
-+  AC_CHECK_LIB([rpmio], [rpmvercmp], [],
-+               [rpm_sort_excuse="rpmio missing rpmvercmp"])
 +   LIBRPM="-lrpmio";
 +   AC_DEFINE([HAVE_RPMIO], [1],
-+             [Define to 1 if you have the rpm library.])
++             [Define to 1 if you have the rpmio library.])
 +fi
 +
 +AC_SUBST([LIBRPM])
@@ -88,11 +84,31 @@ index bec8535af70..fdcb452581c 100644
  LIBGEOM=
  if test x$host_kernel = xkfreebsd; then
    AC_CHECK_LIB([geom], [geom_gettree], [],
+@@ -2047,6 +2078,7 @@ AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes])
+ AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes])
+ AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
+ AM_CONDITIONAL([COND_GRUB_MOUNT], [test x$enable_grub_mount = xyes])
++AM_CONDITIONAL([COND_GRUB_RPM_SORT], [test x$enable_rpm_sort = xyes])
+ AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
+ if test x$FONT_SOURCE != x ; then
+    HAVE_FONT_SOURCE=1
+@@ -2168,6 +2200,11 @@ echo grub-mount: Yes
+ else
+ echo grub-mount: No "($grub_mount_excuse)"
+ fi
++if [ x"$rpm_sort_excuse" = x ]; then
++echo grub-rpm-sort: Yes
++else
++echo grub-rpm-sort: No "($rpm_sort_excuse)"
++fi
+ if [ x"$starfield_excuse" = x ]; then
+ echo starfield theme: Yes
+ echo With DejaVuSans font from $DJVU_FONT_SOURCE
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 2c9b283a230..ba4cf4b29b0 100644
+index 2c9b283a230..bc10cc79722 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -703,6 +703,22 @@ program = {
+@@ -703,6 +703,23 @@ program = {
    ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  };
  
@@ -110,6 +126,7 @@ index 2c9b283a230..ba4cf4b29b0 100644
 +  ldadd = libgrubkern.a;
 +  ldadd = grub-core/lib/gnulib/libgnu.a;
 +  ldadd = '$(LIBDEVMAPPER) $(LIBRPM)';
++  condition = COND_GRUB_RPM_SORT;
 +};
 +
  script = {
diff --git a/0035-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0034-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
similarity index 100%
rename from 0035-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
rename to 0034-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
diff --git a/0036-Add-friendly-grub2-password-config-tool-985962.patch b/0035-Add-friendly-grub2-password-config-tool-985962.patch
similarity index 98%
rename from 0036-Add-friendly-grub2-password-config-tool-985962.patch
rename to 0035-Add-friendly-grub2-password-config-tool-985962.patch
index 9807d0ea..2d6f18a6 100644
--- a/0036-Add-friendly-grub2-password-config-tool-985962.patch
+++ b/0035-Add-friendly-grub2-password-config-tool-985962.patch
@@ -27,7 +27,7 @@ Andy Lutomirski <luto@kernel.org>
  create mode 100644 util/grub.d/01_users.in
 
 diff --git a/configure.ac b/configure.ac
-index fdcb452581c..30fd84d8067 100644
+index 643a13f9147..25e1abb59b9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
@@ -39,7 +39,7 @@ index fdcb452581c..30fd84d8067 100644
  grub_TRANSFORM([grub-script-check])
  grub_TRANSFORM([grub-set-default])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index ba4cf4b29b0..1a7dd433e33 100644
+index bc10cc79722..8ca4c14f0b9 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -452,6 +452,12 @@ script = {
@@ -55,7 +55,7 @@ index ba4cf4b29b0..1a7dd433e33 100644
  script = {
    name = '10_windows';
    common = util/grub.d/10_windows.in;
-@@ -740,6 +746,13 @@ script = {
+@@ -741,6 +747,13 @@ script = {
    installdir = sbin;
  };
  
diff --git a/0037-tcp-add-window-scaling-support.patch b/0036-tcp-add-window-scaling-support.patch
similarity index 100%
rename from 0037-tcp-add-window-scaling-support.patch
rename to 0036-tcp-add-window-scaling-support.patch
diff --git a/0038-efinet-and-bootp-add-support-for-dhcpv6.patch b/0037-efinet-and-bootp-add-support-for-dhcpv6.patch
similarity index 100%
rename from 0038-efinet-and-bootp-add-support-for-dhcpv6.patch
rename to 0037-efinet-and-bootp-add-support-for-dhcpv6.patch
diff --git a/0039-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0038-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
similarity index 98%
rename from 0039-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
rename to 0038-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
index f203685b..bf78c813 100644
--- a/0039-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
+++ b/0038-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
@@ -23,7 +23,7 @@ Resolves: rhbz#1226325
  create mode 100644 util/grub-get-kernel-settings.in
 
 diff --git a/configure.ac b/configure.ac
-index 30fd84d8067..ed31ea457d2 100644
+index 25e1abb59b9..58e57a745fa 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-install])
@@ -43,10 +43,10 @@ index 30fd84d8067..ed31ea457d2 100644
  grub_TRANSFORM([grub-install.1])
  grub_TRANSFORM([grub-kbdcomp.3])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 1a7dd433e33..cdd2f51fe4b 100644
+index 8ca4c14f0b9..43a1c7453b1 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -732,6 +732,13 @@ script = {
+@@ -733,6 +733,13 @@ script = {
    installdir = sbin;
  };
  
diff --git a/0040-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0039-bz1374141-fix-incorrect-mask-for-ppc64.patch
similarity index 95%
rename from 0040-bz1374141-fix-incorrect-mask-for-ppc64.patch
rename to 0039-bz1374141-fix-incorrect-mask-for-ppc64.patch
index 1bb26586..ef992f5d 100644
--- a/0040-bz1374141-fix-incorrect-mask-for-ppc64.patch
+++ b/0039-bz1374141-fix-incorrect-mask-for-ppc64.patch
@@ -25,6 +25,9 @@ This patch changes it as below.
 0000 0000 0000 0000 0000 0011 1111 1111 # ~grub_swap_bytes32(grub_le_to_cpu32 (subnet_mask.ipv4))
 
 The count of zero with __builtin_clz can be 22. (clz counts the number of one bits preceding the most significant zero bit)
+
+Signed-off-by: Masahiro Matsuya <mmatsuya@redhat.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/net/drivers/ieee1275/ofnet.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/0041-Make-grub_fatal-also-backtrace.patch b/0040-Make-grub_fatal-also-backtrace.patch
similarity index 100%
rename from 0041-Make-grub_fatal-also-backtrace.patch
rename to 0040-Make-grub_fatal-also-backtrace.patch
diff --git a/0042-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0041-Fix-up-some-man-pages-rpmdiff-noticed.patch
similarity index 99%
rename from 0042-Fix-up-some-man-pages-rpmdiff-noticed.patch
rename to 0041-Fix-up-some-man-pages-rpmdiff-noticed.patch
index 8016a621..be584175 100644
--- a/0042-Fix-up-some-man-pages-rpmdiff-noticed.patch
+++ b/0041-Fix-up-some-man-pages-rpmdiff-noticed.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] Fix up some man pages rpmdiff noticed.
  create mode 100644 util/grub-syslinux2cfg.1
 
 diff --git a/configure.ac b/configure.ac
-index ed31ea457d2..537ed411469 100644
+index 58e57a745fa..a0030632220 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -87,6 +87,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
diff --git a/0043-Make-our-info-pages-say-grub2-where-appropriate.patch b/0042-Make-our-info-pages-say-grub2-where-appropriate.patch
similarity index 100%
rename from 0043-Make-our-info-pages-say-grub2-where-appropriate.patch
rename to 0042-Make-our-info-pages-say-grub2-where-appropriate.patch
diff --git a/0044-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0043-macos-just-build-chainloader-entries-don-t-try-any-x.patch
similarity index 100%
rename from 0044-macos-just-build-chainloader-entries-don-t-try-any-x.patch
rename to 0043-macos-just-build-chainloader-entries-don-t-try-any-x.patch
diff --git a/0045-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0044-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
similarity index 100%
rename from 0045-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
rename to 0044-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
diff --git a/0046-export-btrfs_subvol-and-btrfs_subvolid.patch b/0045-export-btrfs_subvol-and-btrfs_subvolid.patch
similarity index 100%
rename from 0046-export-btrfs_subvol-and-btrfs_subvolid.patch
rename to 0045-export-btrfs_subvol-and-btrfs_subvolid.patch
diff --git a/0047-grub2-btrfs-03-follow_default.patch b/0046-grub2-btrfs-03-follow_default.patch
similarity index 100%
rename from 0047-grub2-btrfs-03-follow_default.patch
rename to 0046-grub2-btrfs-03-follow_default.patch
diff --git a/0048-grub2-btrfs-04-grub2-install.patch b/0047-grub2-btrfs-04-grub2-install.patch
similarity index 100%
rename from 0048-grub2-btrfs-04-grub2-install.patch
rename to 0047-grub2-btrfs-04-grub2-install.patch
diff --git a/0049-grub2-btrfs-05-grub2-mkconfig.patch b/0048-grub2-btrfs-05-grub2-mkconfig.patch
similarity index 100%
rename from 0049-grub2-btrfs-05-grub2-mkconfig.patch
rename to 0048-grub2-btrfs-05-grub2-mkconfig.patch
diff --git a/0050-grub2-btrfs-06-subvol-mount.patch b/0049-grub2-btrfs-06-subvol-mount.patch
similarity index 100%
rename from 0050-grub2-btrfs-06-subvol-mount.patch
rename to 0049-grub2-btrfs-06-subvol-mount.patch
diff --git a/0051-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0050-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
similarity index 100%
rename from 0051-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
rename to 0050-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
diff --git a/0052-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0051-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
similarity index 100%
rename from 0052-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
rename to 0051-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
diff --git a/0053-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0052-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
similarity index 100%
rename from 0053-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
rename to 0052-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
diff --git a/0054-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0053-Use-grub_efi_.-memory-helpers-where-reasonable.patch
similarity index 89%
rename from 0054-Use-grub_efi_.-memory-helpers-where-reasonable.patch
rename to 0053-Use-grub_efi_.-memory-helpers-where-reasonable.patch
index 4fa92c0d..ccdf2829 100644
--- a/0054-Use-grub_efi_.-memory-helpers-where-reasonable.patch
+++ b/0053-Use-grub_efi_.-memory-helpers-where-reasonable.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 9 insertions(+), 15 deletions(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 3ff305b1d32..ba3d2930197 100644
+index 07c4937898d..89ac84cc663 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -65,7 +65,7 @@ grub_chainloader_unload (void)
@@ -34,7 +34,7 @@ index 3ff305b1d32..ba3d2930197 100644
  
    grub_loader_unset ();
  
-@@ -523,10 +523,9 @@ grub_efi_get_media_file_path (grub_efi_device_path_t *dp)
+@@ -527,10 +527,9 @@ grub_efi_get_media_file_path (grub_efi_device_path_t *dp)
  static grub_efi_boolean_t
  handle_image (void *data, grub_efi_uint32_t datasize)
  {
@@ -46,7 +46,7 @@ index 3ff305b1d32..ba3d2930197 100644
    char *buffer_aligned = NULL;
    grub_efi_uint32_t i;
    struct grub_pe32_section_table *section;
-@@ -537,8 +536,6 @@ handle_image (void *data, grub_efi_uint32_t datasize)
+@@ -541,8 +540,6 @@ handle_image (void *data, grub_efi_uint32_t datasize)
    int found_entry_point = 0;
    int rc;
  
@@ -55,7 +55,7 @@ index 3ff305b1d32..ba3d2930197 100644
    rc = read_header (data, datasize, &context);
    if (rc < 0)
      {
-@@ -578,8 +575,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
+@@ -582,8 +579,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
    grub_dprintf ("chain", "image size is %08"PRIxGRUB_UINT64_T", datasize is %08x\n",
  	       context.image_size, datasize);
  
@@ -66,7 +66,7 @@ index 3ff305b1d32..ba3d2930197 100644
  
    if (efi_status != GRUB_EFI_SUCCESS)
      {
-@@ -811,14 +808,14 @@ handle_image (void *data, grub_efi_uint32_t datasize)
+@@ -815,14 +812,14 @@ handle_image (void *data, grub_efi_uint32_t datasize)
  
    grub_dprintf ("chain", "entry_point returned %ld\n", efi_status);
    grub_memcpy (li, &li_bak, sizeof (grub_efi_loaded_image_t));
@@ -83,7 +83,7 @@ index 3ff305b1d32..ba3d2930197 100644
  
    return 0;
  }
-@@ -826,10 +823,7 @@ error_exit:
+@@ -830,10 +827,7 @@ error_exit:
  static grub_err_t
  grub_secureboot_chainloader_unload (void)
  {
@@ -95,7 +95,7 @@ index 3ff305b1d32..ba3d2930197 100644
    grub_free (file_path);
    grub_free (cmdline);
    cmdline = 0;
-@@ -1096,7 +1090,7 @@ fail:
+@@ -1100,7 +1094,7 @@ fail:
    grub_free (file_path);
  
    if (address)
diff --git a/0055-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0054-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
similarity index 94%
rename from 0055-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
rename to 0054-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
index 1a96b433..ef41fe1a 100644
--- a/0055-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
+++ b/0054-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
@@ -12,10 +12,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index ba3d2930197..47f5aa14817 100644
+index 89ac84cc663..ac8dfd40c61 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
-@@ -806,7 +806,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
+@@ -810,7 +810,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
    efi_status = efi_call_2 (entry_point, grub_efi_image_handle,
  			   grub_efi_system_table);
  
diff --git a/0056-don-t-use-int-for-efi-status.patch b/0055-don-t-use-int-for-efi-status.patch
similarity index 100%
rename from 0056-don-t-use-int-for-efi-status.patch
rename to 0055-don-t-use-int-for-efi-status.patch
diff --git a/0057-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0056-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
similarity index 100%
rename from 0057-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
rename to 0056-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
diff --git a/0058-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0057-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
similarity index 100%
rename from 0058-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
rename to 0057-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
diff --git a/0059-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/0058-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
similarity index 100%
rename from 0059-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
rename to 0058-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
diff --git a/0060-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch b/0059-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
similarity index 100%
rename from 0060-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
rename to 0059-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
diff --git a/0061-align-struct-efi_variable-better.patch b/0060-align-struct-efi_variable-better.patch
similarity index 100%
rename from 0061-align-struct-efi_variable-better.patch
rename to 0060-align-struct-efi_variable-better.patch
diff --git a/0062-Add-BLS-support-to-grub-mkconfig.patch b/0061-Add-BLS-support-to-grub-mkconfig.patch
similarity index 98%
rename from 0062-Add-BLS-support-to-grub-mkconfig.patch
rename to 0061-Add-BLS-support-to-grub-mkconfig.patch
index 9679fb9f..f7c8064e 100644
--- a/0062-Add-BLS-support-to-grub-mkconfig.patch
+++ b/0061-Add-BLS-support-to-grub-mkconfig.patch
@@ -20,7 +20,9 @@ kernels are found in the boot directory were proposed by Yclept Nemo
 and Tom Gundersen respectively.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
+[javierm: remove outdated URL for BLS document]
 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  util/grub-mkconfig.8      |   4 +
  util/grub-mkconfig.in     |   9 +-
@@ -141,7 +143,7 @@ index fafeac95061..d8bb4069360 100644
    fi
    IFS="$old_ifs"
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 7bb3a211a7c..fdf324b7ab1 100644
+index 7bb3a211a7c..6bceabf3dc9 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -82,6 +82,223 @@ case x"$GRUB_FS" in
@@ -162,7 +164,7 @@ index 7bb3a211a7c..fdf324b7ab1 100644
 +#
 +# The $bls_parser parses the BootLoaderSpec files stored in /boot/loader/entries and
 +# populates the boot menu. Please refer to the Boot Loader Specification documentation
-+# for the files format: https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec/.
++# for the files format: https://systemd.io/BOOT_LOADER_SPECIFICATION/.
 +
 +EOF
 +}
diff --git a/0063-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch b/0062-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
similarity index 100%
rename from 0063-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
rename to 0062-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
diff --git a/0064-Add-linux-and-initrd-commands-for-grub-emu.patch b/0063-Add-linux-and-initrd-commands-for-grub-emu.patch
similarity index 100%
rename from 0064-Add-linux-and-initrd-commands-for-grub-emu.patch
rename to 0063-Add-linux-and-initrd-commands-for-grub-emu.patch
diff --git a/0065-Add-grub2-switch-to-blscfg.patch b/0064-Add-grub2-switch-to-blscfg.patch
similarity index 99%
rename from 0065-Add-grub2-switch-to-blscfg.patch
rename to 0064-Add-grub2-switch-to-blscfg.patch
index ce40e907..ac30490f 100644
--- a/0065-Add-grub2-switch-to-blscfg.patch
+++ b/0064-Add-grub2-switch-to-blscfg.patch
@@ -17,10 +17,10 @@ Signed-off-by: Jan Hlavac <jhlavac@redhat.com>
  create mode 100644 util/grub-switch-to-blscfg.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index cdd2f51fe4b..afc4d7b0c3e 100644
+index 43a1c7453b1..a90879fa9ba 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -1364,6 +1364,13 @@ program = {
+@@ -1365,6 +1365,13 @@ program = {
    ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  };
  
diff --git a/0066-make-better-backtraces.patch b/0065-make-better-backtraces.patch
similarity index 99%
rename from 0066-make-better-backtraces.patch
rename to 0065-make-better-backtraces.patch
index a65af3db..63765671 100644
--- a/0066-make-better-backtraces.patch
+++ b/0065-make-better-backtraces.patch
@@ -38,7 +38,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  delete mode 100644 grub-core/lib/i386/backtrace.c
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index afc4d7b0c3e..41906486a71 100644
+index a90879fa9ba..48512bc6311 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -51,6 +51,12 @@ library = {
diff --git a/0067-normal-don-t-draw-our-startup-message-if-debug-is-se.patch b/0066-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
similarity index 100%
rename from 0067-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
rename to 0066-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
diff --git a/0068-Work-around-some-minor-include-path-weirdnesses.patch b/0067-Work-around-some-minor-include-path-weirdnesses.patch
similarity index 100%
rename from 0068-Work-around-some-minor-include-path-weirdnesses.patch
rename to 0067-Work-around-some-minor-include-path-weirdnesses.patch
diff --git a/0069-Make-it-possible-to-enabled-build-id-sha1.patch b/0068-Make-it-possible-to-enabled-build-id-sha1.patch
similarity index 98%
rename from 0069-Make-it-possible-to-enabled-build-id-sha1.patch
rename to 0068-Make-it-possible-to-enabled-build-id-sha1.patch
index 356a4d81..f68fc58b 100644
--- a/0069-Make-it-possible-to-enabled-build-id-sha1.patch
+++ b/0068-Make-it-possible-to-enabled-build-id-sha1.patch
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 27 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 537ed411469..b4455e4732d 100644
+index a0030632220..b50fb2e9897 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1470,7 +1470,15 @@ grub_PROG_TARGET_CC
diff --git a/0070-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch b/0069-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
similarity index 100%
rename from 0070-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
rename to 0069-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
diff --git a/0071-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/0070-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
similarity index 100%
rename from 0071-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
rename to 0070-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
diff --git a/0072-Fixup-for-newer-compiler.patch b/0071-Fixup-for-newer-compiler.patch
similarity index 100%
rename from 0072-Fixup-for-newer-compiler.patch
rename to 0071-Fixup-for-newer-compiler.patch
diff --git a/0073-Don-t-attempt-to-export-the-start-and-_start-symbols.patch b/0072-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
similarity index 100%
rename from 0073-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
rename to 0072-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
diff --git a/0074-Fixup-for-newer-compiler.patch b/0073-Fixup-for-newer-compiler.patch
similarity index 100%
rename from 0074-Fixup-for-newer-compiler.patch
rename to 0073-Fixup-for-newer-compiler.patch
diff --git a/0075-Add-support-for-non-Ethernet-network-cards.patch b/0074-Add-support-for-non-Ethernet-network-cards.patch
similarity index 100%
rename from 0075-Add-support-for-non-Ethernet-network-cards.patch
rename to 0074-Add-support-for-non-Ethernet-network-cards.patch
diff --git a/0076-net-read-bracketed-ipv6-addrs-and-port-numbers.patch b/0075-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
similarity index 100%
rename from 0076-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
rename to 0075-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
diff --git a/0077-bootp-New-net_bootp6-command.patch b/0076-bootp-New-net_bootp6-command.patch
similarity index 100%
rename from 0077-bootp-New-net_bootp6-command.patch
rename to 0076-bootp-New-net_bootp6-command.patch
diff --git a/0078-efinet-UEFI-IPv6-PXE-support.patch b/0077-efinet-UEFI-IPv6-PXE-support.patch
similarity index 100%
rename from 0078-efinet-UEFI-IPv6-PXE-support.patch
rename to 0077-efinet-UEFI-IPv6-PXE-support.patch
diff --git a/0079-grub.texi-Add-net_bootp6-doument.patch b/0078-grub.texi-Add-net_bootp6-doument.patch
similarity index 100%
rename from 0079-grub.texi-Add-net_bootp6-doument.patch
rename to 0078-grub.texi-Add-net_bootp6-doument.patch
diff --git a/0080-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch b/0079-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
similarity index 100%
rename from 0080-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
rename to 0079-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
diff --git a/0081-efinet-Setting-network-from-UEFI-device-path.patch b/0080-efinet-Setting-network-from-UEFI-device-path.patch
similarity index 100%
rename from 0081-efinet-Setting-network-from-UEFI-device-path.patch
rename to 0080-efinet-Setting-network-from-UEFI-device-path.patch
diff --git a/0082-efinet-Setting-DNS-server-from-UEFI-protocol.patch b/0081-efinet-Setting-DNS-server-from-UEFI-protocol.patch
similarity index 100%
rename from 0082-efinet-Setting-DNS-server-from-UEFI-protocol.patch
rename to 0081-efinet-Setting-DNS-server-from-UEFI-protocol.patch
diff --git a/0083-Support-UEFI-networking-protocols.patch b/0082-Support-UEFI-networking-protocols.patch
similarity index 100%
rename from 0083-Support-UEFI-networking-protocols.patch
rename to 0082-Support-UEFI-networking-protocols.patch
diff --git a/0084-AUDIT-0-http-boot-tracker-bug.patch b/0083-AUDIT-0-http-boot-tracker-bug.patch
similarity index 100%
rename from 0084-AUDIT-0-http-boot-tracker-bug.patch
rename to 0083-AUDIT-0-http-boot-tracker-bug.patch
diff --git a/0085-grub-editenv-Add-incr-command-to-increment-integer-v.patch b/0084-grub-editenv-Add-incr-command-to-increment-integer-v.patch
similarity index 100%
rename from 0085-grub-editenv-Add-incr-command-to-increment-integer-v.patch
rename to 0084-grub-editenv-Add-incr-command-to-increment-integer-v.patch
diff --git a/0086-Add-auto-hide-menu-support.patch b/0085-Add-auto-hide-menu-support.patch
similarity index 99%
rename from 0086-Add-auto-hide-menu-support.patch
rename to 0085-Add-auto-hide-menu-support.patch
index efb76c40..863cd053 100644
--- a/0086-Add-auto-hide-menu-support.patch
+++ b/0085-Add-auto-hide-menu-support.patch
@@ -49,7 +49,7 @@ Changes in v2:
  create mode 100644 util/grub.d/01_menu_auto_hide.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 41906486a71..04551e095bd 100644
+index 48512bc6311..314e6f2acf8 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -458,6 +458,12 @@ script = {
diff --git a/0087-Add-grub-set-bootflag-utility.patch b/0086-Add-grub-set-bootflag-utility.patch
similarity index 95%
rename from 0087-Add-grub-set-bootflag-utility.patch
rename to 0086-Add-grub-set-bootflag-utility.patch
index f5ff7d38..e39f8beb 100644
--- a/0087-Add-grub-set-bootflag-utility.patch
+++ b/0086-Add-grub-set-bootflag-utility.patch
@@ -31,24 +31,27 @@ and a symlink to grub-boot-success.timer should be added to
 /lib/systemd/user/timers.target.wants.
 
 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+[makhomed: grub-boot-success.timer: Only run if not in a container]
+Signed-off-by: Gena Makhomed <makhomed@gmail.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  Makefile.util.def              |   7 ++
  util/grub-set-bootflag.c       | 160 +++++++++++++++++++++++++++++++++++++++++
  conf/Makefile.extra-dist       |   3 +
  docs/grub-boot-success.service |   6 ++
- docs/grub-boot-success.timer   |   6 ++
+ docs/grub-boot-success.timer   |   7 ++
  util/grub-set-bootflag.1       |  20 ++++++
- 6 files changed, 202 insertions(+)
+ 6 files changed, 203 insertions(+)
  create mode 100644 util/grub-set-bootflag.c
  create mode 100644 docs/grub-boot-success.service
  create mode 100644 docs/grub-boot-success.timer
  create mode 100644 util/grub-set-bootflag.1
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 04551e095bd..c6375933faa 100644
+index 314e6f2acf8..0b85a7fce4a 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -1445,3 +1445,10 @@ program = {
+@@ -1446,3 +1446,10 @@ program = {
    ldadd = grub-core/lib/gnulib/libgnu.a;
    ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  };
@@ -253,13 +256,14 @@ index 00000000000..80e79584c91
 +ExecStart=/usr/sbin/grub2-set-bootflag boot_success
 diff --git a/docs/grub-boot-success.timer b/docs/grub-boot-success.timer
 new file mode 100644
-index 00000000000..5d8fcba21aa
+index 00000000000..406f1720056
 --- /dev/null
 +++ b/docs/grub-boot-success.timer
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,7 @@
 +[Unit]
 +Description=Mark boot as successful after the user session has run 2 minutes
 +ConditionUser=!@system
++ConditionVirtualization=!container
 +
 +[Timer]
 +OnActiveSec=2min
diff --git a/0088-docs-Add-grub-boot-indeterminate.service-example.patch b/0087-docs-Add-grub-boot-indeterminate.service-example.patch
similarity index 100%
rename from 0088-docs-Add-grub-boot-indeterminate.service-example.patch
rename to 0087-docs-Add-grub-boot-indeterminate.service-example.patch
diff --git a/0089-gentpl-add-disable-support.patch b/0088-gentpl-add-disable-support.patch
similarity index 100%
rename from 0089-gentpl-add-disable-support.patch
rename to 0088-gentpl-add-disable-support.patch
diff --git a/0090-gentpl-add-pc-firmware-type.patch b/0089-gentpl-add-pc-firmware-type.patch
similarity index 100%
rename from 0090-gentpl-add-pc-firmware-type.patch
rename to 0089-gentpl-add-pc-firmware-type.patch
diff --git a/0091-efinet-also-use-the-firmware-acceleration-for-http.patch b/0090-efinet-also-use-the-firmware-acceleration-for-http.patch
similarity index 100%
rename from 0091-efinet-also-use-the-firmware-acceleration-for-http.patch
rename to 0090-efinet-also-use-the-firmware-acceleration-for-http.patch
diff --git a/0092-efi-http-Make-root_url-reflect-the-protocol-hostname.patch b/0091-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
similarity index 100%
rename from 0092-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
rename to 0091-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
diff --git a/0093-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch b/0092-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
similarity index 98%
rename from 0093-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
rename to 0092-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
index b65eafcc..ee2216e5 100644
--- a/0093-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
+++ b/0092-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
@@ -17,7 +17,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  3 files changed, 64 insertions(+), 16 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index b4455e4732d..3405348178a 100644
+index b50fb2e9897..b27573b3de5 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -877,11 +877,23 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
@@ -45,7 +45,7 @@ index b4455e4732d..3405348178a 100644
    AC_CACHE_CHECK([for options to get soft-float], grub_cv_target_cc_soft_float, [
      grub_cv_target_cc_soft_float=no
      if test "x$target_cpu" = xarm64; then
-@@ -2018,6 +2030,41 @@ HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
+@@ -2011,6 +2023,41 @@ HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_srcdir)/include"
  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_builddir)/include"
  
diff --git a/0094-module-verifier-make-it-possible-to-run-checkers-on-.patch b/0093-module-verifier-make-it-possible-to-run-checkers-on-.patch
similarity index 100%
rename from 0094-module-verifier-make-it-possible-to-run-checkers-on-.patch
rename to 0093-module-verifier-make-it-possible-to-run-checkers-on-.patch
diff --git a/0095-Rework-how-the-fdt-command-builds.patch b/0094-Rework-how-the-fdt-command-builds.patch
similarity index 84%
rename from 0095-Rework-how-the-fdt-command-builds.patch
rename to 0094-Rework-how-the-fdt-command-builds.patch
index 71328da1..e233067a 100644
--- a/0095-Rework-how-the-fdt-command-builds.patch
+++ b/0094-Rework-how-the-fdt-command-builds.patch
@@ -13,13 +13,16 @@ grub_fdt_load in xen_boot is not defined
 grub_fdt_unload in xen_boot is not defined
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
+[javierm: Fix build with platform emu, aarch64, and risc-v]
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/Makefile.core.def | 5 ++---
  grub-core/lib/fdt.c         | 2 --
  grub-core/loader/efi/fdt.c  | 2 ++
- include/grub/fdt.h          | 4 ++++
+ include/grub/fdt.h          | 6 ++++++
  grub-core/Makefile.am       | 1 +
- 5 files changed, 9 insertions(+), 5 deletions(-)
+ 5 files changed, 11 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
 index c40170f2dd2..84a3d89de9a 100644
@@ -85,23 +88,25 @@ index c86f283d756..c572415d38a 100644
  static void *fdt;
  
 diff --git a/include/grub/fdt.h b/include/grub/fdt.h
-index e609c7e4111..22b7c5463fc 100644
+index e609c7e4111..3514aa4a5b6 100644
 --- a/include/grub/fdt.h
 +++ b/include/grub/fdt.h
-@@ -19,6 +19,8 @@
+@@ -19,6 +19,9 @@
  #ifndef GRUB_FDT_HEADER
  #define GRUB_FDT_HEADER	1
  
-+#if defined(__arm__) || defined(__aarch64__)
++#if !defined(GRUB_MACHINE_EMU) && \
++    (defined(__arm__) || defined(__aarch64__) || defined(__riscv))
 +
  #include <grub/types.h>
  #include <grub/symbol.h>
  
-@@ -144,4 +146,6 @@ int EXPORT_FUNC(grub_fdt_set_prop) (void *fdt, unsigned int nodeoffset, const ch
+@@ -144,4 +147,7 @@ int EXPORT_FUNC(grub_fdt_set_prop) (void *fdt, unsigned int nodeoffset, const ch
    grub_fdt_set_prop ((fdt), (nodeoffset), "reg", reg_64, 16);  \
  })
  
-+#endif /* defined(__arm__) || defined(__aarch64__) */
++#endif /* !defined(GRUB_MACHINE_EMU) && \
++          (defined(__arm__) || defined(__aarch64__) || defined(__riscv)) */
 +
  #endif	/* ! GRUB_FDT_HEADER */
 diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
diff --git a/0096-Disable-non-wordsize-allocations-on-arm.patch b/0095-Disable-non-wordsize-allocations-on-arm.patch
similarity index 97%
rename from 0096-Disable-non-wordsize-allocations-on-arm.patch
rename to 0095-Disable-non-wordsize-allocations-on-arm.patch
index f614c9ee..e28041a1 100644
--- a/0096-Disable-non-wordsize-allocations-on-arm.patch
+++ b/0095-Disable-non-wordsize-allocations-on-arm.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 20 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 3405348178a..152e7dba652 100644
+index b27573b3de5..bb4e05ceef3 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1288,6 +1288,26 @@ if test "x$target_cpu" = xarm; then
diff --git a/0097-Prepend-prefix-when-HTTP-path-is-relative.patch b/0096-Prepend-prefix-when-HTTP-path-is-relative.patch
similarity index 100%
rename from 0097-Prepend-prefix-when-HTTP-path-is-relative.patch
rename to 0096-Prepend-prefix-when-HTTP-path-is-relative.patch
diff --git a/0098-Make-grub_error-more-verbose.patch b/0097-Make-grub_error-more-verbose.patch
similarity index 100%
rename from 0098-Make-grub_error-more-verbose.patch
rename to 0097-Make-grub_error-more-verbose.patch
diff --git a/0099-Make-reset-an-alias-for-the-reboot-command.patch b/0098-Make-reset-an-alias-for-the-reboot-command.patch
similarity index 100%
rename from 0099-Make-reset-an-alias-for-the-reboot-command.patch
rename to 0098-Make-reset-an-alias-for-the-reboot-command.patch
diff --git a/0100-Add-a-version-command.patch b/0099-Add-a-version-command.patch
similarity index 99%
rename from 0100-Add-a-version-command.patch
rename to 0099-Add-a-version-command.patch
index 30c8224f..bf3b4b80 100644
--- a/0100-Add-a-version-command.patch
+++ b/0099-Add-a-version-command.patch
@@ -17,7 +17,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  create mode 100644 grub-core/commands/version.c
 
 diff --git a/configure.ac b/configure.ac
-index 152e7dba652..cfdac6bed5a 100644
+index bb4e05ceef3..59ccda24475 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -312,6 +312,19 @@ AC_SUBST(target_cpu)
diff --git a/0101-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch b/0100-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
similarity index 100%
rename from 0101-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
rename to 0100-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
diff --git a/0102-arm-arm64-loader-Better-memory-allocation-and-error-.patch b/0101-arm-arm64-loader-Better-memory-allocation-and-error-.patch
similarity index 100%
rename from 0102-arm-arm64-loader-Better-memory-allocation-and-error-.patch
rename to 0101-arm-arm64-loader-Better-memory-allocation-and-error-.patch
diff --git a/0103-Try-to-pick-better-locations-for-kernel-and-initrd.patch b/0102-Try-to-pick-better-locations-for-kernel-and-initrd.patch
similarity index 91%
rename from 0103-Try-to-pick-better-locations-for-kernel-and-initrd.patch
rename to 0102-Try-to-pick-better-locations-for-kernel-and-initrd.patch
index ba918edf..06329b9c 100644
--- a/0103-Try-to-pick-better-locations-for-kernel-and-initrd.patch
+++ b/0102-Try-to-pick-better-locations-for-kernel-and-initrd.patch
@@ -23,6 +23,9 @@ Additionally, we now try to locate kernel+initrd+cmdline+etc below
 we try a higher address.
 
 Signed-off-by: Peter Jones <pjones@redhat.com>
+[david.abdurachmanov: fix macro for riscv64]
+Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/kern/efi/mm.c           |  8 ++++----
  grub-core/loader/i386/efi/linux.c | 24 +++++++++++++++++-------
@@ -30,8 +33,9 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  include/grub/arm64/efi/memory.h   |  1 +
  include/grub/i386/efi/memory.h    |  1 +
  include/grub/ia64/efi/memory.h    |  1 +
+ include/grub/riscv64/efi/memory.h |  1 +
  include/grub/x86_64/efi/memory.h  |  4 +++-
- 7 files changed, 28 insertions(+), 12 deletions(-)
+ 8 files changed, 29 insertions(+), 12 deletions(-)
 
 diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
 index 85ad4b4494c..e84961d078c 100644
@@ -176,6 +180,17 @@ index 2c64918e3f7..a4c2ec83502 100644
  #define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffff
 +#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS
  
+ #endif /* ! GRUB_MEMORY_CPU_HEADER */
+diff --git a/include/grub/riscv64/efi/memory.h b/include/grub/riscv64/efi/memory.h
+index c6cb3241714..acb61dca44b 100644
+--- a/include/grub/riscv64/efi/memory.h
++++ b/include/grub/riscv64/efi/memory.h
+@@ -2,5 +2,6 @@
+ #include <grub/efi/memory.h>
+ 
+ #define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffffffffULL
++#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS
+ 
  #endif /* ! GRUB_MEMORY_CPU_HEADER */
 diff --git a/include/grub/x86_64/efi/memory.h b/include/grub/x86_64/efi/memory.h
 index 46e9145a308..e81cfb32213 100644
diff --git a/0104-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch b/0103-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
similarity index 100%
rename from 0104-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
rename to 0103-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
diff --git a/0105-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch b/0104-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
similarity index 95%
rename from 0105-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
rename to 0104-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
index de71484b..1fa705e6 100644
--- a/0105-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
+++ b/0104-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
@@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index cfdac6bed5a..bd28edf3141 100644
+index 59ccda24475..6eb297fdbf6 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1480,11 +1480,11 @@ fi
@@ -29,7 +29,7 @@ index cfdac6bed5a..bd28edf3141 100644
  fi
  CPPFLAGS="$TARGET_CPPFLAGS"
  
-@@ -2054,6 +2054,14 @@ if test x"$enable_werror" != xno ; then
+@@ -2047,6 +2047,14 @@ if test x"$enable_werror" != xno ; then
    HOST_CFLAGS="$HOST_CFLAGS -Werror"
  fi
  
diff --git a/0106-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch b/0105-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
similarity index 100%
rename from 0106-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
rename to 0105-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
diff --git a/0107-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch b/0106-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
similarity index 100%
rename from 0107-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
rename to 0106-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
diff --git a/0108-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch b/0107-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
similarity index 100%
rename from 0108-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
rename to 0107-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
diff --git a/0109-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch b/0108-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
similarity index 100%
rename from 0109-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
rename to 0108-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
diff --git a/0110-Fix-getroot.c-s-trampolines.patch b/0109-Fix-getroot.c-s-trampolines.patch
similarity index 100%
rename from 0110-Fix-getroot.c-s-trampolines.patch
rename to 0109-Fix-getroot.c-s-trampolines.patch
diff --git a/0111-Do-not-allow-stack-trampolines-anywhere.patch b/0110-Do-not-allow-stack-trampolines-anywhere.patch
similarity index 93%
rename from 0111-Do-not-allow-stack-trampolines-anywhere.patch
rename to 0110-Do-not-allow-stack-trampolines-anywhere.patch
index 4ee639d4..2a3247af 100644
--- a/0111-Do-not-allow-stack-trampolines-anywhere.patch
+++ b/0110-Do-not-allow-stack-trampolines-anywhere.patch
@@ -10,10 +10,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index bd28edf3141..907477a585c 100644
+index 6eb297fdbf6..c6bd965f1f9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2062,6 +2062,9 @@ if test x"$enable_wextra" != xno ; then
+@@ -2055,6 +2055,9 @@ if test x"$enable_wextra" != xno ; then
    HOST_CFLAGS="$HOST_CFLAGS -Wextra"
  fi
  
diff --git a/0112-Reimplement-boot_counter.patch b/0111-Reimplement-boot_counter.patch
similarity index 99%
rename from 0112-Reimplement-boot_counter.patch
rename to 0111-Reimplement-boot_counter.patch
index 164b2291..a203929f 100644
--- a/0112-Reimplement-boot_counter.patch
+++ b/0111-Reimplement-boot_counter.patch
@@ -23,7 +23,7 @@ Signed-off-by: Christian Glombek <lorbus@fedoraproject.org>
  create mode 100644 util/grub.d/01_fallback_counting.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index c6375933faa..2e5e05b25f1 100644
+index 0b85a7fce4a..27a13bc734e 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -458,6 +458,12 @@ script = {
diff --git a/0113-Fix-menu-entry-selection-based-on-ID-and-title.patch b/0112-Fix-menu-entry-selection-based-on-ID-and-title.patch
similarity index 99%
rename from 0113-Fix-menu-entry-selection-based-on-ID-and-title.patch
rename to 0112-Fix-menu-entry-selection-based-on-ID-and-title.patch
index 84c13706..957fda38 100644
--- a/0113-Fix-menu-entry-selection-based-on-ID-and-title.patch
+++ b/0112-Fix-menu-entry-selection-based-on-ID-and-title.patch
@@ -24,7 +24,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 71 insertions(+), 70 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 37d753d8081..ea714d27176 100644
+index d7a222e681b..4a02aadb01c 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -164,12 +164,12 @@ grub_menu_set_timeout (int timeout)
diff --git a/0114-Make-the-menu-entry-users-option-argument-to-be-opti.patch b/0113-Make-the-menu-entry-users-option-argument-to-be-opti.patch
similarity index 100%
rename from 0114-Make-the-menu-entry-users-option-argument-to-be-opti.patch
rename to 0113-Make-the-menu-entry-users-option-argument-to-be-opti.patch
diff --git a/0115-Add-efi-export-env-and-efi-load-env-commands.patch b/0114-Add-efi-export-env-and-efi-load-env-commands.patch
similarity index 100%
rename from 0115-Add-efi-export-env-and-efi-load-env-commands.patch
rename to 0114-Add-efi-export-env-and-efi-load-env-commands.patch
diff --git a/0116-Make-it-possible-to-subtract-conditions-from-debug.patch b/0115-Make-it-possible-to-subtract-conditions-from-debug.patch
similarity index 100%
rename from 0116-Make-it-possible-to-subtract-conditions-from-debug.patch
rename to 0115-Make-it-possible-to-subtract-conditions-from-debug.patch
diff --git a/0117-Export-all-variables-from-the-initial-context-when-c.patch b/0116-Export-all-variables-from-the-initial-context-when-c.patch
similarity index 97%
rename from 0117-Export-all-variables-from-the-initial-context-when-c.patch
rename to 0116-Export-all-variables-from-the-initial-context-when-c.patch
index bfe31653..4e32260c 100644
--- a/0117-Export-all-variables-from-the-initial-context-when-c.patch
+++ b/0116-Export-all-variables-from-the-initial-context-when-c.patch
@@ -30,7 +30,7 @@ index ee53d4a68e5..87edd254c44 100644
  
  int grub_extractor_level = 0;
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index ea714d27176..d4832f17699 100644
+index 4a02aadb01c..fe2e77a43e2 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -375,8 +375,6 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
diff --git a/0118-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch b/0117-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
similarity index 99%
rename from 0118-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
rename to 0117-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
index 6797ffc4..92f259dc 100644
--- a/0118-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
+++ b/0117-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
@@ -21,7 +21,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  rename util/grub.d/{01_menu_auto_hide.in => 12_menu_auto_hide.in} (58%)
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 2e5e05b25f1..11ab2d6fad1 100644
+index 27a13bc734e..2e6ad979c3e 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -459,14 +459,14 @@ script = {
diff --git a/0119-Fix-systemctl-kexec-exit-status-check.patch b/0118-Fix-systemctl-kexec-exit-status-check.patch
similarity index 100%
rename from 0119-Fix-systemctl-kexec-exit-status-check.patch
rename to 0118-Fix-systemctl-kexec-exit-status-check.patch
diff --git a/0120-Print-grub-emu-linux-loader-messages-as-debug.patch b/0119-Print-grub-emu-linux-loader-messages-as-debug.patch
similarity index 100%
rename from 0120-Print-grub-emu-linux-loader-messages-as-debug.patch
rename to 0119-Print-grub-emu-linux-loader-messages-as-debug.patch
diff --git a/0121-Don-t-assume-that-boot-commands-will-only-return-on-.patch b/0120-Don-t-assume-that-boot-commands-will-only-return-on-.patch
similarity index 98%
rename from 0121-Don-t-assume-that-boot-commands-will-only-return-on-.patch
rename to 0120-Don-t-assume-that-boot-commands-will-only-return-on-.patch
index 418a1ef4..bd7b2c1b 100644
--- a/0121-Don-t-assume-that-boot-commands-will-only-return-on-.patch
+++ b/0120-Don-t-assume-that-boot-commands-will-only-return-on-.patch
@@ -17,7 +17,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 13 insertions(+), 10 deletions(-)
 
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index d4832f17699..14ceb9bb060 100644
+index fe2e77a43e2..ec0c92bade0 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -285,7 +285,7 @@ get_and_remove_first_entry_number (grub_menu_t menu, const char *name)
diff --git a/0123-Do-better-in-bootstrap.conf.patch b/0121-Do-better-in-bootstrap.conf.patch
similarity index 100%
rename from 0123-Do-better-in-bootstrap.conf.patch
rename to 0121-Do-better-in-bootstrap.conf.patch
diff --git a/0122-Fix-undefined-references-for-fdt-when-building-with-.patch b/0122-Fix-undefined-references-for-fdt-when-building-with-.patch
deleted file mode 100644
index 9065da8a..00000000
--- a/0122-Fix-undefined-references-for-fdt-when-building-with-.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Wed, 1 May 2019 00:36:19 +0200
-Subject: [PATCH] Fix undefined references for fdt when building with platform
- emu
-
-The fdt module isn't build for this platform, so adding the declarations
-with platform emu will lead to the following undefined reference errors:
-
-BUILDSTDERR: /usr/bin/ld: grub_emu_lite-symlist.o:(.data+0x500): undefined reference to `grub_fdt_add_subnode'
-BUILDSTDERR: /usr/bin/ld: grub_emu_lite-symlist.o:(.data+0x518): undefined reference to `grub_fdt_check_header'
-BUILDSTDERR: /usr/bin/ld: grub_emu_lite-symlist.o:(.data+0x530): undefined reference to `grub_fdt_check_header_nosize'
-BUILDSTDERR: /usr/bin/ld: grub_emu_lite-symlist.o:(.data+0x548): undefined reference to `grub_fdt_create_empty_tree'
-BUILDSTDERR: /usr/bin/ld: grub_emu_lite-symlist.o:(.data+0x560): undefined reference to `grub_fdt_find_subnode'
-BUILDSTDERR: /usr/bin/ld: grub_emu_lite-symlist.o:(.data+0x578): undefined reference to `grub_fdt_first_node'
-BUILDSTDERR: /usr/bin/ld: grub_emu_lite-symlist.o:(.data+0x590): undefined reference to `grub_fdt_get_nodename'
-BUILDSTDERR: /usr/bin/ld: grub_emu_lite-symlist.o:(.data+0x5a8): undefined reference to `grub_fdt_get_prop'
-BUILDSTDERR: /usr/bin/ld: grub_emu_lite-symlist.o:(.data+0x5c0): undefined reference to `grub_fdt_next_node'
-BUILDSTDERR: /usr/bin/ld: grub_emu_lite-symlist.o:(.data+0x5d8): undefined reference to `grub_fdt_set_prop'
-BUILDSTDERR: collect2: error: ld returned 1 exit status
-BUILDSTDERR: make[1]: *** [Makefile:27093: grub-emu-lite] Error 1
-BUILDSTDERR: make[1]: *** Waiting for unfinished jobs....
-
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
----
- include/grub/fdt.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/grub/fdt.h b/include/grub/fdt.h
-index 22b7c5463fc..2041341fd68 100644
---- a/include/grub/fdt.h
-+++ b/include/grub/fdt.h
-@@ -19,7 +19,7 @@
- #ifndef GRUB_FDT_HEADER
- #define GRUB_FDT_HEADER	1
- 
--#if defined(__arm__) || defined(__aarch64__)
-+#if !defined(GRUB_MACHINE_EMU) && (defined(__arm__) || defined(__aarch64__))
- 
- #include <grub/types.h>
- #include <grub/symbol.h>
diff --git a/0124-Use-git-to-apply-gnulib-patches.patch b/0122-Use-git-to-apply-gnulib-patches.patch
similarity index 100%
rename from 0124-Use-git-to-apply-gnulib-patches.patch
rename to 0122-Use-git-to-apply-gnulib-patches.patch
diff --git a/0126-grub-set-bootflag-Update-comment-about-running-as-ro.patch b/0123-grub-set-bootflag-Update-comment-about-running-as-ro.patch
similarity index 100%
rename from 0126-grub-set-bootflag-Update-comment-about-running-as-ro.patch
rename to 0123-grub-set-bootflag-Update-comment-about-running-as-ro.patch
diff --git a/0127-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch b/0124-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
similarity index 100%
rename from 0127-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
rename to 0124-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
diff --git a/0125-Fix-build-error-with-the-fdt-module-on-risc-v.patch b/0125-Fix-build-error-with-the-fdt-module-on-risc-v.patch
deleted file mode 100644
index 35f2878b..00000000
--- a/0125-Fix-build-error-with-the-fdt-module-on-risc-v.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Tue, 27 Aug 2019 10:34:24 +0200
-Subject: [PATCH] Fix build error with the fdt module on risc-v
-
-The risc-v architecture also uses Device Trees, but the symbols in the
-fdt header aren't defined for this arch which lead to following error:
-
-BUILDSTDERR: ../../grub-core/loader/efi/fdt.c: In function 'grub_fdt_load':
-BUILDSTDERR: ../../grub-core/loader/efi/fdt.c:48:39: warning: implicit declaration of function 'grub_fdt_get_totalsize' [-Wimplicit-function-declaration]
-BUILDSTDERR:    48 |       size = GRUB_EFI_BYTES_TO_PAGES (grub_fdt_get_totalsize (fdt));
-
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
----
- include/grub/fdt.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/include/grub/fdt.h b/include/grub/fdt.h
-index 2041341fd68..3514aa4a5b6 100644
---- a/include/grub/fdt.h
-+++ b/include/grub/fdt.h
-@@ -19,7 +19,8 @@
- #ifndef GRUB_FDT_HEADER
- #define GRUB_FDT_HEADER	1
- 
--#if !defined(GRUB_MACHINE_EMU) && (defined(__arm__) || defined(__aarch64__))
-+#if !defined(GRUB_MACHINE_EMU) && \
-+    (defined(__arm__) || defined(__aarch64__) || defined(__riscv))
- 
- #include <grub/types.h>
- #include <grub/symbol.h>
-@@ -146,6 +147,7 @@ int EXPORT_FUNC(grub_fdt_set_prop) (void *fdt, unsigned int nodeoffset, const ch
-   grub_fdt_set_prop ((fdt), (nodeoffset), "reg", reg_64, 16);  \
- })
- 
--#endif /* defined(__arm__) || defined(__aarch64__) */
-+#endif /* !defined(GRUB_MACHINE_EMU) && \
-+          (defined(__arm__) || defined(__aarch64__) || defined(__riscv)) */
- 
- #endif	/* ! GRUB_FDT_HEADER */
diff --git a/0128-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch b/0125-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
similarity index 91%
rename from 0128-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
rename to 0125-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
index 54b73e6c..a32c1465 100644
--- a/0128-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
+++ b/0125-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
@@ -3,6 +3,9 @@ From: Hans de Goede <hdegoede@redhat.com>
 Date: Tue, 26 Nov 2019 09:51:41 +0100
 Subject: [PATCH] grub.d: Fix boot_indeterminate getting set on boot_success=0
  boot
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 The "grub.d: Split out boot success reset from menu auto hide script"
 not only moved the code to clear boot_success and boot_indeterminate
@@ -42,12 +45,15 @@ boot_indeterminate to 2 when it was 1 before.
 
 Fixes: "grub.d: Split out boot success reset from menu auto hide script"
 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+[jpokorny: 01_menu_auto_hide.in: fix a then/than typo]
+Signed-off-by: Jan Pokorný <jpokorny@fedoraproject.org>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  util/grub.d/10_reset_boot_success.in | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/util/grub.d/10_reset_boot_success.in b/util/grub.d/10_reset_boot_success.in
-index 6c88d933dde..737e1ae5b68 100644
+index 6c88d933dde..e73f4137b36 100644
 --- a/util/grub.d/10_reset_boot_success.in
 +++ b/util/grub.d/10_reset_boot_success.in
 @@ -6,18 +6,18 @@
@@ -67,7 +73,7 @@ index 6c88d933dde..737e1ae5b68 100644
    set boot_indeterminate=0
 -else
 -  increment boot_indeterminate
-+# Avoid boot_indeterminate causing the menu to be hidden more then once
++# Avoid boot_indeterminate causing the menu to be hidden more than once
 +elif [ "\${boot_indeterminate}" = "1" ]; then
 +  set boot_indeterminate=2
  fi
diff --git a/0131-Add-start-symbol-for-RISC-V.patch b/0126-Add-start-symbol-for-RISC-V.patch
similarity index 100%
rename from 0131-Add-start-symbol-for-RISC-V.patch
rename to 0126-Add-start-symbol-for-RISC-V.patch
diff --git a/0132-bootstrap.conf-Force-autogen.sh-to-use-python3.patch b/0127-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
similarity index 100%
rename from 0132-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
rename to 0127-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
diff --git a/0133-efi-http-Export-fw-http-_path-variables-to-make-them.patch b/0128-efi-http-Export-fw-http-_path-variables-to-make-them.patch
similarity index 100%
rename from 0133-efi-http-Export-fw-http-_path-variables-to-make-them.patch
rename to 0128-efi-http-Export-fw-http-_path-variables-to-make-them.patch
diff --git a/0129-Also-define-GRUB_EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch b/0129-Also-define-GRUB_EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch
deleted file mode 100644
index b694ec9c..00000000
--- a/0129-Also-define-GRUB_EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: David Abdurachmanov <david.abdurachmanov@sifive.com>
-Date: Thu, 16 Jan 2020 13:10:10 +0100
-Subject: [PATCH] Also define GRUB_EFI_MAX_ALLOCATION_ADDRESS for RISC-V
-
-The commit "Try to pick better locations for kernel and initrd" missed to
-define this macro for the RISC-V (riscv64) architecture, so add it there.
-
-Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
----
- include/grub/riscv64/efi/memory.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/grub/riscv64/efi/memory.h b/include/grub/riscv64/efi/memory.h
-index c6cb3241714..acb61dca44b 100644
---- a/include/grub/riscv64/efi/memory.h
-+++ b/include/grub/riscv64/efi/memory.h
-@@ -2,5 +2,6 @@
- #include <grub/efi/memory.h>
- 
- #define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffffffffULL
-+#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS
- 
- #endif /* ! GRUB_MEMORY_CPU_HEADER */
diff --git a/0134-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch b/0129-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
similarity index 100%
rename from 0134-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
rename to 0129-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
diff --git a/0130-chainloader-Define-machine-types-for-RISC-V.patch b/0130-chainloader-Define-machine-types-for-RISC-V.patch
deleted file mode 100644
index 480db52d..00000000
--- a/0130-chainloader-Define-machine-types-for-RISC-V.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: David Abdurachmanov <david.abdurachmanov@sifive.com>
-Date: Sat, 9 Nov 2019 18:06:32 +0000
-Subject: [PATCH] chainloader: Define machine types for RISC-V
-
-The commit "Add secureboot support on efi chainloader" didn't add machine
-types for RISC-V, so this patch adds them.
-
-Note, that grub-core/loader/riscv/linux.c is skipped because Linux is not
-supported yet. This patch might need a new revision once that's the case.
-
-Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
----
- grub-core/loader/efi/chainloader.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 47f5aa14817..ac8dfd40c61 100644
---- a/grub-core/loader/efi/chainloader.c
-+++ b/grub-core/loader/efi/chainloader.c
-@@ -333,6 +333,10 @@ static const grub_uint16_t machine_type __attribute__((__unused__)) =
-   GRUB_PE32_MACHINE_I386;
- #elif defined(__ia64__)
-   GRUB_PE32_MACHINE_IA64;
-+#elif defined(__riscv) && (__riscv_xlen == 32)
-+  GRUB_PE32_MACHINE_RISCV32;
-+#elif defined(__riscv) && (__riscv_xlen == 64)
-+  GRUB_PE32_MACHINE_RISCV64;
- #else
- #error this architecture is not supported by grub2
- #endif
diff --git a/0135-efi-net-Allow-to-specify-a-port-number-in-addresses.patch b/0130-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
similarity index 100%
rename from 0135-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
rename to 0130-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
diff --git a/0136-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch b/0131-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
similarity index 100%
rename from 0136-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
rename to 0131-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
diff --git a/0137-efi-net-Print-a-debug-message-if-parsing-the-address.patch b/0132-efi-net-Print-a-debug-message-if-parsing-the-address.patch
similarity index 100%
rename from 0137-efi-net-Print-a-debug-message-if-parsing-the-address.patch
rename to 0132-efi-net-Print-a-debug-message-if-parsing-the-address.patch
diff --git a/0138-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch b/0133-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
similarity index 100%
rename from 0138-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
rename to 0133-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
diff --git a/0139-efi-Set-image-base-address-before-jumping-to-the-PE-.patch b/0134-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
similarity index 100%
rename from 0139-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
rename to 0134-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
diff --git a/0140-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch b/0135-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
similarity index 100%
rename from 0140-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
rename to 0135-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
diff --git a/0141-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch b/0136-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
similarity index 100%
rename from 0141-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
rename to 0136-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
diff --git a/0142-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch b/0137-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
similarity index 100%
rename from 0142-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
rename to 0137-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
diff --git a/0143-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch b/0138-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
similarity index 100%
rename from 0143-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
rename to 0138-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
diff --git a/0144-efi-dhcp-fix-some-allocation-error-checking.patch b/0139-efi-dhcp-fix-some-allocation-error-checking.patch
similarity index 100%
rename from 0144-efi-dhcp-fix-some-allocation-error-checking.patch
rename to 0139-efi-dhcp-fix-some-allocation-error-checking.patch
diff --git a/0145-efi-http-fix-some-allocation-error-checking.patch b/0140-efi-http-fix-some-allocation-error-checking.patch
similarity index 100%
rename from 0145-efi-http-fix-some-allocation-error-checking.patch
rename to 0140-efi-http-fix-some-allocation-error-checking.patch
diff --git a/0146-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch b/0141-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
similarity index 100%
rename from 0146-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
rename to 0141-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
diff --git a/0147-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch b/0142-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
similarity index 100%
rename from 0147-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
rename to 0142-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
diff --git a/0148-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/0143-linuxefi-fail-kernel-validation-without-shim-protoco.patch
similarity index 100%
rename from 0148-linuxefi-fail-kernel-validation-without-shim-protoco.patch
rename to 0143-linuxefi-fail-kernel-validation-without-shim-protoco.patch
diff --git a/0149-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch b/0144-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
similarity index 100%
rename from 0149-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
rename to 0144-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
diff --git a/0150-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch b/0145-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
similarity index 100%
rename from 0150-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
rename to 0145-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
diff --git a/0151-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch b/0146-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
similarity index 100%
rename from 0151-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
rename to 0146-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
diff --git a/0152-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch b/0147-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
similarity index 100%
rename from 0152-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
rename to 0147-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
diff --git a/0153-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch b/0148-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
similarity index 100%
rename from 0153-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
rename to 0148-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
diff --git a/0154-Add-systemd-integration-scripts-to-make-systemctl-re.patch b/0149-Add-systemd-integration-scripts-to-make-systemctl-re.patch
similarity index 99%
rename from 0154-Add-systemd-integration-scripts-to-make-systemctl-re.patch
rename to 0149-Add-systemd-integration-scripts-to-make-systemctl-re.patch
index 130dc778..8e2481e7 100644
--- a/0154-Add-systemd-integration-scripts-to-make-systemctl-re.patch
+++ b/0149-Add-systemd-integration-scripts-to-make-systemctl-re.patch
@@ -65,7 +65,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  create mode 100644 util/systemd/systemd-integration.sh.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 11ab2d6fad1..e1242f54022 100644
+index 2e6ad979c3e..9927c2cfd6a 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -470,6 +470,12 @@ script = {
diff --git a/0155-systemd-integration.sh-Also-set-old-menu_show_once-g.patch b/0150-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
similarity index 100%
rename from 0155-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
rename to 0150-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
diff --git a/0156-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch b/0151-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
similarity index 100%
rename from 0156-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
rename to 0151-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
diff --git a/0157-grub-install-disable-support-for-EFI-platforms.patch b/0152-grub-install-disable-support-for-EFI-platforms.patch
similarity index 100%
rename from 0157-grub-install-disable-support-for-EFI-platforms.patch
rename to 0152-grub-install-disable-support-for-EFI-platforms.patch
diff --git a/0158-New-with-debug-timestamps-configure-flag-to-prepend-.patch b/0153-New-with-debug-timestamps-configure-flag-to-prepend-.patch
similarity index 96%
rename from 0158-New-with-debug-timestamps-configure-flag-to-prepend-.patch
rename to 0153-New-with-debug-timestamps-configure-flag-to-prepend-.patch
index 3eb0d00c..d216284c 100644
--- a/0158-New-with-debug-timestamps-configure-flag-to-prepend-.patch
+++ b/0153-New-with-debug-timestamps-configure-flag-to-prepend-.patch
@@ -15,7 +15,7 @@ Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
  3 files changed, 39 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 907477a585c..d5d2a28b4ef 100644
+index c6bd965f1f9..3c808a72230 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1613,6 +1613,17 @@ else
@@ -36,7 +36,7 @@ index 907477a585c..d5d2a28b4ef 100644
  AC_ARG_ENABLE([grub-emu-sdl],
  	      [AS_HELP_STRING([--enable-grub-emu-sdl],
                               [build and install the `grub-emu' debugging utility with SDL support (default=guessed)])])
-@@ -2200,6 +2211,7 @@ AM_CONDITIONAL([COND_APPLE_LINKER], [test x$TARGET_APPLE_LINKER = x1])
+@@ -2194,6 +2205,7 @@ AM_CONDITIONAL([COND_APPLE_LINKER], [test x$TARGET_APPLE_LINKER = x1])
  AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
  AM_CONDITIONAL([COND_ENABLE_CACHE_STATS], [test x$DISK_CACHE_STATS = x1])
  AM_CONDITIONAL([COND_ENABLE_BOOT_TIME_STATS], [test x$BOOT_TIME_STATS = x1])
@@ -44,7 +44,7 @@ index 907477a585c..d5d2a28b4ef 100644
  
  AM_CONDITIONAL([COND_HAVE_CXX], [test x$HAVE_CXX = xyes])
  
-@@ -2295,6 +2307,12 @@ else
+@@ -2289,6 +2301,12 @@ else
  echo With boot time statistics: No
  fi
  
diff --git a/0159-Added-debug-statements-to-grub_disk_open-and-grub_di.patch b/0154-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
similarity index 100%
rename from 0159-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
rename to 0154-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
diff --git a/0160-Introduce-function-grub_debug_is_enabled-void-return.patch b/0155-Introduce-function-grub_debug_is_enabled-void-return.patch
similarity index 100%
rename from 0160-Introduce-function-grub_debug_is_enabled-void-return.patch
rename to 0155-Introduce-function-grub_debug_is_enabled-void-return.patch
diff --git a/0161-Don-t-clear-screen-when-debugging-is-enabled.patch b/0156-Don-t-clear-screen-when-debugging-is-enabled.patch
similarity index 100%
rename from 0161-Don-t-clear-screen-when-debugging-is-enabled.patch
rename to 0156-Don-t-clear-screen-when-debugging-is-enabled.patch
diff --git a/0162-grub_file_-instrumentation-new-file-debug-tag.patch b/0157-grub_file_-instrumentation-new-file-debug-tag.patch
similarity index 100%
rename from 0162-grub_file_-instrumentation-new-file-debug-tag.patch
rename to 0157-grub_file_-instrumentation-new-file-debug-tag.patch
diff --git a/0163-ieee1275-Avoiding-many-unecessary-open-close.patch b/0158-ieee1275-Avoiding-many-unecessary-open-close.patch
similarity index 100%
rename from 0163-ieee1275-Avoiding-many-unecessary-open-close.patch
rename to 0158-ieee1275-Avoiding-many-unecessary-open-close.patch
diff --git a/0164-ieee1275-powerpc-implements-fibre-channel-discovery-.patch b/0159-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
similarity index 100%
rename from 0164-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
rename to 0159-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
diff --git a/0165-ieee1275-powerpc-enables-device-mapper-discovery.patch b/0160-ieee1275-powerpc-enables-device-mapper-discovery.patch
similarity index 100%
rename from 0165-ieee1275-powerpc-enables-device-mapper-discovery.patch
rename to 0160-ieee1275-powerpc-enables-device-mapper-discovery.patch
diff --git a/0166-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch b/0161-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
similarity index 100%
rename from 0166-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
rename to 0161-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
diff --git a/0167-Add-suport-for-signing-grub-with-an-appended-signatu.patch b/0162-Add-suport-for-signing-grub-with-an-appended-signatu.patch
similarity index 100%
rename from 0167-Add-suport-for-signing-grub-with-an-appended-signatu.patch
rename to 0162-Add-suport-for-signing-grub-with-an-appended-signatu.patch
diff --git a/0168-docs-grub-Document-signing-grub-under-UEFI.patch b/0163-docs-grub-Document-signing-grub-under-UEFI.patch
similarity index 100%
rename from 0168-docs-grub-Document-signing-grub-under-UEFI.patch
rename to 0163-docs-grub-Document-signing-grub-under-UEFI.patch
diff --git a/0169-docs-grub-Document-signing-grub-with-an-appended-sig.patch b/0164-docs-grub-Document-signing-grub-with-an-appended-sig.patch
similarity index 100%
rename from 0169-docs-grub-Document-signing-grub-with-an-appended-sig.patch
rename to 0164-docs-grub-Document-signing-grub-with-an-appended-sig.patch
diff --git a/0170-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch b/0165-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
similarity index 100%
rename from 0170-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
rename to 0165-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
diff --git a/0171-pgp-factor-out-rsa_pad.patch b/0166-pgp-factor-out-rsa_pad.patch
similarity index 100%
rename from 0171-pgp-factor-out-rsa_pad.patch
rename to 0166-pgp-factor-out-rsa_pad.patch
diff --git a/0172-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch b/0167-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
similarity index 100%
rename from 0172-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
rename to 0167-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
diff --git a/0173-posix_wrap-tweaks-in-preparation-for-libtasn1.patch b/0168-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
similarity index 100%
rename from 0173-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
rename to 0168-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
diff --git a/0174-libtasn1-import-libtasn1-4.16.0.patch b/0169-libtasn1-import-libtasn1-4.16.0.patch
similarity index 100%
rename from 0174-libtasn1-import-libtasn1-4.16.0.patch
rename to 0169-libtasn1-import-libtasn1-4.16.0.patch
diff --git a/0175-libtasn1-disable-code-not-needed-in-grub.patch b/0170-libtasn1-disable-code-not-needed-in-grub.patch
similarity index 100%
rename from 0175-libtasn1-disable-code-not-needed-in-grub.patch
rename to 0170-libtasn1-disable-code-not-needed-in-grub.patch
diff --git a/0176-libtasn1-changes-for-grub-compatibility.patch b/0171-libtasn1-changes-for-grub-compatibility.patch
similarity index 100%
rename from 0176-libtasn1-changes-for-grub-compatibility.patch
rename to 0171-libtasn1-changes-for-grub-compatibility.patch
diff --git a/0177-libtasn1-compile-into-asn1-module.patch b/0172-libtasn1-compile-into-asn1-module.patch
similarity index 100%
rename from 0177-libtasn1-compile-into-asn1-module.patch
rename to 0172-libtasn1-compile-into-asn1-module.patch
diff --git a/0178-test_asn1-test-module-for-libtasn1.patch b/0173-test_asn1-test-module-for-libtasn1.patch
similarity index 99%
rename from 0178-test_asn1-test-module-for-libtasn1.patch
rename to 0173-test_asn1-test-module-for-libtasn1.patch
index 3a02b247..b659558b 100644
--- a/0178-test_asn1-test-module-for-libtasn1.patch
+++ b/0173-test_asn1-test-module-for-libtasn1.patch
@@ -51,10 +51,10 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
  create mode 100644 tests/test_asn1.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index e1242f54022..8cfbe69a76e 100644
+index 9927c2cfd6a..3f191aa8095 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -1305,6 +1305,12 @@ script = {
+@@ -1306,6 +1306,12 @@ script = {
    common = tests/syslinux_test.in;
  };
  
diff --git a/0179-grub-install-support-embedding-x509-certificates.patch b/0174-grub-install-support-embedding-x509-certificates.patch
similarity index 100%
rename from 0179-grub-install-support-embedding-x509-certificates.patch
rename to 0174-grub-install-support-embedding-x509-certificates.patch
diff --git a/0180-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch b/0175-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
similarity index 100%
rename from 0180-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
rename to 0175-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
diff --git a/0181-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch b/0176-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
similarity index 100%
rename from 0181-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
rename to 0176-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
diff --git a/0182-appended-signatures-support-verifying-appended-signa.patch b/0177-appended-signatures-support-verifying-appended-signa.patch
similarity index 100%
rename from 0182-appended-signatures-support-verifying-appended-signa.patch
rename to 0177-appended-signatures-support-verifying-appended-signa.patch
diff --git a/0183-appended-signatures-verification-tests.patch b/0178-appended-signatures-verification-tests.patch
similarity index 100%
rename from 0183-appended-signatures-verification-tests.patch
rename to 0178-appended-signatures-verification-tests.patch
diff --git a/0184-appended-signatures-documentation.patch b/0179-appended-signatures-documentation.patch
similarity index 100%
rename from 0184-appended-signatures-documentation.patch
rename to 0179-appended-signatures-documentation.patch
diff --git a/0185-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch b/0180-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
similarity index 100%
rename from 0185-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
rename to 0180-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
diff --git a/0186-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch b/0181-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
similarity index 100%
rename from 0186-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
rename to 0181-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
diff --git a/0187-ieee1275-claim-more-memory.patch b/0182-ieee1275-claim-more-memory.patch
similarity index 100%
rename from 0187-ieee1275-claim-more-memory.patch
rename to 0182-ieee1275-claim-more-memory.patch
diff --git a/0188-ieee1275-request-memory-with-ibm-client-architecture.patch b/0183-ieee1275-request-memory-with-ibm-client-architecture.patch
similarity index 100%
rename from 0188-ieee1275-request-memory-with-ibm-client-architecture.patch
rename to 0183-ieee1275-request-memory-with-ibm-client-architecture.patch
diff --git a/0189-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch b/0184-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
similarity index 100%
rename from 0189-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
rename to 0184-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
diff --git a/0190-ieee1275-ofdisk-retry-on-open-failure.patch b/0185-ieee1275-ofdisk-retry-on-open-failure.patch
similarity index 100%
rename from 0190-ieee1275-ofdisk-retry-on-open-failure.patch
rename to 0185-ieee1275-ofdisk-retry-on-open-failure.patch
diff --git a/0194-Allow-chainloading-EFI-apps-from-loop-mounts.patch b/0186-Allow-chainloading-EFI-apps-from-loop-mounts.patch
similarity index 100%
rename from 0194-Allow-chainloading-EFI-apps-from-loop-mounts.patch
rename to 0186-Allow-chainloading-EFI-apps-from-loop-mounts.patch
diff --git a/0195-efinet-Add-DHCP-proxy-support.patch b/0187-efinet-Add-DHCP-proxy-support.patch
similarity index 100%
rename from 0195-efinet-Add-DHCP-proxy-support.patch
rename to 0187-efinet-Add-DHCP-proxy-support.patch
diff --git a/0196-fs-ext2-Ignore-checksum-seed-incompat-feature.patch b/0188-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
similarity index 100%
rename from 0196-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
rename to 0188-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
diff --git a/0197-Don-t-update-the-cmdline-when-generating-legacy-menu.patch b/0189-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
similarity index 97%
rename from 0197-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
rename to 0189-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
index 84997a90..2e13f399 100644
--- a/0197-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
+++ b/0189-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
@@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index fdf324b7ab1..518624f336e 100644
+index 6bceabf3dc9..b95a9a8d7ca 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -261,7 +261,9 @@ if [ -z "\${kernelopts}" ]; then
diff --git a/0198-Suppress-gettext-error-message.patch b/0190-Suppress-gettext-error-message.patch
similarity index 100%
rename from 0198-Suppress-gettext-error-message.patch
rename to 0190-Suppress-gettext-error-message.patch
diff --git a/0191-01_menu_auto_hide.in-fix-a-then-than-typo.patch b/0191-01_menu_auto_hide.in-fix-a-then-than-typo.patch
deleted file mode 100644
index 4847ef93..00000000
--- a/0191-01_menu_auto_hide.in-fix-a-then-than-typo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@fedoraproject.org>
-Date: Fri, 11 Jun 2021 12:57:56 +0200
-Subject: [PATCH] 01_menu_auto_hide.in: fix a then/than typo
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jan Pokorný <jpokorny@fedoraproject.org>
----
- util/grub.d/10_reset_boot_success.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/grub.d/10_reset_boot_success.in b/util/grub.d/10_reset_boot_success.in
-index 737e1ae5b68..e73f4137b36 100644
---- a/util/grub.d/10_reset_boot_success.in
-+++ b/util/grub.d/10_reset_boot_success.in
-@@ -15,7 +15,7 @@ fi
- # Reset boot_indeterminate after a successful boot
- if [ "\${boot_success}" = "1" ] ; then
-   set boot_indeterminate=0
--# Avoid boot_indeterminate causing the menu to be hidden more then once
-+# Avoid boot_indeterminate causing the menu to be hidden more than once
- elif [ "\${boot_indeterminate}" = "1" ]; then
-   set boot_indeterminate=2
- fi
diff --git a/0200-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch b/0191-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
similarity index 100%
rename from 0200-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
rename to 0191-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
diff --git a/0192-Fix-disabling-grub-rpm-sort.patch b/0192-Fix-disabling-grub-rpm-sort.patch
deleted file mode 100644
index ccde7519..00000000
--- a/0192-Fix-disabling-grub-rpm-sort.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tim Landscheidt <tim@tim-landscheidt.de>
-Date: Fri, 11 Jun 2021 13:02:37 +0200
-Subject: [PATCH] Fix disabling grub-rpm-sort
-
-Currently, grub-rpm-sort is unconditionally compiled whether
-./configure has been called with --disable-rpm-sort or not.  This adds
-the necessary logic to configure.ac and Makefile.util.def and some
-debug output to ./configure and fixes #44.
-
-Signed-off-by: Tim Landscheidt <tim@tim-landscheidt.de>
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- configure.ac      | 8 ++++++++
- Makefile.util.def | 1 +
- 2 files changed, 9 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index d5d2a28b4ef..c7842ec29d8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1936,6 +1936,8 @@ AC_ARG_ENABLE([rpm-sort],
-                               [enable native rpm sorting of kernels in grub (default=guessed)])])
- if test x"$enable_rpm_sort" = xno ; then
-   rpm_sort_excuse="explicitly disabled"
-+else
-+  enable_rpm_sort=yes
- fi
- 
- if test x"$rpm_sort_excuse" = x ; then
-@@ -2200,6 +2202,7 @@ AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes])
- AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes])
- AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
- AM_CONDITIONAL([COND_GRUB_MOUNT], [test x$enable_grub_mount = xyes])
-+AM_CONDITIONAL([COND_GRUB_RPM_SORT], [test x$enable_rpm_sort = xyes])
- AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
- if test x$FONT_SOURCE != x ; then
-    HAVE_FONT_SOURCE=1
-@@ -2328,6 +2331,11 @@ echo grub-mount: Yes
- else
- echo grub-mount: No "($grub_mount_excuse)"
- fi
-+if [ x"$rpm_sort_excuse" = x ]; then
-+echo grub-rpm-sort: Yes
-+else
-+echo grub-rpm-sort: No "($rpm_sort_excuse)"
-+fi
- if [ x"$starfield_excuse" = x ]; then
- echo starfield theme: Yes
- echo With DejaVuSans font from $DJVU_FONT_SOURCE
-diff --git a/Makefile.util.def b/Makefile.util.def
-index 8cfbe69a76e..3f191aa8095 100644
---- a/Makefile.util.def
-+++ b/Makefile.util.def
-@@ -774,6 +774,7 @@ program = {
-   ldadd = libgrubkern.a;
-   ldadd = grub-core/lib/gnulib/libgnu.a;
-   ldadd = '$(LIBDEVMAPPER) $(LIBRPM)';
-+  condition = COND_GRUB_RPM_SORT;
- };
- 
- script = {
diff --git a/0202-templates-Check-for-EFI-at-runtime-instead-of-config.patch b/0192-templates-Check-for-EFI-at-runtime-instead-of-config.patch
similarity index 100%
rename from 0202-templates-Check-for-EFI-at-runtime-instead-of-config.patch
rename to 0192-templates-Check-for-EFI-at-runtime-instead-of-config.patch
diff --git a/0193-Don-t-check-for-rpmvercmp-in-librpm.patch b/0193-Don-t-check-for-rpmvercmp-in-librpm.patch
deleted file mode 100644
index c21dca47..00000000
--- a/0193-Don-t-check-for-rpmvercmp-in-librpm.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Fri, 11 Jun 2021 13:13:27 +0200
-Subject: [PATCH] Don't check for rpmvercmp in librpm
-
-The rpmvercmp() function was moved from librpm to librpmio. The configure
-option had some logic to first check if the symbol is in librpm and then
-librpmio if this check didn't succeed.
-
-But the logic wasn't working and rpm sorting was always disabled. Instead
-of trying to fix this logic, let's just remove since the function already
-moved and there's no need to check librpm anymore. Now it's enabled again:
-
-  GRUB2 will be compiled with following components:
-  ...
-  grub-rpm-sort: Yes
-  ...
-
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
----
- configure.ac | 19 +++++--------------
- 1 file changed, 5 insertions(+), 14 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c7842ec29d8..3c808a72230 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1947,24 +1947,15 @@ if test x"$rpm_sort_excuse" = x ; then
- fi
- 
- if test x"$rpm_sort_excuse" = x ; then
--  # Check for rpm library.
--  AC_CHECK_LIB([rpm], [rpmvercmp], [],
--               [rpm_sort_excuse="rpmlib missing rpmvercmp"])
--fi
--
--if test x"$rpm_sort_excuse" = x ; then
--   LIBRPM="-lrpm";
--   AC_DEFINE([HAVE_RPM], [1],
--             [Define to 1 if you have the rpm library.])
--fi
--
--if test x"$LIBRPM" = x ; then
--  # Check for rpm library.
-+  # Check for rpmio library.
-   AC_CHECK_LIB([rpmio], [rpmvercmp], [],
-                [rpm_sort_excuse="rpmio missing rpmvercmp"])
-+fi
-+
-+if test x"$rpm_sort_excuse" = x ; then
-    LIBRPM="-lrpmio";
-    AC_DEFINE([HAVE_RPMIO], [1],
--             [Define to 1 if you have the rpm library.])
-+             [Define to 1 if you have the rpmio library.])
- fi
- 
- AC_SUBST([LIBRPM])
diff --git a/0203-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch b/0193-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
similarity index 100%
rename from 0203-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
rename to 0193-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
diff --git a/0204-arm64-Fix-EFI-loader-kernel-image-allocation.patch b/0194-arm64-Fix-EFI-loader-kernel-image-allocation.patch
similarity index 81%
rename from 0204-arm64-Fix-EFI-loader-kernel-image-allocation.patch
rename to 0194-arm64-Fix-EFI-loader-kernel-image-allocation.patch
index 600b4611..0472a42f 100644
--- a/0204-arm64-Fix-EFI-loader-kernel-image-allocation.patch
+++ b/0194-arm64-Fix-EFI-loader-kernel-image-allocation.patch
@@ -14,12 +14,17 @@ actual size it needs, including BSS, and make sure we clear it, and
 honors the specified alignment for the image.
 
 Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+[pjones: arm: check for the PE magic for the compiled arch]
+Signed-off-by: Peter Jones <pjones@redhat.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
  grub-core/loader/arm64/linux.c | 100 +++++++++++++++++++++++++++--------------
- 1 file changed, 66 insertions(+), 34 deletions(-)
+ include/grub/arm/linux.h       |   1 +
+ include/grub/arm64/linux.h     |   1 +
+ 3 files changed, 68 insertions(+), 34 deletions(-)
 
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 47f8cf0d84b..4a252d5e7e9 100644
+index 47f8cf0d84b..f18d90bd749 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -41,6 +41,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -57,7 +62,7 @@ index 47f8cf0d84b..4a252d5e7e9 100644
 +
 +  pe = (void *)((unsigned long)kernel + lh->hdr_offset);
 +
-+  if (pe->opt.magic != GRUB_PE32_PE64_MAGIC)
++  if (pe->opt.magic != GRUB_PE32_PEXX_MAGIC)
 +    return grub_error(GRUB_ERR_BAD_OS, "Invalid PE optional header magic");
 +
 +  *total_size   = pe->opt.image_size;
@@ -187,3 +192,27 @@ index 47f8cf0d84b..4a252d5e7e9 100644
  
    return grub_errno;
  }
+diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
+index b582f67f661..966a5074f53 100644
+--- a/include/grub/arm/linux.h
++++ b/include/grub/arm/linux.h
+@@ -44,6 +44,7 @@ struct grub_arm_linux_pe_header
+ 
+ #if defined(__arm__)
+ # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE
++# define GRUB_PE32_PEXX_MAGIC GRUB_PE32_PE32_MAGIC
+ # define linux_arch_kernel_header linux_arm_kernel_header
+ # define grub_armxx_linux_pe_header grub_arm_linux_pe_header
+ #endif
+diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
+index ea030312df3..422bf2bf24b 100644
+--- a/include/grub/arm64/linux.h
++++ b/include/grub/arm64/linux.h
+@@ -48,6 +48,7 @@ struct grub_arm64_linux_pe_header
+ 
+ #if defined(__aarch64__)
+ # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE
++# define GRUB_PE32_PEXX_MAGIC GRUB_PE32_PE64_MAGIC
+ # define linux_arch_kernel_header linux_arm64_kernel_header
+ # define grub_armxx_linux_pe_header grub_arm64_linux_pe_header
+ #endif
diff --git a/0205-normal-main-Discover-the-device-to-read-the-config-f.patch b/0195-normal-main-Discover-the-device-to-read-the-config-f.patch
similarity index 100%
rename from 0205-normal-main-Discover-the-device-to-read-the-config-f.patch
rename to 0195-normal-main-Discover-the-device-to-read-the-config-f.patch
diff --git a/0206-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch b/0196-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
similarity index 71%
rename from 0206-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
rename to 0196-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
index 7ca37887..7f3161e2 100644
--- a/0206-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
+++ b/0196-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
@@ -18,15 +18,17 @@ preserve a prefix of /path instead and hope the search later finds us.
 Related: rhbz#1899864
 
 Signed-off-by: Daniel Axtens <dja@axtens.net>
+[rharwood@redhat.com: squash in fixup commit]
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
 ---
- grub-core/kern/main.c | 38 +++++++++++++++++++++++++++++++++-----
- 1 file changed, 33 insertions(+), 5 deletions(-)
+ grub-core/kern/main.c | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 44 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index b573be6650d..58d35be253f 100644
+index b573be6650d..3fc34014726 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
-@@ -216,13 +216,41 @@ grub_set_prefix_and_root (void)
+@@ -216,13 +216,52 @@ grub_set_prefix_and_root (void)
    if (device)
      {
        char *prefix_set;
@@ -53,9 +55,20 @@ index b573be6650d..58d35be253f 100644
 +	    which will have now been extended to device=$fwdisk,partition
 +	    and path=/path
 +
-+	 So we only need to act if device = ieee1275/disk exactly.
++	  - PowerVM will give us device names like
++	    ieee1275//vdevice/v-scsi@3000006c/disk@8100000000000000
++	    and we don't want to try to encode some sort of truth table about
++	    what sorts of paths represent disks with partition tables and those
++	    without partition tables.
++
++	 So we act unless there is a comma in the device, which would indicate
++	 a partition has already been specified.
++
++	 (If we only have a path, the code in normal to discover config files
++	 will try both without partitions and then with any partitions so we
++	 will cover both CDs and HDs.)
 +       */
-+      if (grub_strncmp (device, "ieee1275/disk", 14) == 0)
++      if (grub_strchr (device, ',') == NULL)
 +        grub_env_set ("prefix", path);
 +      else
 +#endif
diff --git a/0209-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch b/0197-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
similarity index 100%
rename from 0209-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
rename to 0197-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
diff --git a/0210-Print-module-name-on-license-check-failure.patch b/0198-Print-module-name-on-license-check-failure.patch
similarity index 100%
rename from 0210-Print-module-name-on-license-check-failure.patch
rename to 0198-Print-module-name-on-license-check-failure.patch
diff --git a/0199-grub-boot-success.timer-Only-run-if-not-in-a-contain.patch b/0199-grub-boot-success.timer-Only-run-if-not-in-a-contain.patch
deleted file mode 100644
index 61d0f6d9..00000000
--- a/0199-grub-boot-success.timer-Only-run-if-not-in-a-contain.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Gena Makhomed <gmm@csdoc.com>
-Date: Thu, 1 Jul 2021 01:07:46 +0200
-Subject: [PATCH] grub-boot-success.timer: Only run if not in a container
-
-The grub-boot-success.timer should be disabled inside a container since it
-leads to the following error:
-
-Jan 09 22:56:38 test sshd[8786]: pam_unix(sshd:session): session opened for user www(uid=1000) by (uid=0)
-Jan 09 22:58:39 test systemd[8857]: Starting Mark boot as successful...
-Jan 09 22:58:39 test systemd[8857]: grub-boot-success.service: Main process exited, code=exited, status=1/FAILURE
-Jan 09 22:58:39 test systemd[8857]: grub-boot-success.service: Failed with result 'exit-code'.
-Jan 09 22:58:39 test systemd[8857]: Failed to start Mark boot as successful.
-Jan 09 22:58:39 test grub2-set-bootflag[10034]: Error canonicalizing /boot/grub2/grubenv filename: No such file or directory
-
-Resolves: rhbz#1914571
----
- docs/grub-boot-success.timer | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/docs/grub-boot-success.timer b/docs/grub-boot-success.timer
-index 5d8fcba21aa..406f1720056 100644
---- a/docs/grub-boot-success.timer
-+++ b/docs/grub-boot-success.timer
-@@ -1,6 +1,7 @@
- [Unit]
- Description=Mark boot as successful after the user session has run 2 minutes
- ConditionUser=!@system
-+ConditionVirtualization=!container
- 
- [Timer]
- OnActiveSec=2min
diff --git a/0211-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch b/0199-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
similarity index 100%
rename from 0211-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
rename to 0199-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
diff --git a/0212-grub-mkconfig-restore-umask-for-grub.cfg.patch b/0200-grub-mkconfig-restore-umask-for-grub.cfg.patch
similarity index 91%
rename from 0212-grub-mkconfig-restore-umask-for-grub.cfg.patch
rename to 0200-grub-mkconfig-restore-umask-for-grub.cfg.patch
index d9a81964..7c7bee0e 100644
--- a/0212-grub-mkconfig-restore-umask-for-grub.cfg.patch
+++ b/0200-grub-mkconfig-restore-umask-for-grub.cfg.patch
@@ -1,4 +1,4 @@
-From 3ea051e59e9c0cd79eac7f2e1563606e1e31a530 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michael Chang via Grub-devel <grub-devel@gnu.org>
 Date: Fri, 3 Dec 2021 16:13:28 +0800
 Subject: [PATCH] grub-mkconfig: restore umask for grub.cfg
@@ -25,7 +25,7 @@ Signed-off-by: Michael Chang <mchang@suse.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index f55339a3f..520a672cd 100644
+index f55339a3f64..520a672cd2c 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -311,7 +311,9 @@ and /etc/grub.d/* files or please file a bug report with
@@ -38,6 +38,3 @@ index f55339a3f..520a672cd 100644
      rm -f ${grub_cfg}.new
    fi
  fi
--- 
-2.33.0
-
diff --git a/0201-Remove-outdated-URL-for-BLS-document.patch b/0201-Remove-outdated-URL-for-BLS-document.patch
deleted file mode 100644
index c4d5d726..00000000
--- a/0201-Remove-outdated-URL-for-BLS-document.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Mon, 5 Jul 2021 19:00:25 +0200
-Subject: [PATCH] Remove outdated URL for BLS document
-
-The document was moved to https://systemd.io/BOOT_LOADER_SPECIFICATION/,
-update the URL accordingly to point to the current location.
-
-Resolves: rhbz#1926453
-
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
----
- util/grub.d/10_linux.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 518624f336e..b95a9a8d7ca 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -96,7 +96,7 @@ cat <<EOF
- #
- # The $bls_parser parses the BootLoaderSpec files stored in /boot/loader/entries and
- # populates the boot menu. Please refer to the Boot Loader Specification documentation
--# for the files format: https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec/.
-+# for the files format: https://systemd.io/BOOT_LOADER_SPECIFICATION/.
- 
- EOF
- }
diff --git a/0213-fs-btrfs-Use-full-btrfs-bootloader-area.patch b/0201-fs-btrfs-Use-full-btrfs-bootloader-area.patch
similarity index 96%
rename from 0213-fs-btrfs-Use-full-btrfs-bootloader-area.patch
rename to 0201-fs-btrfs-Use-full-btrfs-bootloader-area.patch
index a5a62ee2..ecfc58cd 100644
--- a/0213-fs-btrfs-Use-full-btrfs-bootloader-area.patch
+++ b/0201-fs-btrfs-Use-full-btrfs-bootloader-area.patch
@@ -1,4 +1,4 @@
-From 6e5b9bc2f1d2e3a10096716350fa67f48c199f5d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michael Chang <mchang@suse.com>
 Date: Mon, 13 Dec 2021 14:25:49 +0800
 Subject: [PATCH] fs/btrfs: Use full btrfs bootloader area
@@ -27,12 +27,12 @@ Signed-off-by: Michael Chang <mchang@suse.com>
 Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
 (cherry picked from commit b0f06a81c6f31b6fa20be67a96b6683bba8210c9)
 ---
- grub-core/fs/btrfs.c | 90 +++++++++++++++++++++++++++++++++++++-------
- include/grub/disk.h  |  2 +
+ grub-core/fs/btrfs.c | 90 ++++++++++++++++++++++++++++++++++++++++++++--------
+ include/grub/disk.h  |  2 ++
  2 files changed, 79 insertions(+), 13 deletions(-)
 
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 4cc86e9b7..07c0ff874 100644
+index 4cc86e9b79e..07c0ff874b8 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -2476,6 +2476,33 @@ grub_btrfs_label (grub_device_t device, char **label)
@@ -146,7 +146,7 @@ index 4cc86e9b7..07c0ff874 100644
    return GRUB_ERR_NONE;
  }
 diff --git a/include/grub/disk.h b/include/grub/disk.h
-index f95aca929..06210a704 100644
+index f95aca929a6..06210a70492 100644
 --- a/include/grub/disk.h
 +++ b/include/grub/disk.h
 @@ -182,6 +182,8 @@ typedef struct grub_disk_memberlist *grub_disk_memberlist_t;
@@ -158,6 +158,3 @@ index f95aca929..06210a704 100644
  /* Convert sector number from one sector size to another. */
  static inline grub_disk_addr_t
  grub_convert_sector (grub_disk_addr_t sector,
--- 
-2.34.1
-
diff --git a/0207-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch b/0207-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
deleted file mode 100644
index ce0d889f..00000000
--- a/0207-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniel Axtens <dja@axtens.net>
-Date: Mon, 16 Aug 2021 16:01:47 +1000
-Subject: [PATCH] powerpc: fix prefix + signed grub special case for PowerVM
-
-Mea culpa: when testing the PowerPC special case for signed grub, I
-assumed qemu and PowerVM would behave identically. This was wrong, and
-with hindsight a pretty dumb error.
-
-This fixes it. This time, I am actually testing on PowerVM.
-
-Signed-off-by: Daniel Axtens <dja@axtens.net>
----
- grub-core/kern/main.c | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 58d35be253f..3fc34014726 100644
---- a/grub-core/kern/main.c
-+++ b/grub-core/kern/main.c
-@@ -236,9 +236,20 @@ grub_set_prefix_and_root (void)
- 	    which will have now been extended to device=$fwdisk,partition
- 	    and path=/path
- 
--	 So we only need to act if device = ieee1275/disk exactly.
-+	  - PowerVM will give us device names like
-+	    ieee1275//vdevice/v-scsi@3000006c/disk@8100000000000000
-+	    and we don't want to try to encode some sort of truth table about
-+	    what sorts of paths represent disks with partition tables and those
-+	    without partition tables.
-+
-+	 So we act unless there is a comma in the device, which would indicate
-+	 a partition has already been specified.
-+
-+	 (If we only have a path, the code in normal to discover config files
-+	 will try both without partitions and then with any partitions so we
-+	 will cover both CDs and HDs.)
-        */
--      if (grub_strncmp (device, "ieee1275/disk", 14) == 0)
-+      if (grub_strchr (device, ',') == NULL)
-         grub_env_set ("prefix", path);
-       else
- #endif
diff --git a/0208-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch b/0208-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch
deleted file mode 100644
index 8b5170b6..00000000
--- a/0208-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 9 Sep 2021 10:59:28 -0400
-Subject: [PATCH] Arm: check for the PE magic for the compiled arch
-
-In "arm64: Fix EFI loader kernel image allocation", Ben fixed the kernel
-alignment to match the alignment given in the PE header.  In doing so, a
-check for valid PE magic was added, which was hard-coded to the value
-seen on Aarch64 (GRUB_PE32_PE64_MAGIC).
-
-Unfortunately, this code is shared between 64-bit and 32-bit, and so
-that value broke 32-bit Arm systems.
-
-This patch adds a constant definition for GRUB_PE32_PEXX_MAGIC, which is
-either GRUB_PE32_PE64_MAGIC or GRUB_PE32_PE32_MAGIC, depending on which
-platform is being built, and uses it in the header magic check.
-
-Resolves: rhbz#2000756
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/loader/arm64/linux.c | 2 +-
- include/grub/arm/linux.h       | 1 +
- include/grub/arm64/linux.h     | 1 +
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 4a252d5e7e9..f18d90bd749 100644
---- a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
-@@ -322,7 +322,7 @@ parse_pe_header (void *kernel, grub_uint64_t *total_size,
- 
-   pe = (void *)((unsigned long)kernel + lh->hdr_offset);
- 
--  if (pe->opt.magic != GRUB_PE32_PE64_MAGIC)
-+  if (pe->opt.magic != GRUB_PE32_PEXX_MAGIC)
-     return grub_error(GRUB_ERR_BAD_OS, "Invalid PE optional header magic");
- 
-   *total_size   = pe->opt.image_size;
-diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
-index b582f67f661..966a5074f53 100644
---- a/include/grub/arm/linux.h
-+++ b/include/grub/arm/linux.h
-@@ -44,6 +44,7 @@ struct grub_arm_linux_pe_header
- 
- #if defined(__arm__)
- # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM_MAGIC_SIGNATURE
-+# define GRUB_PE32_PEXX_MAGIC GRUB_PE32_PE32_MAGIC
- # define linux_arch_kernel_header linux_arm_kernel_header
- # define grub_armxx_linux_pe_header grub_arm_linux_pe_header
- #endif
-diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
-index ea030312df3..422bf2bf24b 100644
---- a/include/grub/arm64/linux.h
-+++ b/include/grub/arm64/linux.h
-@@ -48,6 +48,7 @@ struct grub_arm64_linux_pe_header
- 
- #if defined(__aarch64__)
- # define GRUB_LINUX_ARMXX_MAGIC_SIGNATURE GRUB_LINUX_ARM64_MAGIC_SIGNATURE
-+# define GRUB_PE32_PEXX_MAGIC GRUB_PE32_PE64_MAGIC
- # define linux_arch_kernel_header linux_arm64_kernel_header
- # define grub_armxx_linux_pe_header grub_arm64_linux_pe_header
- #endif
diff --git a/grub.patches b/grub.patches
index bbb454ad..f12bbe64 100644
--- a/grub.patches
+++ b/grub.patches
@@ -24,190 +24,178 @@ Patch0023: 0023-Enable-pager-by-default.-985860.patch
 Patch0024: 0024-Don-t-say-GNU-Linux-in-generated-menus.patch
 Patch0025: 0025-Add-.eh_frame-to-list-of-relocations-stripped.patch
 Patch0026: 0026-Don-t-require-a-password-to-boot-entries-generated-b.patch
-Patch0027: 0027-Don-t-emit-Booting-.-message.patch
-Patch0028: 0028-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
-Patch0029: 0029-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
-Patch0030: 0030-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
-Patch0031: 0031-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
-Patch0032: 0032-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
-Patch0033: 0033-Try-prefix-if-fw_path-doesn-t-work.patch
-Patch0034: 0034-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
-Patch0035: 0035-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
-Patch0036: 0036-Add-friendly-grub2-password-config-tool-985962.patch
-Patch0037: 0037-tcp-add-window-scaling-support.patch
-Patch0038: 0038-efinet-and-bootp-add-support-for-dhcpv6.patch
-Patch0039: 0039-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
-Patch0040: 0040-bz1374141-fix-incorrect-mask-for-ppc64.patch
-Patch0041: 0041-Make-grub_fatal-also-backtrace.patch
-Patch0042: 0042-Fix-up-some-man-pages-rpmdiff-noticed.patch
-Patch0043: 0043-Make-our-info-pages-say-grub2-where-appropriate.patch
-Patch0044: 0044-macos-just-build-chainloader-entries-don-t-try-any-x.patch
-Patch0045: 0045-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
-Patch0046: 0046-export-btrfs_subvol-and-btrfs_subvolid.patch
-Patch0047: 0047-grub2-btrfs-03-follow_default.patch
-Patch0048: 0048-grub2-btrfs-04-grub2-install.patch
-Patch0049: 0049-grub2-btrfs-05-grub2-mkconfig.patch
-Patch0050: 0050-grub2-btrfs-06-subvol-mount.patch
-Patch0051: 0051-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
-Patch0052: 0052-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
-Patch0053: 0053-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
-Patch0054: 0054-Use-grub_efi_.-memory-helpers-where-reasonable.patch
-Patch0055: 0055-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
-Patch0056: 0056-don-t-use-int-for-efi-status.patch
-Patch0057: 0057-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
-Patch0058: 0058-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
-Patch0059: 0059-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
-Patch0060: 0060-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
-Patch0061: 0061-align-struct-efi_variable-better.patch
-Patch0062: 0062-Add-BLS-support-to-grub-mkconfig.patch
-Patch0063: 0063-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
-Patch0064: 0064-Add-linux-and-initrd-commands-for-grub-emu.patch
-Patch0065: 0065-Add-grub2-switch-to-blscfg.patch
-Patch0066: 0066-make-better-backtraces.patch
-Patch0067: 0067-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
-Patch0068: 0068-Work-around-some-minor-include-path-weirdnesses.patch
-Patch0069: 0069-Make-it-possible-to-enabled-build-id-sha1.patch
-Patch0070: 0070-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
-Patch0071: 0071-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
-Patch0072: 0072-Fixup-for-newer-compiler.patch
-Patch0073: 0073-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
-Patch0074: 0074-Fixup-for-newer-compiler.patch
-Patch0075: 0075-Add-support-for-non-Ethernet-network-cards.patch
-Patch0076: 0076-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
-Patch0077: 0077-bootp-New-net_bootp6-command.patch
-Patch0078: 0078-efinet-UEFI-IPv6-PXE-support.patch
-Patch0079: 0079-grub.texi-Add-net_bootp6-doument.patch
-Patch0080: 0080-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
-Patch0081: 0081-efinet-Setting-network-from-UEFI-device-path.patch
-Patch0082: 0082-efinet-Setting-DNS-server-from-UEFI-protocol.patch
-Patch0083: 0083-Support-UEFI-networking-protocols.patch
-Patch0084: 0084-AUDIT-0-http-boot-tracker-bug.patch
-Patch0085: 0085-grub-editenv-Add-incr-command-to-increment-integer-v.patch
-Patch0086: 0086-Add-auto-hide-menu-support.patch
-Patch0087: 0087-Add-grub-set-bootflag-utility.patch
-Patch0088: 0088-docs-Add-grub-boot-indeterminate.service-example.patch
-Patch0089: 0089-gentpl-add-disable-support.patch
-Patch0090: 0090-gentpl-add-pc-firmware-type.patch
-Patch0091: 0091-efinet-also-use-the-firmware-acceleration-for-http.patch
-Patch0092: 0092-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
-Patch0093: 0093-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
-Patch0094: 0094-module-verifier-make-it-possible-to-run-checkers-on-.patch
-Patch0095: 0095-Rework-how-the-fdt-command-builds.patch
-Patch0096: 0096-Disable-non-wordsize-allocations-on-arm.patch
-Patch0097: 0097-Prepend-prefix-when-HTTP-path-is-relative.patch
-Patch0098: 0098-Make-grub_error-more-verbose.patch
-Patch0099: 0099-Make-reset-an-alias-for-the-reboot-command.patch
-Patch0100: 0100-Add-a-version-command.patch
-Patch0101: 0101-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
-Patch0102: 0102-arm-arm64-loader-Better-memory-allocation-and-error-.patch
-Patch0103: 0103-Try-to-pick-better-locations-for-kernel-and-initrd.patch
-Patch0104: 0104-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
-Patch0105: 0105-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
-Patch0106: 0106-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
-Patch0107: 0107-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
-Patch0108: 0108-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
-Patch0109: 0109-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
-Patch0110: 0110-Fix-getroot.c-s-trampolines.patch
-Patch0111: 0111-Do-not-allow-stack-trampolines-anywhere.patch
-Patch0112: 0112-Reimplement-boot_counter.patch
-Patch0113: 0113-Fix-menu-entry-selection-based-on-ID-and-title.patch
-Patch0114: 0114-Make-the-menu-entry-users-option-argument-to-be-opti.patch
-Patch0115: 0115-Add-efi-export-env-and-efi-load-env-commands.patch
-Patch0116: 0116-Make-it-possible-to-subtract-conditions-from-debug.patch
-Patch0117: 0117-Export-all-variables-from-the-initial-context-when-c.patch
-Patch0118: 0118-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
-Patch0119: 0119-Fix-systemctl-kexec-exit-status-check.patch
-Patch0120: 0120-Print-grub-emu-linux-loader-messages-as-debug.patch
-Patch0121: 0121-Don-t-assume-that-boot-commands-will-only-return-on-.patch
-Patch0122: 0122-Fix-undefined-references-for-fdt-when-building-with-.patch
-Patch0123: 0123-Do-better-in-bootstrap.conf.patch
-Patch0124: 0124-Use-git-to-apply-gnulib-patches.patch
-Patch0125: 0125-Fix-build-error-with-the-fdt-module-on-risc-v.patch
-Patch0126: 0126-grub-set-bootflag-Update-comment-about-running-as-ro.patch
-Patch0127: 0127-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
-Patch0128: 0128-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
-Patch0129: 0129-Also-define-GRUB_EFI_MAX_ALLOCATION_ADDRESS-for-RISC.patch
-Patch0130: 0130-chainloader-Define-machine-types-for-RISC-V.patch
-Patch0131: 0131-Add-start-symbol-for-RISC-V.patch
-Patch0132: 0132-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
-Patch0133: 0133-efi-http-Export-fw-http-_path-variables-to-make-them.patch
-Patch0134: 0134-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
-Patch0135: 0135-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
-Patch0136: 0136-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
-Patch0137: 0137-efi-net-Print-a-debug-message-if-parsing-the-address.patch
-Patch0138: 0138-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
-Patch0139: 0139-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
-Patch0140: 0140-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
-Patch0141: 0141-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
-Patch0142: 0142-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
-Patch0143: 0143-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
-Patch0144: 0144-efi-dhcp-fix-some-allocation-error-checking.patch
-Patch0145: 0145-efi-http-fix-some-allocation-error-checking.patch
-Patch0146: 0146-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
-Patch0147: 0147-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
-Patch0148: 0148-linuxefi-fail-kernel-validation-without-shim-protoco.patch
-Patch0149: 0149-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
-Patch0150: 0150-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
-Patch0151: 0151-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
-Patch0152: 0152-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
-Patch0153: 0153-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
-Patch0154: 0154-Add-systemd-integration-scripts-to-make-systemctl-re.patch
-Patch0155: 0155-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
-Patch0156: 0156-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
-Patch0157: 0157-grub-install-disable-support-for-EFI-platforms.patch
-Patch0158: 0158-New-with-debug-timestamps-configure-flag-to-prepend-.patch
-Patch0159: 0159-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
-Patch0160: 0160-Introduce-function-grub_debug_is_enabled-void-return.patch
-Patch0161: 0161-Don-t-clear-screen-when-debugging-is-enabled.patch
-Patch0162: 0162-grub_file_-instrumentation-new-file-debug-tag.patch
-Patch0163: 0163-ieee1275-Avoiding-many-unecessary-open-close.patch
-Patch0164: 0164-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
-Patch0165: 0165-ieee1275-powerpc-enables-device-mapper-discovery.patch
-Patch0166: 0166-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
-Patch0167: 0167-Add-suport-for-signing-grub-with-an-appended-signatu.patch
-Patch0168: 0168-docs-grub-Document-signing-grub-under-UEFI.patch
-Patch0169: 0169-docs-grub-Document-signing-grub-with-an-appended-sig.patch
-Patch0170: 0170-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
-Patch0171: 0171-pgp-factor-out-rsa_pad.patch
-Patch0172: 0172-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
-Patch0173: 0173-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
-Patch0174: 0174-libtasn1-import-libtasn1-4.16.0.patch
-Patch0175: 0175-libtasn1-disable-code-not-needed-in-grub.patch
-Patch0176: 0176-libtasn1-changes-for-grub-compatibility.patch
-Patch0177: 0177-libtasn1-compile-into-asn1-module.patch
-Patch0178: 0178-test_asn1-test-module-for-libtasn1.patch
-Patch0179: 0179-grub-install-support-embedding-x509-certificates.patch
-Patch0180: 0180-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
-Patch0181: 0181-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
-Patch0182: 0182-appended-signatures-support-verifying-appended-signa.patch
-Patch0183: 0183-appended-signatures-verification-tests.patch
-Patch0184: 0184-appended-signatures-documentation.patch
-Patch0185: 0185-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
-Patch0186: 0186-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
-Patch0187: 0187-ieee1275-claim-more-memory.patch
-Patch0188: 0188-ieee1275-request-memory-with-ibm-client-architecture.patch
-Patch0189: 0189-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
-Patch0190: 0190-ieee1275-ofdisk-retry-on-open-failure.patch
-Patch0191: 0191-01_menu_auto_hide.in-fix-a-then-than-typo.patch
-Patch0192: 0192-Fix-disabling-grub-rpm-sort.patch
-Patch0193: 0193-Don-t-check-for-rpmvercmp-in-librpm.patch
-Patch0194: 0194-Allow-chainloading-EFI-apps-from-loop-mounts.patch
-Patch0195: 0195-efinet-Add-DHCP-proxy-support.patch
-Patch0196: 0196-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
-Patch0197: 0197-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
-Patch0198: 0198-Suppress-gettext-error-message.patch
-Patch0199: 0199-grub-boot-success.timer-Only-run-if-not-in-a-contain.patch
-Patch0200: 0200-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
-Patch0201: 0201-Remove-outdated-URL-for-BLS-document.patch
-Patch0202: 0202-templates-Check-for-EFI-at-runtime-instead-of-config.patch
-Patch0203: 0203-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
-Patch0204: 0204-arm64-Fix-EFI-loader-kernel-image-allocation.patch
-Patch0205: 0205-normal-main-Discover-the-device-to-read-the-config-f.patch
-Patch0206: 0206-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
-Patch0207: 0207-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
-Patch0208: 0208-Arm-check-for-the-PE-magic-for-the-compiled-arch.patch
-Patch0209: 0209-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
-Patch0210: 0210-Print-module-name-on-license-check-failure.patch
-Patch0211: 0211-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
-Patch0212: 0212-grub-mkconfig-restore-umask-for-grub.cfg.patch
-Patch0213: 0213-fs-btrfs-Use-full-btrfs-bootloader-area.patch
+Patch0027: 0027-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
+Patch0028: 0028-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
+Patch0029: 0029-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
+Patch0030: 0030-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
+Patch0031: 0031-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
+Patch0032: 0032-Try-prefix-if-fw_path-doesn-t-work.patch
+Patch0033: 0033-Use-rpm-s-sort-for-grub2-mkconfig.patch
+Patch0034: 0034-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+Patch0035: 0035-Add-friendly-grub2-password-config-tool-985962.patch
+Patch0036: 0036-tcp-add-window-scaling-support.patch
+Patch0037: 0037-efinet-and-bootp-add-support-for-dhcpv6.patch
+Patch0038: 0038-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
+Patch0039: 0039-bz1374141-fix-incorrect-mask-for-ppc64.patch
+Patch0040: 0040-Make-grub_fatal-also-backtrace.patch
+Patch0041: 0041-Fix-up-some-man-pages-rpmdiff-noticed.patch
+Patch0042: 0042-Make-our-info-pages-say-grub2-where-appropriate.patch
+Patch0043: 0043-macos-just-build-chainloader-entries-don-t-try-any-x.patch
+Patch0044: 0044-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
+Patch0045: 0045-export-btrfs_subvol-and-btrfs_subvolid.patch
+Patch0046: 0046-grub2-btrfs-03-follow_default.patch
+Patch0047: 0047-grub2-btrfs-04-grub2-install.patch
+Patch0048: 0048-grub2-btrfs-05-grub2-mkconfig.patch
+Patch0049: 0049-grub2-btrfs-06-subvol-mount.patch
+Patch0050: 0050-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
+Patch0051: 0051-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
+Patch0052: 0052-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
+Patch0053: 0053-Use-grub_efi_.-memory-helpers-where-reasonable.patch
+Patch0054: 0054-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
+Patch0055: 0055-don-t-use-int-for-efi-status.patch
+Patch0056: 0056-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
+Patch0057: 0057-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
+Patch0058: 0058-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
+Patch0059: 0059-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
+Patch0060: 0060-align-struct-efi_variable-better.patch
+Patch0061: 0061-Add-BLS-support-to-grub-mkconfig.patch
+Patch0062: 0062-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
+Patch0063: 0063-Add-linux-and-initrd-commands-for-grub-emu.patch
+Patch0064: 0064-Add-grub2-switch-to-blscfg.patch
+Patch0065: 0065-make-better-backtraces.patch
+Patch0066: 0066-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
+Patch0067: 0067-Work-around-some-minor-include-path-weirdnesses.patch
+Patch0068: 0068-Make-it-possible-to-enabled-build-id-sha1.patch
+Patch0069: 0069-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
+Patch0070: 0070-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
+Patch0071: 0071-Fixup-for-newer-compiler.patch
+Patch0072: 0072-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
+Patch0073: 0073-Fixup-for-newer-compiler.patch
+Patch0074: 0074-Add-support-for-non-Ethernet-network-cards.patch
+Patch0075: 0075-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
+Patch0076: 0076-bootp-New-net_bootp6-command.patch
+Patch0077: 0077-efinet-UEFI-IPv6-PXE-support.patch
+Patch0078: 0078-grub.texi-Add-net_bootp6-doument.patch
+Patch0079: 0079-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
+Patch0080: 0080-efinet-Setting-network-from-UEFI-device-path.patch
+Patch0081: 0081-efinet-Setting-DNS-server-from-UEFI-protocol.patch
+Patch0082: 0082-Support-UEFI-networking-protocols.patch
+Patch0083: 0083-AUDIT-0-http-boot-tracker-bug.patch
+Patch0084: 0084-grub-editenv-Add-incr-command-to-increment-integer-v.patch
+Patch0085: 0085-Add-auto-hide-menu-support.patch
+Patch0086: 0086-Add-grub-set-bootflag-utility.patch
+Patch0087: 0087-docs-Add-grub-boot-indeterminate.service-example.patch
+Patch0088: 0088-gentpl-add-disable-support.patch
+Patch0089: 0089-gentpl-add-pc-firmware-type.patch
+Patch0090: 0090-efinet-also-use-the-firmware-acceleration-for-http.patch
+Patch0091: 0091-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
+Patch0092: 0092-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
+Patch0093: 0093-module-verifier-make-it-possible-to-run-checkers-on-.patch
+Patch0094: 0094-Rework-how-the-fdt-command-builds.patch
+Patch0095: 0095-Disable-non-wordsize-allocations-on-arm.patch
+Patch0096: 0096-Prepend-prefix-when-HTTP-path-is-relative.patch
+Patch0097: 0097-Make-grub_error-more-verbose.patch
+Patch0098: 0098-Make-reset-an-alias-for-the-reboot-command.patch
+Patch0099: 0099-Add-a-version-command.patch
+Patch0100: 0100-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
+Patch0101: 0101-arm-arm64-loader-Better-memory-allocation-and-error-.patch
+Patch0102: 0102-Try-to-pick-better-locations-for-kernel-and-initrd.patch
+Patch0103: 0103-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
+Patch0104: 0104-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
+Patch0105: 0105-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
+Patch0106: 0106-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
+Patch0107: 0107-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
+Patch0108: 0108-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
+Patch0109: 0109-Fix-getroot.c-s-trampolines.patch
+Patch0110: 0110-Do-not-allow-stack-trampolines-anywhere.patch
+Patch0111: 0111-Reimplement-boot_counter.patch
+Patch0112: 0112-Fix-menu-entry-selection-based-on-ID-and-title.patch
+Patch0113: 0113-Make-the-menu-entry-users-option-argument-to-be-opti.patch
+Patch0114: 0114-Add-efi-export-env-and-efi-load-env-commands.patch
+Patch0115: 0115-Make-it-possible-to-subtract-conditions-from-debug.patch
+Patch0116: 0116-Export-all-variables-from-the-initial-context-when-c.patch
+Patch0117: 0117-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
+Patch0118: 0118-Fix-systemctl-kexec-exit-status-check.patch
+Patch0119: 0119-Print-grub-emu-linux-loader-messages-as-debug.patch
+Patch0120: 0120-Don-t-assume-that-boot-commands-will-only-return-on-.patch
+Patch0121: 0121-Do-better-in-bootstrap.conf.patch
+Patch0122: 0122-Use-git-to-apply-gnulib-patches.patch
+Patch0123: 0123-grub-set-bootflag-Update-comment-about-running-as-ro.patch
+Patch0124: 0124-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
+Patch0125: 0125-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
+Patch0126: 0126-Add-start-symbol-for-RISC-V.patch
+Patch0127: 0127-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
+Patch0128: 0128-efi-http-Export-fw-http-_path-variables-to-make-them.patch
+Patch0129: 0129-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
+Patch0130: 0130-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
+Patch0131: 0131-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
+Patch0132: 0132-efi-net-Print-a-debug-message-if-parsing-the-address.patch
+Patch0133: 0133-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
+Patch0134: 0134-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
+Patch0135: 0135-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
+Patch0136: 0136-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
+Patch0137: 0137-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
+Patch0138: 0138-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
+Patch0139: 0139-efi-dhcp-fix-some-allocation-error-checking.patch
+Patch0140: 0140-efi-http-fix-some-allocation-error-checking.patch
+Patch0141: 0141-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
+Patch0142: 0142-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
+Patch0143: 0143-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+Patch0144: 0144-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
+Patch0145: 0145-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
+Patch0146: 0146-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
+Patch0147: 0147-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
+Patch0148: 0148-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
+Patch0149: 0149-Add-systemd-integration-scripts-to-make-systemctl-re.patch
+Patch0150: 0150-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
+Patch0151: 0151-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
+Patch0152: 0152-grub-install-disable-support-for-EFI-platforms.patch
+Patch0153: 0153-New-with-debug-timestamps-configure-flag-to-prepend-.patch
+Patch0154: 0154-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
+Patch0155: 0155-Introduce-function-grub_debug_is_enabled-void-return.patch
+Patch0156: 0156-Don-t-clear-screen-when-debugging-is-enabled.patch
+Patch0157: 0157-grub_file_-instrumentation-new-file-debug-tag.patch
+Patch0158: 0158-ieee1275-Avoiding-many-unecessary-open-close.patch
+Patch0159: 0159-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
+Patch0160: 0160-ieee1275-powerpc-enables-device-mapper-discovery.patch
+Patch0161: 0161-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
+Patch0162: 0162-Add-suport-for-signing-grub-with-an-appended-signatu.patch
+Patch0163: 0163-docs-grub-Document-signing-grub-under-UEFI.patch
+Patch0164: 0164-docs-grub-Document-signing-grub-with-an-appended-sig.patch
+Patch0165: 0165-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
+Patch0166: 0166-pgp-factor-out-rsa_pad.patch
+Patch0167: 0167-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
+Patch0168: 0168-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
+Patch0169: 0169-libtasn1-import-libtasn1-4.16.0.patch
+Patch0170: 0170-libtasn1-disable-code-not-needed-in-grub.patch
+Patch0171: 0171-libtasn1-changes-for-grub-compatibility.patch
+Patch0172: 0172-libtasn1-compile-into-asn1-module.patch
+Patch0173: 0173-test_asn1-test-module-for-libtasn1.patch
+Patch0174: 0174-grub-install-support-embedding-x509-certificates.patch
+Patch0175: 0175-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
+Patch0176: 0176-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
+Patch0177: 0177-appended-signatures-support-verifying-appended-signa.patch
+Patch0178: 0178-appended-signatures-verification-tests.patch
+Patch0179: 0179-appended-signatures-documentation.patch
+Patch0180: 0180-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
+Patch0181: 0181-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
+Patch0182: 0182-ieee1275-claim-more-memory.patch
+Patch0183: 0183-ieee1275-request-memory-with-ibm-client-architecture.patch
+Patch0184: 0184-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
+Patch0185: 0185-ieee1275-ofdisk-retry-on-open-failure.patch
+Patch0186: 0186-Allow-chainloading-EFI-apps-from-loop-mounts.patch
+Patch0187: 0187-efinet-Add-DHCP-proxy-support.patch
+Patch0188: 0188-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
+Patch0189: 0189-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
+Patch0190: 0190-Suppress-gettext-error-message.patch
+Patch0191: 0191-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
+Patch0192: 0192-templates-Check-for-EFI-at-runtime-instead-of-config.patch
+Patch0193: 0193-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
+Patch0194: 0194-arm64-Fix-EFI-loader-kernel-image-allocation.patch
+Patch0195: 0195-normal-main-Discover-the-device-to-read-the-config-f.patch
+Patch0196: 0196-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
+Patch0197: 0197-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
+Patch0198: 0198-Print-module-name-on-license-check-failure.patch
+Patch0199: 0199-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
+Patch0200: 0200-grub-mkconfig-restore-umask-for-grub.cfg.patch
+Patch0201: 0201-fs-btrfs-Use-full-btrfs-bootloader-area.patch
diff --git a/grub2.spec b/grub2.spec
index 7f22435a..47f48e7f 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -14,7 +14,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -523,6 +523,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Mon Jan 17 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-13
+- Update patches; minor changes at most, if correct
+
 * Thu Jan 06 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-12
 - btrfs: use full bootloader area