From 5e729561995f51781ddec73ba70fd544f7f3c569 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 22 Mar 2022 15:46:46 -0700
Subject: [PATCH] Revert "Use my sort patch instead", fix BLS ostree detection

This reverts commit 93004a8494732dca960febe24d987a8ff115de38,
because it broke Rawhide. It also tries to fixes BLS ostree
detection to work in chroots (e.g. during installation) by also
checking for /ostree/repo.
---
 0033-Use-rpm-s-sort-for-grub2-mkconfig.patch  | 475 ++++++++++++++++++
 ...fig-construct-titles-that-look-like-.patch |   0
 ...ly-grub2-password-config-tool-985962.patch |   8 +-
 ... 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 |   8 +-
 ...1374141-fix-incorrect-mask-for-ppc64.patch |   0
 ... 0040-Make-grub_fatal-also-backtrace.patch |   0
 ...ix-up-some-man-pages-rpmdiff-noticed.patch |   6 +-
 ...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 |   4 +-
 ... => 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 |   0
 ...4-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch |   0
 ...=> 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 |   6 +-
 ...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 |   4 +-
 ...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 |   4 +-
 ...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 |   6 +-
 ...make-it-possible-to-run-checkers-on-.patch |   0
 ...94-Rework-how-the-fdt-command-builds.patch |   0
 ...able-non-wordsize-allocations-on-arm.patch |   4 +-
 ...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 |   4 +-
 ...dprintf-and-nerf-dprintf-in-script.c.patch |   0
 ...-Better-memory-allocation-and-error-.patch |   0
 ...tter-locations-for-kernel-and-initrd.patch |   0
 ...p-all-the-places-Wsign-compare-error.patch |  16 +-
 ...gn-compare-Wno-conversion-Wno-error-.patch |   6 +-
 ...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 |   0
 ...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 |   0
 ...-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 |   0
 ...g-Update-comment-about-running-as-ro.patch |   0
 ...g-Write-new-env-to-tmpfile-and-then-.patch |   0
 ...indeterminate-getting-set-on-boot_su.patch |   0
 ... => 0124-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
 ...-literal-IPv6-addresses-in-square-br.patch |   0
 ...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 |   8 +-
 ...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 => 0164-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
 ...0167-libtasn1-import-libtasn1-4.16.0.patch |   0
 ...asn1-disable-code-not-needed-in-grub.patch |   0
 ...tasn1-changes-for-grub-compatibility.patch |   0
 ...70-libtasn1-compile-into-asn1-module.patch |   0
 ...1-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
 ...77-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 => 0180-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
 ...> 0185-efinet-Add-DHCP-proxy-support.patch |   0
 ...gnore-checksum-seed-incompat-feature.patch |   0
 ...-cmdline-when-generating-legacy-menu.patch |   0
 ... 0188-Suppress-gettext-error-message.patch |   0
 ...d-Always-use-boot-grub2-user.cfg-as-.patch |   0
 ...for-EFI-at-runtime-instead-of-config.patch |   0
 ...or-if-boot-to-firmware-setup-is-not-.patch |   0
 ...x-EFI-loader-kernel-image-allocation.patch |   0
 ...over-the-device-to-read-the-config-f.patch |   0
 ...etting-of-prefix-for-signed-binary-c.patch |   0
 ...adable-filesystem-with-v4-superblock.patch |   0
 ...module-name-on-license-check-failure.patch |   0
 ...pc-ieee1275-load-grub-at-4MB-not-2MB.patch |   0
 ...-mkconfig-restore-umask-for-grub.cfg.patch |   0
 ...btrfs-Use-full-btrfs-bootloader-area.patch |   0
 ...-Fedora-location-of-DejaVu-SANS-font.patch |   4 +-
 ...t-show-Booting-s-msg-when-auto-booti.patch |   0
 ...-Welcome-to-GRUB-message-in-EFI-buil.patch |   0
 ...ot-set-colorstate-until-the-first-te.patch |   0
 ...ot-set-cursor-until-the-first-text-o.patch |   0
 ...se-visual-indentation-in-config.h.in.patch |   0
 ...sure-config-util.h-precedes-config.h.patch |   0
 ...=> 0207-Drop-gnulib-fix-base64.patch.patch |   0
 ...h => 0208-Drop-gnulib-no-abort.patch.patch |   0
 ...version-and-drop-most-gnulib-patches.patch |   2 +-
 ...Fix-bug-stopping-iteration-when-no-f.patch |   0
 ...w-efidisk-only-option-on-EFI-systems.patch |   0
 ...h => 0212-efi-new-connectefi-command.patch |   0
 ...-i386-efi-linux.c-do-not-validate-ke.patch |   0
 ...-arm64-linux.c-do-not-validate-kerne.patch |   0
 ...-efi-chainloader.c-do-not-validate-c.patch |   0
 ...sorting-of-kernel-names-containing-_.patch |  34 --
 ...-efi-linux.c-drop-now-unused-grub_li.patch |   0
 grub.patches                                  | 368 +++++++-------
 grub2.spec                                    |   9 +-
 187 files changed, 731 insertions(+), 269 deletions(-)
 create mode 100644 0033-Use-rpm-s-sort-for-grub2-mkconfig.patch
 rename 0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch => 0034-Make-grub2-mkconfig-construct-titles-that-look-like-.patch (100%)
 rename 0034-Add-friendly-grub2-password-config-tool-985962.patch => 0035-Add-friendly-grub2-password-config-tool-985962.patch (98%)
 rename 0035-tcp-add-window-scaling-support.patch => 0036-tcp-add-window-scaling-support.patch (100%)
 rename 0036-efinet-and-bootp-add-support-for-dhcpv6.patch => 0037-efinet-and-bootp-add-support-for-dhcpv6.patch (100%)
 rename 0037-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 0038-bz1374141-fix-incorrect-mask-for-ppc64.patch => 0039-bz1374141-fix-incorrect-mask-for-ppc64.patch (100%)
 rename 0039-Make-grub_fatal-also-backtrace.patch => 0040-Make-grub_fatal-also-backtrace.patch (100%)
 rename 0040-Fix-up-some-man-pages-rpmdiff-noticed.patch => 0041-Fix-up-some-man-pages-rpmdiff-noticed.patch (96%)
 rename 0041-Make-our-info-pages-say-grub2-where-appropriate.patch => 0042-Make-our-info-pages-say-grub2-where-appropriate.patch (100%)
 rename 0042-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 0043-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch => 0044-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch (100%)
 rename 0044-export-btrfs_subvol-and-btrfs_subvolid.patch => 0045-export-btrfs_subvol-and-btrfs_subvolid.patch (100%)
 rename 0045-grub2-btrfs-03-follow_default.patch => 0046-grub2-btrfs-03-follow_default.patch (100%)
 rename 0046-grub2-btrfs-04-grub2-install.patch => 0047-grub2-btrfs-04-grub2-install.patch (100%)
 rename 0047-grub2-btrfs-05-grub2-mkconfig.patch => 0048-grub2-btrfs-05-grub2-mkconfig.patch (98%)
 rename 0048-grub2-btrfs-06-subvol-mount.patch => 0049-grub2-btrfs-06-subvol-mount.patch (100%)
 rename 0049-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 0050-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch => 0051-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch (100%)
 rename 0051-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 0052-Use-grub_efi_.-memory-helpers-where-reasonable.patch => 0053-Use-grub_efi_.-memory-helpers-where-reasonable.patch (100%)
 rename 0053-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch => 0054-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch (100%)
 rename 0054-don-t-use-int-for-efi-status.patch => 0055-don-t-use-int-for-efi-status.patch (100%)
 rename 0055-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch => 0056-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch (100%)
 rename 0056-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 0057-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 0058-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch => 0059-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch (100%)
 rename 0059-align-struct-efi_variable-better.patch => 0060-align-struct-efi_variable-better.patch (100%)
 rename 0060-Add-BLS-support-to-grub-mkconfig.patch => 0061-Add-BLS-support-to-grub-mkconfig.patch (99%)
 rename 0061-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 0062-Add-linux-and-initrd-commands-for-grub-emu.patch => 0063-Add-linux-and-initrd-commands-for-grub-emu.patch (100%)
 rename 0063-Add-grub2-switch-to-blscfg.patch => 0064-Add-grub2-switch-to-blscfg.patch (98%)
 rename 0064-make-better-backtraces.patch => 0065-make-better-backtraces.patch (99%)
 rename 0065-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 0066-Work-around-some-minor-include-path-weirdnesses.patch => 0067-Work-around-some-minor-include-path-weirdnesses.patch (100%)
 rename 0067-Make-it-possible-to-enabled-build-id-sha1.patch => 0068-Make-it-possible-to-enabled-build-id-sha1.patch (95%)
 rename 0068-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch => 0069-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch (100%)
 rename 0069-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch => 0070-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch (100%)
 rename 0070-Fixup-for-newer-compiler.patch => 0071-Fixup-for-newer-compiler.patch (100%)
 rename 0071-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 0072-Fixup-for-newer-compiler.patch => 0073-Fixup-for-newer-compiler.patch (100%)
 rename 0073-Add-support-for-non-Ethernet-network-cards.patch => 0074-Add-support-for-non-Ethernet-network-cards.patch (100%)
 rename 0074-net-read-bracketed-ipv6-addrs-and-port-numbers.patch => 0075-net-read-bracketed-ipv6-addrs-and-port-numbers.patch (100%)
 rename 0075-bootp-New-net_bootp6-command.patch => 0076-bootp-New-net_bootp6-command.patch (100%)
 rename 0076-efinet-UEFI-IPv6-PXE-support.patch => 0077-efinet-UEFI-IPv6-PXE-support.patch (100%)
 rename 0077-grub.texi-Add-net_bootp6-doument.patch => 0078-grub.texi-Add-net_bootp6-doument.patch (100%)
 rename 0078-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch => 0079-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch (100%)
 rename 0079-efinet-Setting-network-from-UEFI-device-path.patch => 0080-efinet-Setting-network-from-UEFI-device-path.patch (100%)
 rename 0080-efinet-Setting-DNS-server-from-UEFI-protocol.patch => 0081-efinet-Setting-DNS-server-from-UEFI-protocol.patch (100%)
 rename 0081-Support-UEFI-networking-protocols.patch => 0082-Support-UEFI-networking-protocols.patch (100%)
 rename 0082-AUDIT-0-http-boot-tracker-bug.patch => 0083-AUDIT-0-http-boot-tracker-bug.patch (100%)
 rename 0083-grub-editenv-Add-incr-command-to-increment-integer-v.patch => 0084-grub-editenv-Add-incr-command-to-increment-integer-v.patch (100%)
 rename 0084-Add-auto-hide-menu-support.patch => 0085-Add-auto-hide-menu-support.patch (99%)
 rename 0085-Add-grub-set-bootflag-utility.patch => 0086-Add-grub-set-bootflag-utility.patch (99%)
 rename 0086-docs-Add-grub-boot-indeterminate.service-example.patch => 0087-docs-Add-grub-boot-indeterminate.service-example.patch (100%)
 rename 0087-gentpl-add-disable-support.patch => 0088-gentpl-add-disable-support.patch (100%)
 rename 0088-gentpl-add-pc-firmware-type.patch => 0089-gentpl-add-pc-firmware-type.patch (100%)
 rename 0089-efinet-also-use-the-firmware-acceleration-for-http.patch => 0090-efinet-also-use-the-firmware-acceleration-for-http.patch (100%)
 rename 0090-efi-http-Make-root_url-reflect-the-protocol-hostname.patch => 0091-efi-http-Make-root_url-reflect-the-protocol-hostname.patch (100%)
 rename 0091-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch => 0092-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch (97%)
 rename 0092-module-verifier-make-it-possible-to-run-checkers-on-.patch => 0093-module-verifier-make-it-possible-to-run-checkers-on-.patch (100%)
 rename 0093-Rework-how-the-fdt-command-builds.patch => 0094-Rework-how-the-fdt-command-builds.patch (100%)
 rename 0094-Disable-non-wordsize-allocations-on-arm.patch => 0095-Disable-non-wordsize-allocations-on-arm.patch (93%)
 rename 0095-Prepend-prefix-when-HTTP-path-is-relative.patch => 0096-Prepend-prefix-when-HTTP-path-is-relative.patch (100%)
 rename 0096-Make-grub_error-more-verbose.patch => 0097-Make-grub_error-more-verbose.patch (100%)
 rename 0097-Make-reset-an-alias-for-the-reboot-command.patch => 0098-Make-reset-an-alias-for-the-reboot-command.patch (100%)
 rename 0098-Add-a-version-command.patch => 0099-Add-a-version-command.patch (98%)
 rename 0099-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch => 0100-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch (100%)
 rename 0100-arm-arm64-loader-Better-memory-allocation-and-error-.patch => 0101-arm-arm64-loader-Better-memory-allocation-and-error-.patch (100%)
 rename 0101-Try-to-pick-better-locations-for-kernel-and-initrd.patch => 0102-Try-to-pick-better-locations-for-kernel-and-initrd.patch (100%)
 rename 0102-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch => 0103-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch (93%)
 rename 0103-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch => 0104-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch (93%)
 rename 0104-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch => 0105-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch (100%)
 rename 0105-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 0106-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch => 0107-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch (100%)
 rename 0107-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch => 0108-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch (100%)
 rename 0108-Fix-getroot.c-s-trampolines.patch => 0109-Fix-getroot.c-s-trampolines.patch (100%)
 rename 0109-Do-not-allow-stack-trampolines-anywhere.patch => 0110-Do-not-allow-stack-trampolines-anywhere.patch (93%)
 rename 0110-Reimplement-boot_counter.patch => 0111-Reimplement-boot_counter.patch (99%)
 rename 0111-Fix-menu-entry-selection-based-on-ID-and-title.patch => 0112-Fix-menu-entry-selection-based-on-ID-and-title.patch (100%)
 rename 0112-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 0113-Add-efi-export-env-and-efi-load-env-commands.patch => 0114-Add-efi-export-env-and-efi-load-env-commands.patch (100%)
 rename 0114-Make-it-possible-to-subtract-conditions-from-debug.patch => 0115-Make-it-possible-to-subtract-conditions-from-debug.patch (100%)
 rename 0115-Export-all-variables-from-the-initial-context-when-c.patch => 0116-Export-all-variables-from-the-initial-context-when-c.patch (100%)
 rename 0116-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 0117-Fix-systemctl-kexec-exit-status-check.patch => 0118-Fix-systemctl-kexec-exit-status-check.patch (100%)
 rename 0118-Print-grub-emu-linux-loader-messages-as-debug.patch => 0119-Print-grub-emu-linux-loader-messages-as-debug.patch (100%)
 rename 0119-Don-t-assume-that-boot-commands-will-only-return-on-.patch => 0120-Don-t-assume-that-boot-commands-will-only-return-on-.patch (100%)
 rename 0120-grub-set-bootflag-Update-comment-about-running-as-ro.patch => 0121-grub-set-bootflag-Update-comment-about-running-as-ro.patch (100%)
 rename 0121-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch => 0122-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch (100%)
 rename 0122-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch => 0123-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch (100%)
 rename 0123-Add-start-symbol-for-RISC-V.patch => 0124-Add-start-symbol-for-RISC-V.patch (100%)
 rename 0124-bootstrap.conf-Force-autogen.sh-to-use-python3.patch => 0125-bootstrap.conf-Force-autogen.sh-to-use-python3.patch (100%)
 rename 0125-efi-http-Export-fw-http-_path-variables-to-make-them.patch => 0126-efi-http-Export-fw-http-_path-variables-to-make-them.patch (100%)
 rename 0126-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch => 0127-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch (100%)
 rename 0127-efi-net-Allow-to-specify-a-port-number-in-addresses.patch => 0128-efi-net-Allow-to-specify-a-port-number-in-addresses.patch (100%)
 rename 0128-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch => 0129-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch (100%)
 rename 0129-efi-net-Print-a-debug-message-if-parsing-the-address.patch => 0130-efi-net-Print-a-debug-message-if-parsing-the-address.patch (100%)
 rename 0130-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch => 0131-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch (100%)
 rename 0131-efi-Set-image-base-address-before-jumping-to-the-PE-.patch => 0132-efi-Set-image-base-address-before-jumping-to-the-PE-.patch (100%)
 rename 0132-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch => 0133-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch (100%)
 rename 0133-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch => 0134-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch (100%)
 rename 0134-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch => 0135-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch (100%)
 rename 0135-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch => 0136-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch (100%)
 rename 0136-efi-dhcp-fix-some-allocation-error-checking.patch => 0137-efi-dhcp-fix-some-allocation-error-checking.patch (100%)
 rename 0137-efi-http-fix-some-allocation-error-checking.patch => 0138-efi-http-fix-some-allocation-error-checking.patch (100%)
 rename 0138-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch => 0139-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch (100%)
 rename 0139-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch => 0140-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch (100%)
 rename 0140-linuxefi-fail-kernel-validation-without-shim-protoco.patch => 0141-linuxefi-fail-kernel-validation-without-shim-protoco.patch (100%)
 rename 0141-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch => 0142-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch (100%)
 rename 0142-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch => 0143-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch (100%)
 rename 0143-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch => 0144-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch (100%)
 rename 0144-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch => 0145-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch (100%)
 rename 0145-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch => 0146-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch (100%)
 rename 0146-Add-systemd-integration-scripts-to-make-systemctl-re.patch => 0147-Add-systemd-integration-scripts-to-make-systemctl-re.patch (99%)
 rename 0147-systemd-integration.sh-Also-set-old-menu_show_once-g.patch => 0148-systemd-integration.sh-Also-set-old-menu_show_once-g.patch (100%)
 rename 0148-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch => 0149-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch (100%)
 rename 0149-grub-install-disable-support-for-EFI-platforms.patch => 0150-grub-install-disable-support-for-EFI-platforms.patch (100%)
 rename 0150-New-with-debug-timestamps-configure-flag-to-prepend-.patch => 0151-New-with-debug-timestamps-configure-flag-to-prepend-.patch (95%)
 rename 0151-Added-debug-statements-to-grub_disk_open-and-grub_di.patch => 0152-Added-debug-statements-to-grub_disk_open-and-grub_di.patch (100%)
 rename 0152-Introduce-function-grub_debug_is_enabled-void-return.patch => 0153-Introduce-function-grub_debug_is_enabled-void-return.patch (100%)
 rename 0153-Don-t-clear-screen-when-debugging-is-enabled.patch => 0154-Don-t-clear-screen-when-debugging-is-enabled.patch (100%)
 rename 0154-grub_file_-instrumentation-new-file-debug-tag.patch => 0155-grub_file_-instrumentation-new-file-debug-tag.patch (100%)
 rename 0155-ieee1275-Avoiding-many-unecessary-open-close.patch => 0156-ieee1275-Avoiding-many-unecessary-open-close.patch (100%)
 rename 0156-ieee1275-powerpc-implements-fibre-channel-discovery-.patch => 0157-ieee1275-powerpc-implements-fibre-channel-discovery-.patch (100%)
 rename 0157-ieee1275-powerpc-enables-device-mapper-discovery.patch => 0158-ieee1275-powerpc-enables-device-mapper-discovery.patch (100%)
 rename 0158-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch => 0159-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch (100%)
 rename 0159-Add-suport-for-signing-grub-with-an-appended-signatu.patch => 0160-Add-suport-for-signing-grub-with-an-appended-signatu.patch (100%)
 rename 0160-docs-grub-Document-signing-grub-under-UEFI.patch => 0161-docs-grub-Document-signing-grub-under-UEFI.patch (100%)
 rename 0161-docs-grub-Document-signing-grub-with-an-appended-sig.patch => 0162-docs-grub-Document-signing-grub-with-an-appended-sig.patch (100%)
 rename 0162-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch => 0163-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch (100%)
 rename 0163-pgp-factor-out-rsa_pad.patch => 0164-pgp-factor-out-rsa_pad.patch (100%)
 rename 0164-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch => 0165-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch (100%)
 rename 0165-posix_wrap-tweaks-in-preparation-for-libtasn1.patch => 0166-posix_wrap-tweaks-in-preparation-for-libtasn1.patch (100%)
 rename 0166-libtasn1-import-libtasn1-4.16.0.patch => 0167-libtasn1-import-libtasn1-4.16.0.patch (100%)
 rename 0167-libtasn1-disable-code-not-needed-in-grub.patch => 0168-libtasn1-disable-code-not-needed-in-grub.patch (100%)
 rename 0168-libtasn1-changes-for-grub-compatibility.patch => 0169-libtasn1-changes-for-grub-compatibility.patch (100%)
 rename 0169-libtasn1-compile-into-asn1-module.patch => 0170-libtasn1-compile-into-asn1-module.patch (100%)
 rename 0170-test_asn1-test-module-for-libtasn1.patch => 0171-test_asn1-test-module-for-libtasn1.patch (99%)
 rename 0171-grub-install-support-embedding-x509-certificates.patch => 0172-grub-install-support-embedding-x509-certificates.patch (100%)
 rename 0172-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch => 0173-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch (100%)
 rename 0173-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch => 0174-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch (100%)
 rename 0174-appended-signatures-support-verifying-appended-signa.patch => 0175-appended-signatures-support-verifying-appended-signa.patch (100%)
 rename 0175-appended-signatures-verification-tests.patch => 0176-appended-signatures-verification-tests.patch (100%)
 rename 0176-appended-signatures-documentation.patch => 0177-appended-signatures-documentation.patch (100%)
 rename 0177-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch => 0178-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch (100%)
 rename 0178-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch => 0179-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch (100%)
 rename 0179-ieee1275-claim-more-memory.patch => 0180-ieee1275-claim-more-memory.patch (100%)
 rename 0180-ieee1275-request-memory-with-ibm-client-architecture.patch => 0181-ieee1275-request-memory-with-ibm-client-architecture.patch (100%)
 rename 0181-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch => 0182-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch (100%)
 rename 0182-ieee1275-ofdisk-retry-on-open-failure.patch => 0183-ieee1275-ofdisk-retry-on-open-failure.patch (100%)
 rename 0183-Allow-chainloading-EFI-apps-from-loop-mounts.patch => 0184-Allow-chainloading-EFI-apps-from-loop-mounts.patch (100%)
 rename 0184-efinet-Add-DHCP-proxy-support.patch => 0185-efinet-Add-DHCP-proxy-support.patch (100%)
 rename 0185-fs-ext2-Ignore-checksum-seed-incompat-feature.patch => 0186-fs-ext2-Ignore-checksum-seed-incompat-feature.patch (100%)
 rename 0186-Don-t-update-the-cmdline-when-generating-legacy-menu.patch => 0187-Don-t-update-the-cmdline-when-generating-legacy-menu.patch (100%)
 rename 0187-Suppress-gettext-error-message.patch => 0188-Suppress-gettext-error-message.patch (100%)
 rename 0188-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch => 0189-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch (100%)
 rename 0189-templates-Check-for-EFI-at-runtime-instead-of-config.patch => 0190-templates-Check-for-EFI-at-runtime-instead-of-config.patch (100%)
 rename 0190-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch => 0191-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch (100%)
 rename 0191-arm64-Fix-EFI-loader-kernel-image-allocation.patch => 0192-arm64-Fix-EFI-loader-kernel-image-allocation.patch (100%)
 rename 0192-normal-main-Discover-the-device-to-read-the-config-f.patch => 0193-normal-main-Discover-the-device-to-read-the-config-f.patch (100%)
 rename 0193-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch => 0194-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch (100%)
 rename 0194-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch => 0195-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch (100%)
 rename 0195-Print-module-name-on-license-check-failure.patch => 0196-Print-module-name-on-license-check-failure.patch (100%)
 rename 0196-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch => 0197-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch (100%)
 rename 0197-grub-mkconfig-restore-umask-for-grub.cfg.patch => 0198-grub-mkconfig-restore-umask-for-grub.cfg.patch (100%)
 rename 0198-fs-btrfs-Use-full-btrfs-bootloader-area.patch => 0199-fs-btrfs-Use-full-btrfs-bootloader-area.patch (100%)
 rename 0199-Add-Fedora-location-of-DejaVu-SANS-font.patch => 0200-Add-Fedora-location-of-DejaVu-SANS-font.patch (95%)
 rename 0200-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch => 0201-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch (100%)
 rename 0201-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch => 0202-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch (100%)
 rename 0202-EFI-console-Do-not-set-colorstate-until-the-first-te.patch => 0203-EFI-console-Do-not-set-colorstate-until-the-first-te.patch (100%)
 rename 0203-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch => 0204-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch (100%)
 rename 0204-Use-visual-indentation-in-config.h.in.patch => 0205-Use-visual-indentation-in-config.h.in.patch (100%)
 rename 0205-Where-present-ensure-config-util.h-precedes-config.h.patch => 0206-Where-present-ensure-config-util.h-precedes-config.h.patch (100%)
 rename 0206-Drop-gnulib-fix-base64.patch.patch => 0207-Drop-gnulib-fix-base64.patch.patch (100%)
 rename 0207-Drop-gnulib-no-abort.patch.patch => 0208-Drop-gnulib-no-abort.patch.patch (100%)
 rename 0208-Update-gnulib-version-and-drop-most-gnulib-patches.patch => 0209-Update-gnulib-version-and-drop-most-gnulib-patches.patch (99%)
 rename 0209-commands-search-Fix-bug-stopping-iteration-when-no-f.patch => 0210-commands-search-Fix-bug-stopping-iteration-when-no-f.patch (100%)
 rename 0210-search-new-efidisk-only-option-on-EFI-systems.patch => 0211-search-new-efidisk-only-option-on-EFI-systems.patch (100%)
 rename 0211-efi-new-connectefi-command.patch => 0212-efi-new-connectefi-command.patch (100%)
 rename 0212-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch => 0213-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch (100%)
 rename 0213-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch => 0214-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch (100%)
 rename 0214-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch => 0215-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch (100%)
 delete mode 100644 0216-Correct-sorting-of-kernel-names-containing-_.patch
 rename 0215-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch => 0216-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch (100%)

diff --git a/0033-Use-rpm-s-sort-for-grub2-mkconfig.patch b/0033-Use-rpm-s-sort-for-grub2-mkconfig.patch
new file mode 100644
index 00000000..ff1c13ec
--- /dev/null
+++ b/0033-Use-rpm-s-sort-for-grub2-mkconfig.patch
@@ -0,0 +1,475 @@
+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 rpm's sort for grub2-mkconfig
+
+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              |  37 ++++++
+ Makefile.util.def         |  17 +++
+ util/grub-rpm-sort.c      | 281 ++++++++++++++++++++++++++++++++++++++++++++++
+ util/grub-mkconfig_lib.in |  11 +-
+ util/grub-rpm-sort.8      |  12 ++
+ 5 files changed, 357 insertions(+), 1 deletion(-)
+ create mode 100644 util/grub-rpm-sort.c
+ create mode 100644 util/grub-rpm-sort.8
+
+diff --git a/configure.ac b/configure.ac
+index bec8535af70..643a13f9147 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
+ grub_TRANSFORM([grub-mkrescue])
+ grub_TRANSFORM([grub-probe])
+ grub_TRANSFORM([grub-reboot])
++grub_TRANSFORM([grub-rpm-sort])
+ grub_TRANSFORM([grub-script-check])
+ grub_TRANSFORM([grub-set-default])
+ grub_TRANSFORM([grub-sparc64-setup])
+@@ -95,6 +96,7 @@ grub_TRANSFORM([grub-mkrescue.1])
+ grub_TRANSFORM([grub-mkstandalone.3])
+ grub_TRANSFORM([grub-ofpathname.3])
+ grub_TRANSFORM([grub-probe.3])
++grub_TRANSFORM([grub-rpm-sort.8])
+ grub_TRANSFORM([grub-reboot.3])
+ grub_TRANSFORM([grub-render-label.3])
+ grub_TRANSFORM([grub-script-check.3])
+@@ -1860,6 +1862,35 @@ fi
+ 
+ AC_SUBST([LIBDEVMAPPER])
+ 
++AC_ARG_ENABLE([rpm-sort],
++              [AS_HELP_STRING([--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
++  # Check for rpmlib header.
++  AC_CHECK_HEADER([rpm/rpmlib.h], [],
++               [rpm_sort_excuse="need rpm/rpmlib header"])
++fi
++
++if test x"$rpm_sort_excuse" = x ; then
++  # 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 rpmio library.])
++fi
++
++AC_SUBST([LIBRPM])
++
+ 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..bc10cc79722 100644
+--- a/Makefile.util.def
++++ b/Makefile.util.def
+@@ -703,6 +703,23 @@ program = {
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
+ };
+ 
++program = {
++  name = grub-rpm-sort;
++  mansection = 8;
++  installdir = sbin;
++
++  common = grub-core/kern/emu/misc.c;
++  common = grub-core/kern/emu/argp_common.c;
++  common = grub-core/osdep/init.c;
++  common = util/misc.c;
++  common = util/grub-rpm-sort.c;
++
++  ldadd = libgrubkern.a;
++  ldadd = grub-core/lib/gnulib/libgnu.a;
++  ldadd = '$(LIBDEVMAPPER) $(LIBRPM)';
++  condition = COND_GRUB_RPM_SORT;
++};
++
+ script = {
+   name = grub-mkconfig;
+   common = util/grub-mkconfig.in;
+diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
+new file mode 100644
+index 00000000000..f33bd1ed568
+--- /dev/null
++++ b/util/grub-rpm-sort.c
+@@ -0,0 +1,281 @@
++#include <config.h>
++#include <grub/types.h>
++#include <grub/util/misc.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <errno.h>
++#include <assert.h>
++#include <argp.h>
++#include <rpm/rpmlib.h>
++
++static size_t
++read_file (const char *input, char **ret)
++{
++  FILE *in;
++  size_t s;
++  size_t sz = 2048;
++  size_t offset = 0;
++  char *text;
++
++  if (!strcmp(input, "-"))
++    in = stdin;
++  else
++    in = grub_util_fopen(input, "r");
++
++  text = xmalloc (sz);
++
++  if (!in)
++    grub_util_error (_("cannot open `%s': %s"), input, strerror (errno));
++
++  while ((s = fread (text + offset, 1, sz - offset, in)) != 0)
++    {
++      offset += s;
++      if (sz - offset == 0)
++	{
++	  sz += 2048;
++	  text = xrealloc (text, sz);
++	}
++    }
++
++  text[offset] = '\0';
++  *ret = text;
++
++  if (in != stdin)
++    fclose(in);
++
++  return offset + 1;
++}
++
++/* returns name/version/release */
++/* NULL string pointer returned if nothing found */
++static void
++split_package_string (char *package_string, char **name,
++                     char **version, char **release)
++{
++  char *package_version, *package_release;
++
++  /* Release */
++  package_release = strrchr (package_string, '-');
++
++  if (package_release != NULL)
++      *package_release++ = '\0';
++
++  *release = package_release;
++
++  /* Version */
++  package_version = strrchr(package_string, '-');
++
++  if (package_version != NULL)
++      *package_version++ = '\0';
++
++  *version = package_version;
++  /* Name */
++  *name = package_string;
++
++  /* Bubble up non-null values from release to name */
++  if (*name == NULL)
++    {
++      *name = (*version == NULL ? *release : *version);
++      *version = *release;
++      *release = NULL;
++    }
++  if (*version == NULL)
++    {
++      *version = *release;
++      *release = NULL;
++    }
++}
++
++/*
++ * package name-version-release comparator for qsort
++ * expects p, q which are pointers to character strings (char *)
++ * which will not be altered in this function
++ */
++static int
++package_version_compare (const void *p, const void *q)
++{
++  char *local_p, *local_q;
++  char *lhs_name, *lhs_version, *lhs_release;
++  char *rhs_name, *rhs_version, *rhs_release;
++  int vercmpflag = 0;
++
++  local_p = alloca (strlen (*(char * const *)p) + 1);
++  local_q = alloca (strlen (*(char * const *)q) + 1);
++
++  /* make sure these allocated */
++  assert (local_p);
++  assert (local_q);
++
++  strcpy (local_p, *(char * const *)p);
++  strcpy (local_q, *(char * const *)q);
++
++  split_package_string (local_p, &lhs_name, &lhs_version, &lhs_release);
++  split_package_string (local_q, &rhs_name, &rhs_version, &rhs_release);
++
++  /* Check Name and return if unequal */
++  vercmpflag = rpmvercmp ((lhs_name == NULL ? "" : lhs_name),
++                          (rhs_name == NULL ? "" : rhs_name));
++  if (vercmpflag != 0)
++    return vercmpflag;
++
++  /* Check version and return if unequal */
++  vercmpflag = rpmvercmp ((lhs_version == NULL ? "" : lhs_version),
++                          (rhs_version == NULL ? "" : rhs_version));
++  if (vercmpflag != 0)
++    return vercmpflag;
++
++  /* Check release and return the version compare value */
++  vercmpflag = rpmvercmp ((lhs_release == NULL ? "" : lhs_release),
++                          (rhs_release == NULL ? "" : rhs_release));
++
++  return vercmpflag;
++}
++
++static void
++add_input (const char *filename, char ***package_names, size_t *n_package_names)
++{
++  char *orig_input_buffer = NULL;
++  char *input_buffer;
++  char *position_of_newline;
++  char **names = *package_names;
++  char **new_names = NULL;
++  size_t n_names = *n_package_names;
++
++  if (!*package_names)
++    new_names = names = xmalloc (sizeof (char *) * 2);
++
++  if (read_file (filename, &orig_input_buffer) < 2)
++    {
++      if (new_names)
++	free (new_names);
++      if (orig_input_buffer)
++	free (orig_input_buffer);
++      return;
++    }
++
++  input_buffer = orig_input_buffer;
++  while (input_buffer && *input_buffer &&
++	 (position_of_newline = strchrnul (input_buffer, '\n')))
++    {
++      size_t sz = position_of_newline - input_buffer;
++      char *new;
++
++      if (sz == 0)
++	{
++	  input_buffer = position_of_newline + 1;
++	  continue;
++	}
++
++      new = xmalloc (sz+1);
++      strncpy (new, input_buffer, sz);
++      new[sz] = '\0';
++
++      names = xrealloc (names, sizeof (char *) * (n_names + 1));
++      names[n_names] = new;
++      n_names++;
++
++      /* move buffer ahead to next line */
++      input_buffer = position_of_newline + 1;
++      if (*position_of_newline == '\0')
++	input_buffer = NULL;
++    }
++
++  free (orig_input_buffer);
++
++  *package_names = names;
++  *n_package_names = n_names;
++}
++
++static char *
++help_filter (int key, const char *text, void *input __attribute__ ((unused)))
++{
++  return (char *)text;
++}
++
++static struct argp_option options[] = {
++  { 0, }
++};
++
++struct arguments
++{
++  size_t ninputs;
++  size_t input_max;
++  char **inputs;
++};
++
++static error_t
++argp_parser (int key, char *arg, struct argp_state *state)
++{
++  struct arguments *arguments = state->input;
++  switch (key)
++    {
++    case ARGP_KEY_ARG:
++      assert (arguments->ninputs < arguments->input_max);
++      arguments->inputs[arguments->ninputs++] = xstrdup (arg);
++      break;
++    default:
++      return ARGP_ERR_UNKNOWN;
++    }
++  return 0;
++}
++
++static struct argp argp = {
++  options, argp_parser, N_("[INPUT_FILES]"),
++  N_("Sort a list of strings in RPM version sort order."),
++  NULL, help_filter, NULL
++};
++
++int
++main (int argc, char *argv[])
++{
++  struct arguments arguments;
++  char **package_names = NULL;
++  size_t n_package_names = 0;
++  int i;
++
++  grub_util_host_init (&argc, &argv);
++
++  memset (&arguments, 0, sizeof (struct arguments));
++  arguments.input_max = argc+1;
++  arguments.inputs = xmalloc ((arguments.input_max + 1)
++			      * sizeof (arguments.inputs[0]));
++  memset (arguments.inputs, 0, (arguments.input_max + 1)
++	  * sizeof (arguments.inputs[0]));
++
++  /* Parse our arguments */
++  if (argp_parse (&argp, argc, argv, 0, 0, &arguments) != 0)
++    grub_util_error ("%s", _("Error in parsing command line arguments\n"));
++
++  /* If there's no inputs in argv, add one for stdin */
++  if (!arguments.ninputs)
++    {
++      arguments.ninputs = 1;
++      arguments.inputs[0] = xmalloc (2);
++      strcpy(arguments.inputs[0], "-");
++    }
++
++  for (i = 0; i < arguments.ninputs; i++)
++    add_input(arguments.inputs[i], &package_names, &n_package_names);
++
++  if (package_names == NULL || n_package_names < 1)
++    grub_util_error ("%s", _("Invalid input\n"));
++
++  qsort (package_names, n_package_names, sizeof (char *),
++	 package_version_compare);
++
++  /* send sorted list to stdout */
++  for (i = 0; i < n_package_names; i++)
++    {
++      fprintf (stdout, "%s\n", package_names[i]);
++      free (package_names[i]);
++    }
++
++  free (package_names);
++  for (i = 0; i < arguments.ninputs; i++)
++    free (arguments.inputs[i]);
++
++  free (arguments.inputs);
++
++  return 0;
++}
+diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
+index 0f6505bf3b6..42c2ea9ba50 100644
+--- a/util/grub-mkconfig_lib.in
++++ b/util/grub-mkconfig_lib.in
+@@ -33,6 +33,9 @@ fi
+ if test "x$grub_mkrelpath" = x; then
+   grub_mkrelpath="${bindir}/@grub_mkrelpath@"
+ fi
++if test "x$grub_rpm_sort" = x; then
++  grub_rpm_sort="${sbindir}/@grub_rpm_sort@"
++fi
+ 
+ if command -v gettext >/dev/null; then
+   :
+@@ -218,6 +221,12 @@ version_sort ()
+    esac
+ }
+ 
++if [ "x$grub_rpm_sort" != x -a -x "$grub_rpm_sort" ]; then
++  kernel_sort="$grub_rpm_sort"
++else
++  kernel_sort=version_sort
++fi
++
+ version_test_numeric ()
+ {
+   version_test_numeric_a="$1"
+@@ -234,7 +243,7 @@ version_test_numeric ()
+     version_test_numeric_a="$version_test_numeric_b"
+     version_test_numeric_b="$version_test_numeric_c"
+   fi
+-  if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | version_sort | head -n 1 | grep -qx "$version_test_numeric_b" ; then
++  if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | "$kernel_sort" | head -n 1 | grep -qx "$version_test_numeric_b" ; then
+     return 0
+   else
+     return 1
+diff --git a/util/grub-rpm-sort.8 b/util/grub-rpm-sort.8
+new file mode 100644
+index 00000000000..8ce21488448
+--- /dev/null
++++ b/util/grub-rpm-sort.8
+@@ -0,0 +1,12 @@
++.TH GRUB-RPM-SORT 8 "Wed Feb 26 2014"
++.SH NAME
++\fBgrub-rpm-sort\fR \(em Sort input according to RPM version compare.
++
++.SH SYNOPSIS
++\fBgrub-rpm-sort\fR [OPTIONS].
++
++.SH DESCRIPTION
++You should not normally run this program directly.  Use grub-mkconfig instead.
++
++.SH SEE ALSO
++.BR "info grub"
diff --git a/0033-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 0033-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
rename to 0034-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
diff --git a/0034-Add-friendly-grub2-password-config-tool-985962.patch b/0035-Add-friendly-grub2-password-config-tool-985962.patch
similarity index 98%
rename from 0034-Add-friendly-grub2-password-config-tool-985962.patch
rename to 0035-Add-friendly-grub2-password-config-tool-985962.patch
index 0bc17f76..2d6f18a6 100644
--- a/0034-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 bec8535af70..22d289eacb9 100644
+index 643a13f9147..25e1abb59b9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -72,6 +72,7 @@ grub_TRANSFORM([grub-mkrelpath])
@@ -35,11 +35,11 @@ index bec8535af70..22d289eacb9 100644
  grub_TRANSFORM([grub-probe])
  grub_TRANSFORM([grub-reboot])
 +grub_TRANSFORM([grub-set-password])
+ grub_TRANSFORM([grub-rpm-sort])
  grub_TRANSFORM([grub-script-check])
  grub_TRANSFORM([grub-set-default])
- grub_TRANSFORM([grub-sparc64-setup])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 2c9b283a230..4ee22c5daad 100644
+index bc10cc79722..8ca4c14f0b9 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -452,6 +452,12 @@ script = {
@@ -55,7 +55,7 @@ index 2c9b283a230..4ee22c5daad 100644
  script = {
    name = '10_windows';
    common = util/grub.d/10_windows.in;
-@@ -724,6 +730,13 @@ script = {
+@@ -741,6 +747,13 @@ script = {
    installdir = sbin;
  };
  
diff --git a/0035-tcp-add-window-scaling-support.patch b/0036-tcp-add-window-scaling-support.patch
similarity index 100%
rename from 0035-tcp-add-window-scaling-support.patch
rename to 0036-tcp-add-window-scaling-support.patch
diff --git a/0036-efinet-and-bootp-add-support-for-dhcpv6.patch b/0037-efinet-and-bootp-add-support-for-dhcpv6.patch
similarity index 100%
rename from 0036-efinet-and-bootp-add-support-for-dhcpv6.patch
rename to 0037-efinet-and-bootp-add-support-for-dhcpv6.patch
diff --git a/0037-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 0037-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 e9518f84..bf78c813 100644
--- a/0037-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 22d289eacb9..c02898b7568 100644
+index 25e1abb59b9..58e57a745fa 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-install])
@@ -34,7 +34,7 @@ index 22d289eacb9..c02898b7568 100644
  grub_TRANSFORM([grub-glue-efi])
  grub_TRANSFORM([grub-mklayout])
  grub_TRANSFORM([grub-mkpasswd-pbkdf2])
-@@ -81,6 +82,7 @@ grub_TRANSFORM([grub-file])
+@@ -82,6 +83,7 @@ grub_TRANSFORM([grub-file])
  grub_TRANSFORM([grub-bios-setup.3])
  grub_TRANSFORM([grub-editenv.1])
  grub_TRANSFORM([grub-fstest.3])
@@ -43,10 +43,10 @@ index 22d289eacb9..c02898b7568 100644
  grub_TRANSFORM([grub-install.1])
  grub_TRANSFORM([grub-kbdcomp.3])
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 4ee22c5daad..18a92427767 100644
+index 8ca4c14f0b9..43a1c7453b1 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -716,6 +716,13 @@ script = {
+@@ -733,6 +733,13 @@ script = {
    installdir = sbin;
  };
  
diff --git a/0038-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0039-bz1374141-fix-incorrect-mask-for-ppc64.patch
similarity index 100%
rename from 0038-bz1374141-fix-incorrect-mask-for-ppc64.patch
rename to 0039-bz1374141-fix-incorrect-mask-for-ppc64.patch
diff --git a/0039-Make-grub_fatal-also-backtrace.patch b/0040-Make-grub_fatal-also-backtrace.patch
similarity index 100%
rename from 0039-Make-grub_fatal-also-backtrace.patch
rename to 0040-Make-grub_fatal-also-backtrace.patch
diff --git a/0040-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0041-Fix-up-some-man-pages-rpmdiff-noticed.patch
similarity index 96%
rename from 0040-Fix-up-some-man-pages-rpmdiff-noticed.patch
rename to 0041-Fix-up-some-man-pages-rpmdiff-noticed.patch
index b4f39c00..be584175 100644
--- a/0040-Fix-up-some-man-pages-rpmdiff-noticed.patch
+++ b/0041-Fix-up-some-man-pages-rpmdiff-noticed.patch
@@ -13,10 +13,10 @@ 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 c02898b7568..24f3be54bca 100644
+index 58e57a745fa..a0030632220 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -86,6 +86,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
+@@ -87,6 +87,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
  grub_TRANSFORM([grub-glue-efi.3])
  grub_TRANSFORM([grub-install.1])
  grub_TRANSFORM([grub-kbdcomp.3])
@@ -24,7 +24,7 @@ index c02898b7568..24f3be54bca 100644
  grub_TRANSFORM([grub-menulst2cfg.1])
  grub_TRANSFORM([grub-mkconfig.1])
  grub_TRANSFORM([grub-mkfont.3])
-@@ -103,6 +104,7 @@ grub_TRANSFORM([grub-render-label.3])
+@@ -105,6 +106,7 @@ grub_TRANSFORM([grub-render-label.3])
  grub_TRANSFORM([grub-script-check.3])
  grub_TRANSFORM([grub-set-default.1])
  grub_TRANSFORM([grub-sparc64-setup.3])
diff --git a/0041-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 0041-Make-our-info-pages-say-grub2-where-appropriate.patch
rename to 0042-Make-our-info-pages-say-grub2-where-appropriate.patch
diff --git a/0042-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 0042-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/0043-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 0043-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
rename to 0044-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
diff --git a/0044-export-btrfs_subvol-and-btrfs_subvolid.patch b/0045-export-btrfs_subvol-and-btrfs_subvolid.patch
similarity index 100%
rename from 0044-export-btrfs_subvol-and-btrfs_subvolid.patch
rename to 0045-export-btrfs_subvol-and-btrfs_subvolid.patch
diff --git a/0045-grub2-btrfs-03-follow_default.patch b/0046-grub2-btrfs-03-follow_default.patch
similarity index 100%
rename from 0045-grub2-btrfs-03-follow_default.patch
rename to 0046-grub2-btrfs-03-follow_default.patch
diff --git a/0046-grub2-btrfs-04-grub2-install.patch b/0047-grub2-btrfs-04-grub2-install.patch
similarity index 100%
rename from 0046-grub2-btrfs-04-grub2-install.patch
rename to 0047-grub2-btrfs-04-grub2-install.patch
diff --git a/0047-grub2-btrfs-05-grub2-mkconfig.patch b/0048-grub2-btrfs-05-grub2-mkconfig.patch
similarity index 98%
rename from 0047-grub2-btrfs-05-grub2-mkconfig.patch
rename to 0048-grub2-btrfs-05-grub2-mkconfig.patch
index 6fb1d640..5afd183c 100644
--- a/0047-grub2-btrfs-05-grub2-mkconfig.patch
+++ b/0048-grub2-btrfs-05-grub2-mkconfig.patch
@@ -27,10 +27,10 @@ index 005f093809b..535c0f02499 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 0f6505bf3b6..5e96f6cc5d2 100644
+index 42c2ea9ba50..fafeac95061 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
-@@ -49,7 +49,11 @@ grub_warn ()
+@@ -52,7 +52,11 @@ grub_warn ()
  
  make_system_path_relative_to_its_root ()
  {
diff --git a/0048-grub2-btrfs-06-subvol-mount.patch b/0049-grub2-btrfs-06-subvol-mount.patch
similarity index 100%
rename from 0048-grub2-btrfs-06-subvol-mount.patch
rename to 0049-grub2-btrfs-06-subvol-mount.patch
diff --git a/0049-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 0049-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/0050-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 0050-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
rename to 0051-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
diff --git a/0051-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 0051-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/0052-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0053-Use-grub_efi_.-memory-helpers-where-reasonable.patch
similarity index 100%
rename from 0052-Use-grub_efi_.-memory-helpers-where-reasonable.patch
rename to 0053-Use-grub_efi_.-memory-helpers-where-reasonable.patch
diff --git a/0053-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0054-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
similarity index 100%
rename from 0053-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
rename to 0054-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
diff --git a/0054-don-t-use-int-for-efi-status.patch b/0055-don-t-use-int-for-efi-status.patch
similarity index 100%
rename from 0054-don-t-use-int-for-efi-status.patch
rename to 0055-don-t-use-int-for-efi-status.patch
diff --git a/0055-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 0055-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
rename to 0056-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
diff --git a/0056-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 0056-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/0057-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 0057-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/0058-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 0058-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/0059-align-struct-efi_variable-better.patch b/0060-align-struct-efi_variable-better.patch
similarity index 100%
rename from 0059-align-struct-efi_variable-better.patch
rename to 0060-align-struct-efi_variable-better.patch
diff --git a/0060-Add-BLS-support-to-grub-mkconfig.patch b/0061-Add-BLS-support-to-grub-mkconfig.patch
similarity index 99%
rename from 0060-Add-BLS-support-to-grub-mkconfig.patch
rename to 0061-Add-BLS-support-to-grub-mkconfig.patch
index 6feb7474..7211afba 100644
--- a/0060-Add-BLS-support-to-grub-mkconfig.patch
+++ b/0061-Add-BLS-support-to-grub-mkconfig.patch
@@ -89,7 +89,7 @@ index 535c0f02499..f55339a3f64 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 5e96f6cc5d2..301d8a8a1e4 100644
+index fafeac95061..d8bb4069360 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -30,6 +30,9 @@ fi
@@ -102,7 +102,7 @@ index 5e96f6cc5d2..301d8a8a1e4 100644
  if test "x$grub_mkrelpath" = x; then
    grub_mkrelpath="${bindir}/@grub_mkrelpath@"
  fi
-@@ -122,8 +125,19 @@ EOF
+@@ -125,8 +128,19 @@ EOF
    fi
  }
  
@@ -122,7 +122,7 @@ index 5e96f6cc5d2..301d8a8a1e4 100644
    old_ifs="$IFS"
    IFS='
  '
-@@ -158,18 +172,18 @@ prepare_grub_to_access_device ()
+@@ -161,18 +175,18 @@ prepare_grub_to_access_device ()
    # otherwise set root as per value in device.map.
    fs_hint="`"${grub_probe}" --device $@ --target=compatibility_hint`"
    if [ "x$fs_hint" != x ]; then
diff --git a/0061-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 0061-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/0062-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 0062-Add-linux-and-initrd-commands-for-grub-emu.patch
rename to 0063-Add-linux-and-initrd-commands-for-grub-emu.patch
diff --git a/0063-Add-grub2-switch-to-blscfg.patch b/0064-Add-grub2-switch-to-blscfg.patch
similarity index 98%
rename from 0063-Add-grub2-switch-to-blscfg.patch
rename to 0064-Add-grub2-switch-to-blscfg.patch
index 0fe9cc5a..650d56f2 100644
--- a/0063-Add-grub2-switch-to-blscfg.patch
+++ b/0064-Add-grub2-switch-to-blscfg.patch
@@ -20,10 +20,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  create mode 100644 util/grub-switch-to-blscfg.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 18a92427767..88f55e35c47 100644
+index 43a1c7453b1..a90879fa9ba 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -1348,6 +1348,13 @@ program = {
+@@ -1365,6 +1365,13 @@ program = {
    ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  };
  
@@ -420,7 +420,7 @@ index 9fcd77cacc3..81f35a2f3f0 100644
  get_sorted_bls()
  {
 -    if ! [ -d "${blsdir}" ]; then
-+    if ! [ -d "${blsdir}" ] || [ -f /run/ostree-booted ]; then
++    if ! [ -d "${blsdir}" ] || [ -f /run/ostree-booted ] || [ -d /ostree/repo ]]; then
          return
      fi
  
diff --git a/0064-make-better-backtraces.patch b/0065-make-better-backtraces.patch
similarity index 99%
rename from 0064-make-better-backtraces.patch
rename to 0065-make-better-backtraces.patch
index 7cdc8c0d..63765671 100644
--- a/0064-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 88f55e35c47..bda9fd12111 100644
+index a90879fa9ba..48512bc6311 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -51,6 +51,12 @@ library = {
diff --git a/0065-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 0065-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/0066-Work-around-some-minor-include-path-weirdnesses.patch b/0067-Work-around-some-minor-include-path-weirdnesses.patch
similarity index 100%
rename from 0066-Work-around-some-minor-include-path-weirdnesses.patch
rename to 0067-Work-around-some-minor-include-path-weirdnesses.patch
diff --git a/0067-Make-it-possible-to-enabled-build-id-sha1.patch b/0068-Make-it-possible-to-enabled-build-id-sha1.patch
similarity index 95%
rename from 0067-Make-it-possible-to-enabled-build-id-sha1.patch
rename to 0068-Make-it-possible-to-enabled-build-id-sha1.patch
index 1a84b83c..f68fc58b 100644
--- a/0067-Make-it-possible-to-enabled-build-id-sha1.patch
+++ b/0068-Make-it-possible-to-enabled-build-id-sha1.patch
@@ -10,10 +10,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 27 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 24f3be54bca..a4ca2ec542e 100644
+index a0030632220..b50fb2e9897 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1468,7 +1468,15 @@ grub_PROG_TARGET_CC
+@@ -1470,7 +1470,15 @@ grub_PROG_TARGET_CC
  if test "x$TARGET_APPLE_LINKER" != x1 ; then
  grub_PROG_OBJCOPY_ABSOLUTE
  fi
diff --git a/0068-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 0068-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/0069-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 0069-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/0070-Fixup-for-newer-compiler.patch b/0071-Fixup-for-newer-compiler.patch
similarity index 100%
rename from 0070-Fixup-for-newer-compiler.patch
rename to 0071-Fixup-for-newer-compiler.patch
diff --git a/0071-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 0071-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/0072-Fixup-for-newer-compiler.patch b/0073-Fixup-for-newer-compiler.patch
similarity index 100%
rename from 0072-Fixup-for-newer-compiler.patch
rename to 0073-Fixup-for-newer-compiler.patch
diff --git a/0073-Add-support-for-non-Ethernet-network-cards.patch b/0074-Add-support-for-non-Ethernet-network-cards.patch
similarity index 100%
rename from 0073-Add-support-for-non-Ethernet-network-cards.patch
rename to 0074-Add-support-for-non-Ethernet-network-cards.patch
diff --git a/0074-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 0074-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
rename to 0075-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
diff --git a/0075-bootp-New-net_bootp6-command.patch b/0076-bootp-New-net_bootp6-command.patch
similarity index 100%
rename from 0075-bootp-New-net_bootp6-command.patch
rename to 0076-bootp-New-net_bootp6-command.patch
diff --git a/0076-efinet-UEFI-IPv6-PXE-support.patch b/0077-efinet-UEFI-IPv6-PXE-support.patch
similarity index 100%
rename from 0076-efinet-UEFI-IPv6-PXE-support.patch
rename to 0077-efinet-UEFI-IPv6-PXE-support.patch
diff --git a/0077-grub.texi-Add-net_bootp6-doument.patch b/0078-grub.texi-Add-net_bootp6-doument.patch
similarity index 100%
rename from 0077-grub.texi-Add-net_bootp6-doument.patch
rename to 0078-grub.texi-Add-net_bootp6-doument.patch
diff --git a/0078-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 0078-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
rename to 0079-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
diff --git a/0079-efinet-Setting-network-from-UEFI-device-path.patch b/0080-efinet-Setting-network-from-UEFI-device-path.patch
similarity index 100%
rename from 0079-efinet-Setting-network-from-UEFI-device-path.patch
rename to 0080-efinet-Setting-network-from-UEFI-device-path.patch
diff --git a/0080-efinet-Setting-DNS-server-from-UEFI-protocol.patch b/0081-efinet-Setting-DNS-server-from-UEFI-protocol.patch
similarity index 100%
rename from 0080-efinet-Setting-DNS-server-from-UEFI-protocol.patch
rename to 0081-efinet-Setting-DNS-server-from-UEFI-protocol.patch
diff --git a/0081-Support-UEFI-networking-protocols.patch b/0082-Support-UEFI-networking-protocols.patch
similarity index 100%
rename from 0081-Support-UEFI-networking-protocols.patch
rename to 0082-Support-UEFI-networking-protocols.patch
diff --git a/0082-AUDIT-0-http-boot-tracker-bug.patch b/0083-AUDIT-0-http-boot-tracker-bug.patch
similarity index 100%
rename from 0082-AUDIT-0-http-boot-tracker-bug.patch
rename to 0083-AUDIT-0-http-boot-tracker-bug.patch
diff --git a/0083-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 0083-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/0084-Add-auto-hide-menu-support.patch b/0085-Add-auto-hide-menu-support.patch
similarity index 99%
rename from 0084-Add-auto-hide-menu-support.patch
rename to 0085-Add-auto-hide-menu-support.patch
index 9c6a67e6..863cd053 100644
--- a/0084-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 bda9fd12111..cb8e3c3270d 100644
+index 48512bc6311..314e6f2acf8 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -458,6 +458,12 @@ script = {
diff --git a/0085-Add-grub-set-bootflag-utility.patch b/0086-Add-grub-set-bootflag-utility.patch
similarity index 99%
rename from 0085-Add-grub-set-bootflag-utility.patch
rename to 0086-Add-grub-set-bootflag-utility.patch
index 9e787163..e39f8beb 100644
--- a/0085-Add-grub-set-bootflag-utility.patch
+++ b/0086-Add-grub-set-bootflag-utility.patch
@@ -48,10 +48,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  create mode 100644 util/grub-set-bootflag.1
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index cb8e3c3270d..d066652e9bb 100644
+index 314e6f2acf8..0b85a7fce4a 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -1429,3 +1429,10 @@ program = {
+@@ -1446,3 +1446,10 @@ program = {
    ldadd = grub-core/lib/gnulib/libgnu.a;
    ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  };
diff --git a/0086-docs-Add-grub-boot-indeterminate.service-example.patch b/0087-docs-Add-grub-boot-indeterminate.service-example.patch
similarity index 100%
rename from 0086-docs-Add-grub-boot-indeterminate.service-example.patch
rename to 0087-docs-Add-grub-boot-indeterminate.service-example.patch
diff --git a/0087-gentpl-add-disable-support.patch b/0088-gentpl-add-disable-support.patch
similarity index 100%
rename from 0087-gentpl-add-disable-support.patch
rename to 0088-gentpl-add-disable-support.patch
diff --git a/0088-gentpl-add-pc-firmware-type.patch b/0089-gentpl-add-pc-firmware-type.patch
similarity index 100%
rename from 0088-gentpl-add-pc-firmware-type.patch
rename to 0089-gentpl-add-pc-firmware-type.patch
diff --git a/0089-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 0089-efinet-also-use-the-firmware-acceleration-for-http.patch
rename to 0090-efinet-also-use-the-firmware-acceleration-for-http.patch
diff --git a/0090-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 0090-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/0091-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 97%
rename from 0091-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 ce9286a7..ee2216e5 100644
--- a/0091-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,10 +17,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  3 files changed, 64 insertions(+), 16 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index a4ca2ec542e..f685f300327 100644
+index b50fb2e9897..b27573b3de5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -875,11 +875,23 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
+@@ -877,11 +877,23 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
    TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow"
  fi
  
@@ -45,7 +45,7 @@ index a4ca2ec542e..f685f300327 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
-@@ -1980,6 +1992,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/0092-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 0092-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/0093-Rework-how-the-fdt-command-builds.patch b/0094-Rework-how-the-fdt-command-builds.patch
similarity index 100%
rename from 0093-Rework-how-the-fdt-command-builds.patch
rename to 0094-Rework-how-the-fdt-command-builds.patch
diff --git a/0094-Disable-non-wordsize-allocations-on-arm.patch b/0095-Disable-non-wordsize-allocations-on-arm.patch
similarity index 93%
rename from 0094-Disable-non-wordsize-allocations-on-arm.patch
rename to 0095-Disable-non-wordsize-allocations-on-arm.patch
index 54a4ccbf..e28041a1 100644
--- a/0094-Disable-non-wordsize-allocations-on-arm.patch
+++ b/0095-Disable-non-wordsize-allocations-on-arm.patch
@@ -9,10 +9,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 20 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index f685f300327..8fd57b709ff 100644
+index b27573b3de5..bb4e05ceef3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1286,6 +1286,26 @@ if test "x$target_cpu" = xarm; then
+@@ -1288,6 +1288,26 @@ if test "x$target_cpu" = xarm; then
      done
    ])
  
diff --git a/0095-Prepend-prefix-when-HTTP-path-is-relative.patch b/0096-Prepend-prefix-when-HTTP-path-is-relative.patch
similarity index 100%
rename from 0095-Prepend-prefix-when-HTTP-path-is-relative.patch
rename to 0096-Prepend-prefix-when-HTTP-path-is-relative.patch
diff --git a/0096-Make-grub_error-more-verbose.patch b/0097-Make-grub_error-more-verbose.patch
similarity index 100%
rename from 0096-Make-grub_error-more-verbose.patch
rename to 0097-Make-grub_error-more-verbose.patch
diff --git a/0097-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 0097-Make-reset-an-alias-for-the-reboot-command.patch
rename to 0098-Make-reset-an-alias-for-the-reboot-command.patch
diff --git a/0098-Add-a-version-command.patch b/0099-Add-a-version-command.patch
similarity index 98%
rename from 0098-Add-a-version-command.patch
rename to 0099-Add-a-version-command.patch
index f4f44048..bf3b4b80 100644
--- a/0098-Add-a-version-command.patch
+++ b/0099-Add-a-version-command.patch
@@ -17,10 +17,10 @@ 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 8fd57b709ff..31a08ff9b8e 100644
+index bb4e05ceef3..59ccda24475 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -310,6 +310,19 @@ AC_SUBST(target_cpu)
+@@ -312,6 +312,19 @@ AC_SUBST(target_cpu)
  AC_SUBST(platform)
  
  # Define default variables
diff --git a/0099-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 0099-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/0100-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 0100-arm-arm64-loader-Better-memory-allocation-and-error-.patch
rename to 0101-arm-arm64-loader-Better-memory-allocation-and-error-.patch
diff --git a/0101-Try-to-pick-better-locations-for-kernel-and-initrd.patch b/0102-Try-to-pick-better-locations-for-kernel-and-initrd.patch
similarity index 100%
rename from 0101-Try-to-pick-better-locations-for-kernel-and-initrd.patch
rename to 0102-Try-to-pick-better-locations-for-kernel-and-initrd.patch
diff --git a/0102-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 93%
rename from 0102-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
index 0fe538e6..e6cd8b47 100644
--- a/0102-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
+++ b/0103-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
@@ -14,8 +14,9 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  util/grub-menulst2cfg.c           |  2 +-
  util/grub-mkfont.c                | 13 +++++++------
  util/grub-probe.c                 |  2 +-
+ util/grub-rpm-sort.c              |  2 +-
  util/setup.c                      |  2 +-
- 10 files changed, 17 insertions(+), 16 deletions(-)
+ 11 files changed, 18 insertions(+), 17 deletions(-)
 
 diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
 index eeea092752d..f08a1bb8415 100644
@@ -184,6 +185,19 @@ index c08e46bbb40..c6fac732b40 100644
  
  	for (i = PRINT_FS; i < ARRAY_SIZE (targets); i++)
  	  if (strcmp (arg, targets[i]) == 0)
+diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
+index f33bd1ed568..8345944105f 100644
+--- a/util/grub-rpm-sort.c
++++ b/util/grub-rpm-sort.c
+@@ -232,7 +232,7 @@ main (int argc, char *argv[])
+   struct arguments arguments;
+   char **package_names = NULL;
+   size_t n_package_names = 0;
+-  int i;
++  unsigned int i;
+ 
+   grub_util_host_init (&argc, &argv);
+ 
 diff --git a/util/setup.c b/util/setup.c
 index da5f2c07f50..8b22bb8ccac 100644
 --- a/util/setup.c
diff --git a/0103-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 93%
rename from 0103-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 0ea153b2..1fa705e6 100644
--- a/0103-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,10 +11,10 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  2 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 31a08ff9b8e..efc871a6732 100644
+index 59ccda24475..6eb297fdbf6 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1478,11 +1478,11 @@ fi
+@@ -1480,11 +1480,11 @@ fi
  # Set them to their new values for the tests below.
  CC="$TARGET_CC"
  if test x"$platform" = xemu ; then
@@ -29,7 +29,7 @@ index 31a08ff9b8e..efc871a6732 100644
  fi
  CPPFLAGS="$TARGET_CPPFLAGS"
  
-@@ -2016,6 +2016,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/0104-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 0104-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/0105-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 0105-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/0106-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 0106-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/0107-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 0107-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
rename to 0108-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
diff --git a/0108-Fix-getroot.c-s-trampolines.patch b/0109-Fix-getroot.c-s-trampolines.patch
similarity index 100%
rename from 0108-Fix-getroot.c-s-trampolines.patch
rename to 0109-Fix-getroot.c-s-trampolines.patch
diff --git a/0109-Do-not-allow-stack-trampolines-anywhere.patch b/0110-Do-not-allow-stack-trampolines-anywhere.patch
similarity index 93%
rename from 0109-Do-not-allow-stack-trampolines-anywhere.patch
rename to 0110-Do-not-allow-stack-trampolines-anywhere.patch
index d8befae5..2a3247af 100644
--- a/0109-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 efc871a6732..b45ddb2292f 100644
+index 6eb297fdbf6..c6bd965f1f9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2024,6 +2024,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/0110-Reimplement-boot_counter.patch b/0111-Reimplement-boot_counter.patch
similarity index 99%
rename from 0110-Reimplement-boot_counter.patch
rename to 0111-Reimplement-boot_counter.patch
index 80213d7e..a203929f 100644
--- a/0110-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 d066652e9bb..e10fe766d1d 100644
+index 0b85a7fce4a..27a13bc734e 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -458,6 +458,12 @@ script = {
diff --git a/0111-Fix-menu-entry-selection-based-on-ID-and-title.patch b/0112-Fix-menu-entry-selection-based-on-ID-and-title.patch
similarity index 100%
rename from 0111-Fix-menu-entry-selection-based-on-ID-and-title.patch
rename to 0112-Fix-menu-entry-selection-based-on-ID-and-title.patch
diff --git a/0112-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 0112-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/0113-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 0113-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/0114-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 0114-Make-it-possible-to-subtract-conditions-from-debug.patch
rename to 0115-Make-it-possible-to-subtract-conditions-from-debug.patch
diff --git a/0115-Export-all-variables-from-the-initial-context-when-c.patch b/0116-Export-all-variables-from-the-initial-context-when-c.patch
similarity index 100%
rename from 0115-Export-all-variables-from-the-initial-context-when-c.patch
rename to 0116-Export-all-variables-from-the-initial-context-when-c.patch
diff --git a/0116-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 0116-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 f0cc94e8..92f259dc 100644
--- a/0116-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 e10fe766d1d..b4ce5383b76 100644
+index 27a13bc734e..2e6ad979c3e 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -459,14 +459,14 @@ script = {
diff --git a/0117-Fix-systemctl-kexec-exit-status-check.patch b/0118-Fix-systemctl-kexec-exit-status-check.patch
similarity index 100%
rename from 0117-Fix-systemctl-kexec-exit-status-check.patch
rename to 0118-Fix-systemctl-kexec-exit-status-check.patch
diff --git a/0118-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 0118-Print-grub-emu-linux-loader-messages-as-debug.patch
rename to 0119-Print-grub-emu-linux-loader-messages-as-debug.patch
diff --git a/0119-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 100%
rename from 0119-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
diff --git a/0120-grub-set-bootflag-Update-comment-about-running-as-ro.patch b/0121-grub-set-bootflag-Update-comment-about-running-as-ro.patch
similarity index 100%
rename from 0120-grub-set-bootflag-Update-comment-about-running-as-ro.patch
rename to 0121-grub-set-bootflag-Update-comment-about-running-as-ro.patch
diff --git a/0121-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch b/0122-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
similarity index 100%
rename from 0121-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
rename to 0122-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
diff --git a/0122-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch b/0123-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
similarity index 100%
rename from 0122-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
rename to 0123-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
diff --git a/0123-Add-start-symbol-for-RISC-V.patch b/0124-Add-start-symbol-for-RISC-V.patch
similarity index 100%
rename from 0123-Add-start-symbol-for-RISC-V.patch
rename to 0124-Add-start-symbol-for-RISC-V.patch
diff --git a/0124-bootstrap.conf-Force-autogen.sh-to-use-python3.patch b/0125-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
similarity index 100%
rename from 0124-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
rename to 0125-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
diff --git a/0125-efi-http-Export-fw-http-_path-variables-to-make-them.patch b/0126-efi-http-Export-fw-http-_path-variables-to-make-them.patch
similarity index 100%
rename from 0125-efi-http-Export-fw-http-_path-variables-to-make-them.patch
rename to 0126-efi-http-Export-fw-http-_path-variables-to-make-them.patch
diff --git a/0126-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch b/0127-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
similarity index 100%
rename from 0126-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
rename to 0127-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
diff --git a/0127-efi-net-Allow-to-specify-a-port-number-in-addresses.patch b/0128-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
similarity index 100%
rename from 0127-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
rename to 0128-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
diff --git a/0128-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch b/0129-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
similarity index 100%
rename from 0128-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
rename to 0129-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
diff --git a/0129-efi-net-Print-a-debug-message-if-parsing-the-address.patch b/0130-efi-net-Print-a-debug-message-if-parsing-the-address.patch
similarity index 100%
rename from 0129-efi-net-Print-a-debug-message-if-parsing-the-address.patch
rename to 0130-efi-net-Print-a-debug-message-if-parsing-the-address.patch
diff --git a/0130-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch b/0131-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
similarity index 100%
rename from 0130-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
rename to 0131-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
diff --git a/0131-efi-Set-image-base-address-before-jumping-to-the-PE-.patch b/0132-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
similarity index 100%
rename from 0131-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
rename to 0132-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
diff --git a/0132-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch b/0133-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
similarity index 100%
rename from 0132-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
rename to 0133-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
diff --git a/0133-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch b/0134-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
similarity index 100%
rename from 0133-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
rename to 0134-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
diff --git a/0134-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch b/0135-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
similarity index 100%
rename from 0134-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
rename to 0135-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
diff --git a/0135-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch b/0136-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
similarity index 100%
rename from 0135-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
rename to 0136-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
diff --git a/0136-efi-dhcp-fix-some-allocation-error-checking.patch b/0137-efi-dhcp-fix-some-allocation-error-checking.patch
similarity index 100%
rename from 0136-efi-dhcp-fix-some-allocation-error-checking.patch
rename to 0137-efi-dhcp-fix-some-allocation-error-checking.patch
diff --git a/0137-efi-http-fix-some-allocation-error-checking.patch b/0138-efi-http-fix-some-allocation-error-checking.patch
similarity index 100%
rename from 0137-efi-http-fix-some-allocation-error-checking.patch
rename to 0138-efi-http-fix-some-allocation-error-checking.patch
diff --git a/0138-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch b/0139-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
similarity index 100%
rename from 0138-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
rename to 0139-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
diff --git a/0139-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch b/0140-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
similarity index 100%
rename from 0139-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
rename to 0140-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
diff --git a/0140-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/0141-linuxefi-fail-kernel-validation-without-shim-protoco.patch
similarity index 100%
rename from 0140-linuxefi-fail-kernel-validation-without-shim-protoco.patch
rename to 0141-linuxefi-fail-kernel-validation-without-shim-protoco.patch
diff --git a/0141-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch b/0142-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
similarity index 100%
rename from 0141-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
rename to 0142-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
diff --git a/0142-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch b/0143-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
similarity index 100%
rename from 0142-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
rename to 0143-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
diff --git a/0143-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch b/0144-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
similarity index 100%
rename from 0143-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
rename to 0144-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
diff --git a/0144-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch b/0145-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
similarity index 100%
rename from 0144-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
rename to 0145-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
diff --git a/0145-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch b/0146-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
similarity index 100%
rename from 0145-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
rename to 0146-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
diff --git a/0146-Add-systemd-integration-scripts-to-make-systemctl-re.patch b/0147-Add-systemd-integration-scripts-to-make-systemctl-re.patch
similarity index 99%
rename from 0146-Add-systemd-integration-scripts-to-make-systemctl-re.patch
rename to 0147-Add-systemd-integration-scripts-to-make-systemctl-re.patch
index c76d8688..8e2481e7 100644
--- a/0146-Add-systemd-integration-scripts-to-make-systemctl-re.patch
+++ b/0147-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 b4ce5383b76..6366442129d 100644
+index 2e6ad979c3e..9927c2cfd6a 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -470,6 +470,12 @@ script = {
diff --git a/0147-systemd-integration.sh-Also-set-old-menu_show_once-g.patch b/0148-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
similarity index 100%
rename from 0147-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
rename to 0148-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
diff --git a/0148-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch b/0149-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
similarity index 100%
rename from 0148-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
rename to 0149-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
diff --git a/0149-grub-install-disable-support-for-EFI-platforms.patch b/0150-grub-install-disable-support-for-EFI-platforms.patch
similarity index 100%
rename from 0149-grub-install-disable-support-for-EFI-platforms.patch
rename to 0150-grub-install-disable-support-for-EFI-platforms.patch
diff --git a/0150-New-with-debug-timestamps-configure-flag-to-prepend-.patch b/0151-New-with-debug-timestamps-configure-flag-to-prepend-.patch
similarity index 95%
rename from 0150-New-with-debug-timestamps-configure-flag-to-prepend-.patch
rename to 0151-New-with-debug-timestamps-configure-flag-to-prepend-.patch
index 743e8ad1..d216284c 100644
--- a/0150-New-with-debug-timestamps-configure-flag-to-prepend-.patch
+++ b/0151-New-with-debug-timestamps-configure-flag-to-prepend-.patch
@@ -15,10 +15,10 @@ Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
  3 files changed, 39 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index b45ddb2292f..6b19c489cb0 100644
+index c6bd965f1f9..3c808a72230 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1611,6 +1611,17 @@ else
+@@ -1613,6 +1613,17 @@ else
  fi
  AC_SUBST([BOOT_TIME_STATS])
  
@@ -36,7 +36,7 @@ index b45ddb2292f..6b19c489cb0 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)])])
-@@ -2162,6 +2173,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 b45ddb2292f..6b19c489cb0 100644
  
  AM_CONDITIONAL([COND_HAVE_CXX], [test x$HAVE_CXX = xyes])
  
-@@ -2257,6 +2269,12 @@ else
+@@ -2289,6 +2301,12 @@ else
  echo With boot time statistics: No
  fi
  
diff --git a/0151-Added-debug-statements-to-grub_disk_open-and-grub_di.patch b/0152-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
similarity index 100%
rename from 0151-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
rename to 0152-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
diff --git a/0152-Introduce-function-grub_debug_is_enabled-void-return.patch b/0153-Introduce-function-grub_debug_is_enabled-void-return.patch
similarity index 100%
rename from 0152-Introduce-function-grub_debug_is_enabled-void-return.patch
rename to 0153-Introduce-function-grub_debug_is_enabled-void-return.patch
diff --git a/0153-Don-t-clear-screen-when-debugging-is-enabled.patch b/0154-Don-t-clear-screen-when-debugging-is-enabled.patch
similarity index 100%
rename from 0153-Don-t-clear-screen-when-debugging-is-enabled.patch
rename to 0154-Don-t-clear-screen-when-debugging-is-enabled.patch
diff --git a/0154-grub_file_-instrumentation-new-file-debug-tag.patch b/0155-grub_file_-instrumentation-new-file-debug-tag.patch
similarity index 100%
rename from 0154-grub_file_-instrumentation-new-file-debug-tag.patch
rename to 0155-grub_file_-instrumentation-new-file-debug-tag.patch
diff --git a/0155-ieee1275-Avoiding-many-unecessary-open-close.patch b/0156-ieee1275-Avoiding-many-unecessary-open-close.patch
similarity index 100%
rename from 0155-ieee1275-Avoiding-many-unecessary-open-close.patch
rename to 0156-ieee1275-Avoiding-many-unecessary-open-close.patch
diff --git a/0156-ieee1275-powerpc-implements-fibre-channel-discovery-.patch b/0157-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
similarity index 100%
rename from 0156-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
rename to 0157-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
diff --git a/0157-ieee1275-powerpc-enables-device-mapper-discovery.patch b/0158-ieee1275-powerpc-enables-device-mapper-discovery.patch
similarity index 100%
rename from 0157-ieee1275-powerpc-enables-device-mapper-discovery.patch
rename to 0158-ieee1275-powerpc-enables-device-mapper-discovery.patch
diff --git a/0158-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch b/0159-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
similarity index 100%
rename from 0158-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
rename to 0159-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
diff --git a/0159-Add-suport-for-signing-grub-with-an-appended-signatu.patch b/0160-Add-suport-for-signing-grub-with-an-appended-signatu.patch
similarity index 100%
rename from 0159-Add-suport-for-signing-grub-with-an-appended-signatu.patch
rename to 0160-Add-suport-for-signing-grub-with-an-appended-signatu.patch
diff --git a/0160-docs-grub-Document-signing-grub-under-UEFI.patch b/0161-docs-grub-Document-signing-grub-under-UEFI.patch
similarity index 100%
rename from 0160-docs-grub-Document-signing-grub-under-UEFI.patch
rename to 0161-docs-grub-Document-signing-grub-under-UEFI.patch
diff --git a/0161-docs-grub-Document-signing-grub-with-an-appended-sig.patch b/0162-docs-grub-Document-signing-grub-with-an-appended-sig.patch
similarity index 100%
rename from 0161-docs-grub-Document-signing-grub-with-an-appended-sig.patch
rename to 0162-docs-grub-Document-signing-grub-with-an-appended-sig.patch
diff --git a/0162-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch b/0163-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
similarity index 100%
rename from 0162-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
rename to 0163-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
diff --git a/0163-pgp-factor-out-rsa_pad.patch b/0164-pgp-factor-out-rsa_pad.patch
similarity index 100%
rename from 0163-pgp-factor-out-rsa_pad.patch
rename to 0164-pgp-factor-out-rsa_pad.patch
diff --git a/0164-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch b/0165-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
similarity index 100%
rename from 0164-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
rename to 0165-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
diff --git a/0165-posix_wrap-tweaks-in-preparation-for-libtasn1.patch b/0166-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
similarity index 100%
rename from 0165-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
rename to 0166-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
diff --git a/0166-libtasn1-import-libtasn1-4.16.0.patch b/0167-libtasn1-import-libtasn1-4.16.0.patch
similarity index 100%
rename from 0166-libtasn1-import-libtasn1-4.16.0.patch
rename to 0167-libtasn1-import-libtasn1-4.16.0.patch
diff --git a/0167-libtasn1-disable-code-not-needed-in-grub.patch b/0168-libtasn1-disable-code-not-needed-in-grub.patch
similarity index 100%
rename from 0167-libtasn1-disable-code-not-needed-in-grub.patch
rename to 0168-libtasn1-disable-code-not-needed-in-grub.patch
diff --git a/0168-libtasn1-changes-for-grub-compatibility.patch b/0169-libtasn1-changes-for-grub-compatibility.patch
similarity index 100%
rename from 0168-libtasn1-changes-for-grub-compatibility.patch
rename to 0169-libtasn1-changes-for-grub-compatibility.patch
diff --git a/0169-libtasn1-compile-into-asn1-module.patch b/0170-libtasn1-compile-into-asn1-module.patch
similarity index 100%
rename from 0169-libtasn1-compile-into-asn1-module.patch
rename to 0170-libtasn1-compile-into-asn1-module.patch
diff --git a/0170-test_asn1-test-module-for-libtasn1.patch b/0171-test_asn1-test-module-for-libtasn1.patch
similarity index 99%
rename from 0170-test_asn1-test-module-for-libtasn1.patch
rename to 0171-test_asn1-test-module-for-libtasn1.patch
index a2f4d547..b659558b 100644
--- a/0170-test_asn1-test-module-for-libtasn1.patch
+++ b/0171-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 6366442129d..d04b3fe68a1 100644
+index 9927c2cfd6a..3f191aa8095 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
-@@ -1289,6 +1289,12 @@ script = {
+@@ -1306,6 +1306,12 @@ script = {
    common = tests/syslinux_test.in;
  };
  
diff --git a/0171-grub-install-support-embedding-x509-certificates.patch b/0172-grub-install-support-embedding-x509-certificates.patch
similarity index 100%
rename from 0171-grub-install-support-embedding-x509-certificates.patch
rename to 0172-grub-install-support-embedding-x509-certificates.patch
diff --git a/0172-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch b/0173-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
similarity index 100%
rename from 0172-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
rename to 0173-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
diff --git a/0173-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch b/0174-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
similarity index 100%
rename from 0173-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
rename to 0174-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
diff --git a/0174-appended-signatures-support-verifying-appended-signa.patch b/0175-appended-signatures-support-verifying-appended-signa.patch
similarity index 100%
rename from 0174-appended-signatures-support-verifying-appended-signa.patch
rename to 0175-appended-signatures-support-verifying-appended-signa.patch
diff --git a/0175-appended-signatures-verification-tests.patch b/0176-appended-signatures-verification-tests.patch
similarity index 100%
rename from 0175-appended-signatures-verification-tests.patch
rename to 0176-appended-signatures-verification-tests.patch
diff --git a/0176-appended-signatures-documentation.patch b/0177-appended-signatures-documentation.patch
similarity index 100%
rename from 0176-appended-signatures-documentation.patch
rename to 0177-appended-signatures-documentation.patch
diff --git a/0177-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch b/0178-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
similarity index 100%
rename from 0177-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
rename to 0178-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
diff --git a/0178-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch b/0179-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
similarity index 100%
rename from 0178-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
rename to 0179-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
diff --git a/0179-ieee1275-claim-more-memory.patch b/0180-ieee1275-claim-more-memory.patch
similarity index 100%
rename from 0179-ieee1275-claim-more-memory.patch
rename to 0180-ieee1275-claim-more-memory.patch
diff --git a/0180-ieee1275-request-memory-with-ibm-client-architecture.patch b/0181-ieee1275-request-memory-with-ibm-client-architecture.patch
similarity index 100%
rename from 0180-ieee1275-request-memory-with-ibm-client-architecture.patch
rename to 0181-ieee1275-request-memory-with-ibm-client-architecture.patch
diff --git a/0181-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch b/0182-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
similarity index 100%
rename from 0181-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
rename to 0182-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
diff --git a/0182-ieee1275-ofdisk-retry-on-open-failure.patch b/0183-ieee1275-ofdisk-retry-on-open-failure.patch
similarity index 100%
rename from 0182-ieee1275-ofdisk-retry-on-open-failure.patch
rename to 0183-ieee1275-ofdisk-retry-on-open-failure.patch
diff --git a/0183-Allow-chainloading-EFI-apps-from-loop-mounts.patch b/0184-Allow-chainloading-EFI-apps-from-loop-mounts.patch
similarity index 100%
rename from 0183-Allow-chainloading-EFI-apps-from-loop-mounts.patch
rename to 0184-Allow-chainloading-EFI-apps-from-loop-mounts.patch
diff --git a/0184-efinet-Add-DHCP-proxy-support.patch b/0185-efinet-Add-DHCP-proxy-support.patch
similarity index 100%
rename from 0184-efinet-Add-DHCP-proxy-support.patch
rename to 0185-efinet-Add-DHCP-proxy-support.patch
diff --git a/0185-fs-ext2-Ignore-checksum-seed-incompat-feature.patch b/0186-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
similarity index 100%
rename from 0185-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
rename to 0186-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
diff --git a/0186-Don-t-update-the-cmdline-when-generating-legacy-menu.patch b/0187-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
similarity index 100%
rename from 0186-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
rename to 0187-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
diff --git a/0187-Suppress-gettext-error-message.patch b/0188-Suppress-gettext-error-message.patch
similarity index 100%
rename from 0187-Suppress-gettext-error-message.patch
rename to 0188-Suppress-gettext-error-message.patch
diff --git a/0188-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch b/0189-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
similarity index 100%
rename from 0188-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
rename to 0189-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
diff --git a/0189-templates-Check-for-EFI-at-runtime-instead-of-config.patch b/0190-templates-Check-for-EFI-at-runtime-instead-of-config.patch
similarity index 100%
rename from 0189-templates-Check-for-EFI-at-runtime-instead-of-config.patch
rename to 0190-templates-Check-for-EFI-at-runtime-instead-of-config.patch
diff --git a/0190-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch b/0191-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
similarity index 100%
rename from 0190-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
rename to 0191-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
diff --git a/0191-arm64-Fix-EFI-loader-kernel-image-allocation.patch b/0192-arm64-Fix-EFI-loader-kernel-image-allocation.patch
similarity index 100%
rename from 0191-arm64-Fix-EFI-loader-kernel-image-allocation.patch
rename to 0192-arm64-Fix-EFI-loader-kernel-image-allocation.patch
diff --git a/0192-normal-main-Discover-the-device-to-read-the-config-f.patch b/0193-normal-main-Discover-the-device-to-read-the-config-f.patch
similarity index 100%
rename from 0192-normal-main-Discover-the-device-to-read-the-config-f.patch
rename to 0193-normal-main-Discover-the-device-to-read-the-config-f.patch
diff --git a/0193-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch b/0194-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
similarity index 100%
rename from 0193-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
rename to 0194-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
diff --git a/0194-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch b/0195-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
similarity index 100%
rename from 0194-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
rename to 0195-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
diff --git a/0195-Print-module-name-on-license-check-failure.patch b/0196-Print-module-name-on-license-check-failure.patch
similarity index 100%
rename from 0195-Print-module-name-on-license-check-failure.patch
rename to 0196-Print-module-name-on-license-check-failure.patch
diff --git a/0196-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch b/0197-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
similarity index 100%
rename from 0196-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
rename to 0197-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
diff --git a/0197-grub-mkconfig-restore-umask-for-grub.cfg.patch b/0198-grub-mkconfig-restore-umask-for-grub.cfg.patch
similarity index 100%
rename from 0197-grub-mkconfig-restore-umask-for-grub.cfg.patch
rename to 0198-grub-mkconfig-restore-umask-for-grub.cfg.patch
diff --git a/0198-fs-btrfs-Use-full-btrfs-bootloader-area.patch b/0199-fs-btrfs-Use-full-btrfs-bootloader-area.patch
similarity index 100%
rename from 0198-fs-btrfs-Use-full-btrfs-bootloader-area.patch
rename to 0199-fs-btrfs-Use-full-btrfs-bootloader-area.patch
diff --git a/0199-Add-Fedora-location-of-DejaVu-SANS-font.patch b/0200-Add-Fedora-location-of-DejaVu-SANS-font.patch
similarity index 95%
rename from 0199-Add-Fedora-location-of-DejaVu-SANS-font.patch
rename to 0200-Add-Fedora-location-of-DejaVu-SANS-font.patch
index 493484c0..eb76649e 100644
--- a/0199-Add-Fedora-location-of-DejaVu-SANS-font.patch
+++ b/0200-Add-Fedora-location-of-DejaVu-SANS-font.patch
@@ -16,10 +16,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 6b19c489cb0..0510afe0172 100644
+index 3c808a72230..3527f069ab2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1810,7 +1810,7 @@ fi
+@@ -1812,7 +1812,7 @@ fi
  
  if test x"$starfield_excuse" = x; then
     for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
diff --git a/0200-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch b/0201-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch
similarity index 100%
rename from 0200-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch
rename to 0201-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch
diff --git a/0201-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch b/0202-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch
similarity index 100%
rename from 0201-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch
rename to 0202-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch
diff --git a/0202-EFI-console-Do-not-set-colorstate-until-the-first-te.patch b/0203-EFI-console-Do-not-set-colorstate-until-the-first-te.patch
similarity index 100%
rename from 0202-EFI-console-Do-not-set-colorstate-until-the-first-te.patch
rename to 0203-EFI-console-Do-not-set-colorstate-until-the-first-te.patch
diff --git a/0203-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch b/0204-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch
similarity index 100%
rename from 0203-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch
rename to 0204-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch
diff --git a/0204-Use-visual-indentation-in-config.h.in.patch b/0205-Use-visual-indentation-in-config.h.in.patch
similarity index 100%
rename from 0204-Use-visual-indentation-in-config.h.in.patch
rename to 0205-Use-visual-indentation-in-config.h.in.patch
diff --git a/0205-Where-present-ensure-config-util.h-precedes-config.h.patch b/0206-Where-present-ensure-config-util.h-precedes-config.h.patch
similarity index 100%
rename from 0205-Where-present-ensure-config-util.h-precedes-config.h.patch
rename to 0206-Where-present-ensure-config-util.h-precedes-config.h.patch
diff --git a/0206-Drop-gnulib-fix-base64.patch.patch b/0207-Drop-gnulib-fix-base64.patch.patch
similarity index 100%
rename from 0206-Drop-gnulib-fix-base64.patch.patch
rename to 0207-Drop-gnulib-fix-base64.patch.patch
diff --git a/0207-Drop-gnulib-no-abort.patch.patch b/0208-Drop-gnulib-no-abort.patch.patch
similarity index 100%
rename from 0207-Drop-gnulib-no-abort.patch.patch
rename to 0208-Drop-gnulib-no-abort.patch.patch
diff --git a/0208-Update-gnulib-version-and-drop-most-gnulib-patches.patch b/0209-Update-gnulib-version-and-drop-most-gnulib-patches.patch
similarity index 99%
rename from 0208-Update-gnulib-version-and-drop-most-gnulib-patches.patch
rename to 0209-Update-gnulib-version-and-drop-most-gnulib-patches.patch
index a3f9a619..4b5a44c8 100644
--- a/0208-Update-gnulib-version-and-drop-most-gnulib-patches.patch
+++ b/0209-Update-gnulib-version-and-drop-most-gnulib-patches.patch
@@ -48,7 +48,7 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
  delete mode 100644 grub-core/lib/gnulib-patches/fix-unused-value.patch
 
 diff --git a/configure.ac b/configure.ac
-index 0510afe0172..eb928485e45 100644
+index 3527f069ab2..d04c94691ef 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -49,7 +49,7 @@ AC_CANONICAL_TARGET
diff --git a/0209-commands-search-Fix-bug-stopping-iteration-when-no-f.patch b/0210-commands-search-Fix-bug-stopping-iteration-when-no-f.patch
similarity index 100%
rename from 0209-commands-search-Fix-bug-stopping-iteration-when-no-f.patch
rename to 0210-commands-search-Fix-bug-stopping-iteration-when-no-f.patch
diff --git a/0210-search-new-efidisk-only-option-on-EFI-systems.patch b/0211-search-new-efidisk-only-option-on-EFI-systems.patch
similarity index 100%
rename from 0210-search-new-efidisk-only-option-on-EFI-systems.patch
rename to 0211-search-new-efidisk-only-option-on-EFI-systems.patch
diff --git a/0211-efi-new-connectefi-command.patch b/0212-efi-new-connectefi-command.patch
similarity index 100%
rename from 0211-efi-new-connectefi-command.patch
rename to 0212-efi-new-connectefi-command.patch
diff --git a/0212-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch b/0213-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
similarity index 100%
rename from 0212-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
rename to 0213-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
diff --git a/0213-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch b/0214-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch
similarity index 100%
rename from 0213-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch
rename to 0214-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch
diff --git a/0214-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch b/0215-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
similarity index 100%
rename from 0214-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
rename to 0215-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
diff --git a/0216-Correct-sorting-of-kernel-names-containing-_.patch b/0216-Correct-sorting-of-kernel-names-containing-_.patch
deleted file mode 100644
index e0694cf5..00000000
--- a/0216-Correct-sorting-of-kernel-names-containing-_.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 18 Jan 2022 12:22:15 -0500
-Subject: [PATCH] Correct sorting of kernel names containing '_'
-
-sort(1) from GNU coreutils does not treat underscore as part of a
-version number for `sort -V.  This causes misorderings on x86_64, where
-e.g. kernel-core-3.17.6-300.11.fc21.x86_64 will incorrectly sort
-*before* kernel-core-3.17.6-300.fc21.x86_64.
-
-To cope with this behavior, replace underscores with dashes in order to
-approximate their intended meaning as version component separators.
-
-Fixes: https://savannah.gnu.org/bugs/?42844
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- util/grub-mkconfig_lib.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 301d8a8a1e4..57fb95e3aeb 100644
---- a/util/grub-mkconfig_lib.in
-+++ b/util/grub-mkconfig_lib.in
-@@ -261,8 +261,8 @@ version_test_numeric ()
- 
- version_test_gt ()
- {
--  version_test_gt_a="`echo "$1" | sed -e "s/[^-]*-//"`"
--  version_test_gt_b="`echo "$2" | sed -e "s/[^-]*-//"`"
-+  version_test_gt_a="`echo "$1" | sed -e "s/[^-]*-//" -e "s/_/-/g"`"
-+  version_test_gt_b="`echo "$2" | sed -e "s/[^-]*-//" -e "s/_/-/g"`"
-   version_test_gt_cmp=gt
-   if [ "x$version_test_gt_b" = "x" ] ; then
-     return 0
diff --git a/0215-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch b/0216-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
similarity index 100%
rename from 0215-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
rename to 0216-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
diff --git a/grub.patches b/grub.patches
index 43b407bf..29c58942 100644
--- a/grub.patches
+++ b/grub.patches
@@ -30,187 +30,187 @@ 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-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
-Patch0034: 0034-Add-friendly-grub2-password-config-tool-985962.patch
-Patch0035: 0035-tcp-add-window-scaling-support.patch
-Patch0036: 0036-efinet-and-bootp-add-support-for-dhcpv6.patch
-Patch0037: 0037-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
-Patch0038: 0038-bz1374141-fix-incorrect-mask-for-ppc64.patch
-Patch0039: 0039-Make-grub_fatal-also-backtrace.patch
-Patch0040: 0040-Fix-up-some-man-pages-rpmdiff-noticed.patch
-Patch0041: 0041-Make-our-info-pages-say-grub2-where-appropriate.patch
-Patch0042: 0042-macos-just-build-chainloader-entries-don-t-try-any-x.patch
-Patch0043: 0043-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
-Patch0044: 0044-export-btrfs_subvol-and-btrfs_subvolid.patch
-Patch0045: 0045-grub2-btrfs-03-follow_default.patch
-Patch0046: 0046-grub2-btrfs-04-grub2-install.patch
-Patch0047: 0047-grub2-btrfs-05-grub2-mkconfig.patch
-Patch0048: 0048-grub2-btrfs-06-subvol-mount.patch
-Patch0049: 0049-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
-Patch0050: 0050-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
-Patch0051: 0051-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
-Patch0052: 0052-Use-grub_efi_.-memory-helpers-where-reasonable.patch
-Patch0053: 0053-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
-Patch0054: 0054-don-t-use-int-for-efi-status.patch
-Patch0055: 0055-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
-Patch0056: 0056-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
-Patch0057: 0057-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
-Patch0058: 0058-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
-Patch0059: 0059-align-struct-efi_variable-better.patch
-Patch0060: 0060-Add-BLS-support-to-grub-mkconfig.patch
-Patch0061: 0061-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
-Patch0062: 0062-Add-linux-and-initrd-commands-for-grub-emu.patch
-Patch0063: 0063-Add-grub2-switch-to-blscfg.patch
-Patch0064: 0064-make-better-backtraces.patch
-Patch0065: 0065-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
-Patch0066: 0066-Work-around-some-minor-include-path-weirdnesses.patch
-Patch0067: 0067-Make-it-possible-to-enabled-build-id-sha1.patch
-Patch0068: 0068-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
-Patch0069: 0069-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
-Patch0070: 0070-Fixup-for-newer-compiler.patch
-Patch0071: 0071-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
-Patch0072: 0072-Fixup-for-newer-compiler.patch
-Patch0073: 0073-Add-support-for-non-Ethernet-network-cards.patch
-Patch0074: 0074-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
-Patch0075: 0075-bootp-New-net_bootp6-command.patch
-Patch0076: 0076-efinet-UEFI-IPv6-PXE-support.patch
-Patch0077: 0077-grub.texi-Add-net_bootp6-doument.patch
-Patch0078: 0078-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
-Patch0079: 0079-efinet-Setting-network-from-UEFI-device-path.patch
-Patch0080: 0080-efinet-Setting-DNS-server-from-UEFI-protocol.patch
-Patch0081: 0081-Support-UEFI-networking-protocols.patch
-Patch0082: 0082-AUDIT-0-http-boot-tracker-bug.patch
-Patch0083: 0083-grub-editenv-Add-incr-command-to-increment-integer-v.patch
-Patch0084: 0084-Add-auto-hide-menu-support.patch
-Patch0085: 0085-Add-grub-set-bootflag-utility.patch
-Patch0086: 0086-docs-Add-grub-boot-indeterminate.service-example.patch
-Patch0087: 0087-gentpl-add-disable-support.patch
-Patch0088: 0088-gentpl-add-pc-firmware-type.patch
-Patch0089: 0089-efinet-also-use-the-firmware-acceleration-for-http.patch
-Patch0090: 0090-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
-Patch0091: 0091-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
-Patch0092: 0092-module-verifier-make-it-possible-to-run-checkers-on-.patch
-Patch0093: 0093-Rework-how-the-fdt-command-builds.patch
-Patch0094: 0094-Disable-non-wordsize-allocations-on-arm.patch
-Patch0095: 0095-Prepend-prefix-when-HTTP-path-is-relative.patch
-Patch0096: 0096-Make-grub_error-more-verbose.patch
-Patch0097: 0097-Make-reset-an-alias-for-the-reboot-command.patch
-Patch0098: 0098-Add-a-version-command.patch
-Patch0099: 0099-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
-Patch0100: 0100-arm-arm64-loader-Better-memory-allocation-and-error-.patch
-Patch0101: 0101-Try-to-pick-better-locations-for-kernel-and-initrd.patch
-Patch0102: 0102-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
-Patch0103: 0103-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
-Patch0104: 0104-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
-Patch0105: 0105-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
-Patch0106: 0106-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
-Patch0107: 0107-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
-Patch0108: 0108-Fix-getroot.c-s-trampolines.patch
-Patch0109: 0109-Do-not-allow-stack-trampolines-anywhere.patch
-Patch0110: 0110-Reimplement-boot_counter.patch
-Patch0111: 0111-Fix-menu-entry-selection-based-on-ID-and-title.patch
-Patch0112: 0112-Make-the-menu-entry-users-option-argument-to-be-opti.patch
-Patch0113: 0113-Add-efi-export-env-and-efi-load-env-commands.patch
-Patch0114: 0114-Make-it-possible-to-subtract-conditions-from-debug.patch
-Patch0115: 0115-Export-all-variables-from-the-initial-context-when-c.patch
-Patch0116: 0116-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
-Patch0117: 0117-Fix-systemctl-kexec-exit-status-check.patch
-Patch0118: 0118-Print-grub-emu-linux-loader-messages-as-debug.patch
-Patch0119: 0119-Don-t-assume-that-boot-commands-will-only-return-on-.patch
-Patch0120: 0120-grub-set-bootflag-Update-comment-about-running-as-ro.patch
-Patch0121: 0121-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
-Patch0122: 0122-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
-Patch0123: 0123-Add-start-symbol-for-RISC-V.patch
-Patch0124: 0124-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
-Patch0125: 0125-efi-http-Export-fw-http-_path-variables-to-make-them.patch
-Patch0126: 0126-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
-Patch0127: 0127-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
-Patch0128: 0128-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
-Patch0129: 0129-efi-net-Print-a-debug-message-if-parsing-the-address.patch
-Patch0130: 0130-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
-Patch0131: 0131-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
-Patch0132: 0132-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
-Patch0133: 0133-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
-Patch0134: 0134-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
-Patch0135: 0135-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
-Patch0136: 0136-efi-dhcp-fix-some-allocation-error-checking.patch
-Patch0137: 0137-efi-http-fix-some-allocation-error-checking.patch
-Patch0138: 0138-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
-Patch0139: 0139-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
-Patch0140: 0140-linuxefi-fail-kernel-validation-without-shim-protoco.patch
-Patch0141: 0141-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
-Patch0142: 0142-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
-Patch0143: 0143-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
-Patch0144: 0144-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
-Patch0145: 0145-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
-Patch0146: 0146-Add-systemd-integration-scripts-to-make-systemctl-re.patch
-Patch0147: 0147-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
-Patch0148: 0148-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
-Patch0149: 0149-grub-install-disable-support-for-EFI-platforms.patch
-Patch0150: 0150-New-with-debug-timestamps-configure-flag-to-prepend-.patch
-Patch0151: 0151-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
-Patch0152: 0152-Introduce-function-grub_debug_is_enabled-void-return.patch
-Patch0153: 0153-Don-t-clear-screen-when-debugging-is-enabled.patch
-Patch0154: 0154-grub_file_-instrumentation-new-file-debug-tag.patch
-Patch0155: 0155-ieee1275-Avoiding-many-unecessary-open-close.patch
-Patch0156: 0156-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
-Patch0157: 0157-ieee1275-powerpc-enables-device-mapper-discovery.patch
-Patch0158: 0158-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
-Patch0159: 0159-Add-suport-for-signing-grub-with-an-appended-signatu.patch
-Patch0160: 0160-docs-grub-Document-signing-grub-under-UEFI.patch
-Patch0161: 0161-docs-grub-Document-signing-grub-with-an-appended-sig.patch
-Patch0162: 0162-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
-Patch0163: 0163-pgp-factor-out-rsa_pad.patch
-Patch0164: 0164-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
-Patch0165: 0165-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
-Patch0166: 0166-libtasn1-import-libtasn1-4.16.0.patch
-Patch0167: 0167-libtasn1-disable-code-not-needed-in-grub.patch
-Patch0168: 0168-libtasn1-changes-for-grub-compatibility.patch
-Patch0169: 0169-libtasn1-compile-into-asn1-module.patch
-Patch0170: 0170-test_asn1-test-module-for-libtasn1.patch
-Patch0171: 0171-grub-install-support-embedding-x509-certificates.patch
-Patch0172: 0172-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
-Patch0173: 0173-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
-Patch0174: 0174-appended-signatures-support-verifying-appended-signa.patch
-Patch0175: 0175-appended-signatures-verification-tests.patch
-Patch0176: 0176-appended-signatures-documentation.patch
-Patch0177: 0177-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
-Patch0178: 0178-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
-Patch0179: 0179-ieee1275-claim-more-memory.patch
-Patch0180: 0180-ieee1275-request-memory-with-ibm-client-architecture.patch
-Patch0181: 0181-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
-Patch0182: 0182-ieee1275-ofdisk-retry-on-open-failure.patch
-Patch0183: 0183-Allow-chainloading-EFI-apps-from-loop-mounts.patch
-Patch0184: 0184-efinet-Add-DHCP-proxy-support.patch
-Patch0185: 0185-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
-Patch0186: 0186-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
-Patch0187: 0187-Suppress-gettext-error-message.patch
-Patch0188: 0188-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
-Patch0189: 0189-templates-Check-for-EFI-at-runtime-instead-of-config.patch
-Patch0190: 0190-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
-Patch0191: 0191-arm64-Fix-EFI-loader-kernel-image-allocation.patch
-Patch0192: 0192-normal-main-Discover-the-device-to-read-the-config-f.patch
-Patch0193: 0193-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
-Patch0194: 0194-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
-Patch0195: 0195-Print-module-name-on-license-check-failure.patch
-Patch0196: 0196-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
-Patch0197: 0197-grub-mkconfig-restore-umask-for-grub.cfg.patch
-Patch0198: 0198-fs-btrfs-Use-full-btrfs-bootloader-area.patch
-Patch0199: 0199-Add-Fedora-location-of-DejaVu-SANS-font.patch
-Patch0200: 0200-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch
-Patch0201: 0201-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch
-Patch0202: 0202-EFI-console-Do-not-set-colorstate-until-the-first-te.patch
-Patch0203: 0203-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch
-Patch0204: 0204-Use-visual-indentation-in-config.h.in.patch
-Patch0205: 0205-Where-present-ensure-config-util.h-precedes-config.h.patch
-Patch0206: 0206-Drop-gnulib-fix-base64.patch.patch
-Patch0207: 0207-Drop-gnulib-no-abort.patch.patch
-Patch0208: 0208-Update-gnulib-version-and-drop-most-gnulib-patches.patch
-Patch0209: 0209-commands-search-Fix-bug-stopping-iteration-when-no-f.patch
-Patch0210: 0210-search-new-efidisk-only-option-on-EFI-systems.patch
-Patch0211: 0211-efi-new-connectefi-command.patch
-Patch0212: 0212-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
-Patch0213: 0213-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch
-Patch0214: 0214-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
-Patch0215: 0215-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
-Patch0216: 0216-Correct-sorting-of-kernel-names-containing-_.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-grub-set-bootflag-Update-comment-about-running-as-ro.patch
+Patch0122: 0122-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
+Patch0123: 0123-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
+Patch0124: 0124-Add-start-symbol-for-RISC-V.patch
+Patch0125: 0125-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
+Patch0126: 0126-efi-http-Export-fw-http-_path-variables-to-make-them.patch
+Patch0127: 0127-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
+Patch0128: 0128-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
+Patch0129: 0129-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
+Patch0130: 0130-efi-net-Print-a-debug-message-if-parsing-the-address.patch
+Patch0131: 0131-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
+Patch0132: 0132-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
+Patch0133: 0133-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch
+Patch0134: 0134-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
+Patch0135: 0135-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
+Patch0136: 0136-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
+Patch0137: 0137-efi-dhcp-fix-some-allocation-error-checking.patch
+Patch0138: 0138-efi-http-fix-some-allocation-error-checking.patch
+Patch0139: 0139-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
+Patch0140: 0140-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
+Patch0141: 0141-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+Patch0142: 0142-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
+Patch0143: 0143-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
+Patch0144: 0144-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
+Patch0145: 0145-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
+Patch0146: 0146-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
+Patch0147: 0147-Add-systemd-integration-scripts-to-make-systemctl-re.patch
+Patch0148: 0148-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
+Patch0149: 0149-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
+Patch0150: 0150-grub-install-disable-support-for-EFI-platforms.patch
+Patch0151: 0151-New-with-debug-timestamps-configure-flag-to-prepend-.patch
+Patch0152: 0152-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
+Patch0153: 0153-Introduce-function-grub_debug_is_enabled-void-return.patch
+Patch0154: 0154-Don-t-clear-screen-when-debugging-is-enabled.patch
+Patch0155: 0155-grub_file_-instrumentation-new-file-debug-tag.patch
+Patch0156: 0156-ieee1275-Avoiding-many-unecessary-open-close.patch
+Patch0157: 0157-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
+Patch0158: 0158-ieee1275-powerpc-enables-device-mapper-discovery.patch
+Patch0159: 0159-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
+Patch0160: 0160-Add-suport-for-signing-grub-with-an-appended-signatu.patch
+Patch0161: 0161-docs-grub-Document-signing-grub-under-UEFI.patch
+Patch0162: 0162-docs-grub-Document-signing-grub-with-an-appended-sig.patch
+Patch0163: 0163-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
+Patch0164: 0164-pgp-factor-out-rsa_pad.patch
+Patch0165: 0165-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
+Patch0166: 0166-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
+Patch0167: 0167-libtasn1-import-libtasn1-4.16.0.patch
+Patch0168: 0168-libtasn1-disable-code-not-needed-in-grub.patch
+Patch0169: 0169-libtasn1-changes-for-grub-compatibility.patch
+Patch0170: 0170-libtasn1-compile-into-asn1-module.patch
+Patch0171: 0171-test_asn1-test-module-for-libtasn1.patch
+Patch0172: 0172-grub-install-support-embedding-x509-certificates.patch
+Patch0173: 0173-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
+Patch0174: 0174-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
+Patch0175: 0175-appended-signatures-support-verifying-appended-signa.patch
+Patch0176: 0176-appended-signatures-verification-tests.patch
+Patch0177: 0177-appended-signatures-documentation.patch
+Patch0178: 0178-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
+Patch0179: 0179-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
+Patch0180: 0180-ieee1275-claim-more-memory.patch
+Patch0181: 0181-ieee1275-request-memory-with-ibm-client-architecture.patch
+Patch0182: 0182-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
+Patch0183: 0183-ieee1275-ofdisk-retry-on-open-failure.patch
+Patch0184: 0184-Allow-chainloading-EFI-apps-from-loop-mounts.patch
+Patch0185: 0185-efinet-Add-DHCP-proxy-support.patch
+Patch0186: 0186-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
+Patch0187: 0187-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
+Patch0188: 0188-Suppress-gettext-error-message.patch
+Patch0189: 0189-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
+Patch0190: 0190-templates-Check-for-EFI-at-runtime-instead-of-config.patch
+Patch0191: 0191-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch
+Patch0192: 0192-arm64-Fix-EFI-loader-kernel-image-allocation.patch
+Patch0193: 0193-normal-main-Discover-the-device-to-read-the-config-f.patch
+Patch0194: 0194-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
+Patch0195: 0195-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch
+Patch0196: 0196-Print-module-name-on-license-check-failure.patch
+Patch0197: 0197-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
+Patch0198: 0198-grub-mkconfig-restore-umask-for-grub.cfg.patch
+Patch0199: 0199-fs-btrfs-Use-full-btrfs-bootloader-area.patch
+Patch0200: 0200-Add-Fedora-location-of-DejaVu-SANS-font.patch
+Patch0201: 0201-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch
+Patch0202: 0202-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch
+Patch0203: 0203-EFI-console-Do-not-set-colorstate-until-the-first-te.patch
+Patch0204: 0204-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch
+Patch0205: 0205-Use-visual-indentation-in-config.h.in.patch
+Patch0206: 0206-Where-present-ensure-config-util.h-precedes-config.h.patch
+Patch0207: 0207-Drop-gnulib-fix-base64.patch.patch
+Patch0208: 0208-Drop-gnulib-no-abort.patch.patch
+Patch0209: 0209-Update-gnulib-version-and-drop-most-gnulib-patches.patch
+Patch0210: 0210-commands-search-Fix-bug-stopping-iteration-when-no-f.patch
+Patch0211: 0211-search-new-efidisk-only-option-on-EFI-systems.patch
+Patch0212: 0212-efi-new-connectefi-command.patch
+Patch0213: 0213-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
+Patch0214: 0214-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch
+Patch0215: 0215-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
+Patch0216: 0216-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
diff --git a/grub2.spec b/grub2.spec
index 9f788964..b7a1117a 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	26%{?dist}
+Release:	27%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -422,6 +422,7 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %{_datarootdir}/bash-completion/completions/grub
 %{_sbindir}/%{name}-mkconfig
 %{_sbindir}/%{name}-switch-to-blscfg
+%{_sbindir}/%{name}-rpm-sort
 %{_sbindir}/%{name}-reboot
 %{_bindir}/%{name}-file
 %{_bindir}/%{name}-menulst2cfg
@@ -525,6 +526,12 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Tue Mar 22 2022 Adam Williamson <awilliam@redhat.com> - 2.06-27
+- Revert "Use my sort patch instead", it broke Rawhide
+- Tweak BLS skipping on ostree to work in chroots (I hope)
+- Resolves: #2066969
+- Resolves: #2059776
+
 * Tue Mar 22 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-26
 - Fix rebase on x509 embedding patch