diff --git a/.gitignore b/.gitignore
index ca42043..c9613f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/gnulib-9f48fb992a3d7e96610c4ce8be969cff2d61a01b.tar.gz
-SOURCES/grub-2.12.tar.xz
-SOURCES/theme.tar.bz2
-SOURCES/unifont-13.0.06.pcf.gz
+gnulib-9f48fb992a3d7e96610c4ce8be969cff2d61a01b.tar.gz
+grub-2.12.tar.xz
+theme.tar.bz2
+unifont-13.0.06.pcf.gz
diff --git a/.grub2.metadata b/.grub2.metadata
deleted file mode 100644
index cd5b468..0000000
--- a/.grub2.metadata
+++ /dev/null
@@ -1,4 +0,0 @@
-d08376d97163f99ce0d61fce160d6f7667c5c944 SOURCES/gnulib-9f48fb992a3d7e96610c4ce8be969cff2d61a01b.tar.gz
-9a5cd9860a02d479ff65461b710a4d85ea46b9f4 SOURCES/grub-2.12.tar.xz
-cf0b7763c528902da7e8b05cfa248f20c8825ce5 SOURCES/theme.tar.bz2
-3b39cb0830367171760ec536cab805abdbe08bc5 SOURCES/unifont-13.0.06.pcf.gz
diff --git a/SOURCES/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch b/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch
similarity index 100%
rename from SOURCES/0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch
rename to 0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch
diff --git a/SOURCES/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch b/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch
similarity index 100%
rename from SOURCES/0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch
rename to 0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch
diff --git a/SOURCES/0003-Revert-templates-Disable-the-os-prober-by-default.patch b/0003-Revert-templates-Disable-the-os-prober-by-default.patch
similarity index 100%
rename from SOURCES/0003-Revert-templates-Disable-the-os-prober-by-default.patch
rename to 0003-Revert-templates-Disable-the-os-prober-by-default.patch
diff --git a/SOURCES/0004-Rework-linux-command.patch b/0004-Rework-linux-command.patch
similarity index 100%
rename from SOURCES/0004-Rework-linux-command.patch
rename to 0004-Rework-linux-command.patch
diff --git a/SOURCES/0005-Rework-linux16-command.patch b/0005-Rework-linux16-command.patch
similarity index 100%
rename from SOURCES/0005-Rework-linux16-command.patch
rename to 0005-Rework-linux16-command.patch
diff --git a/SOURCES/0006-re-write-.gitignore.patch b/0006-re-write-.gitignore.patch
similarity index 100%
rename from SOURCES/0006-re-write-.gitignore.patch
rename to 0006-re-write-.gitignore.patch
diff --git a/SOURCES/0007-IBM-client-architecture-CAS-reboot-support.patch b/0007-IBM-client-architecture-CAS-reboot-support.patch
similarity index 100%
rename from SOURCES/0007-IBM-client-architecture-CAS-reboot-support.patch
rename to 0007-IBM-client-architecture-CAS-reboot-support.patch
diff --git a/SOURCES/0008-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0008-for-ppc-reset-console-display-attr-when-clear-screen.patch
similarity index 100%
rename from SOURCES/0008-for-ppc-reset-console-display-attr-when-clear-screen.patch
rename to 0008-for-ppc-reset-console-display-attr-when-clear-screen.patch
diff --git a/SOURCES/0009-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0009-Disable-GRUB-video-support-for-IBM-power-machines.patch
similarity index 100%
rename from SOURCES/0009-Disable-GRUB-video-support-for-IBM-power-machines.patch
rename to 0009-Disable-GRUB-video-support-for-IBM-power-machines.patch
diff --git a/SOURCES/0010-Move-bash-completion-script-922997.patch b/0010-Move-bash-completion-script-922997.patch
similarity index 100%
rename from SOURCES/0010-Move-bash-completion-script-922997.patch
rename to 0010-Move-bash-completion-script-922997.patch
diff --git a/SOURCES/0011-Allow-fallback-to-include-entries-by-title-not-just-.patch b/0011-Allow-fallback-to-include-entries-by-title-not-just-.patch
similarity index 100%
rename from SOURCES/0011-Allow-fallback-to-include-entries-by-title-not-just-.patch
rename to 0011-Allow-fallback-to-include-entries-by-title-not-just-.patch
diff --git a/SOURCES/0012-Make-exit-take-a-return-code.patch b/0012-Make-exit-take-a-return-code.patch
similarity index 100%
rename from SOURCES/0012-Make-exit-take-a-return-code.patch
rename to 0012-Make-exit-take-a-return-code.patch
diff --git a/SOURCES/0013-Make-efi-machines-load-an-env-block-from-a-variable.patch b/0013-Make-efi-machines-load-an-env-block-from-a-variable.patch
similarity index 100%
rename from SOURCES/0013-Make-efi-machines-load-an-env-block-from-a-variable.patch
rename to 0013-Make-efi-machines-load-an-env-block-from-a-variable.patch
diff --git a/SOURCES/0014-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0014-Migrate-PPC-from-Yaboot-to-Grub2.patch
similarity index 100%
rename from SOURCES/0014-Migrate-PPC-from-Yaboot-to-Grub2.patch
rename to 0014-Migrate-PPC-from-Yaboot-to-Grub2.patch
diff --git a/SOURCES/0015-Add-fw_path-variable-revised.patch b/0015-Add-fw_path-variable-revised.patch
similarity index 100%
rename from SOURCES/0015-Add-fw_path-variable-revised.patch
rename to 0015-Add-fw_path-variable-revised.patch
diff --git a/SOURCES/0016-Pass-x-hex-hex-straight-through-unmolested.patch b/0016-Pass-x-hex-hex-straight-through-unmolested.patch
similarity index 100%
rename from SOURCES/0016-Pass-x-hex-hex-straight-through-unmolested.patch
rename to 0016-Pass-x-hex-hex-straight-through-unmolested.patch
diff --git a/SOURCES/0017-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0017-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
similarity index 100%
rename from SOURCES/0017-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
rename to 0017-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
diff --git a/SOURCES/0018-Add-devicetree-loading.patch b/0018-Add-devicetree-loading.patch
similarity index 100%
rename from SOURCES/0018-Add-devicetree-loading.patch
rename to 0018-Add-devicetree-loading.patch
diff --git a/SOURCES/0019-Enable-pager-by-default.-985860.patch b/0019-Enable-pager-by-default.-985860.patch
similarity index 100%
rename from SOURCES/0019-Enable-pager-by-default.-985860.patch
rename to 0019-Enable-pager-by-default.-985860.patch
diff --git a/SOURCES/0020-Don-t-say-GNU-Linux-in-generated-menus.patch b/0020-Don-t-say-GNU-Linux-in-generated-menus.patch
similarity index 100%
rename from SOURCES/0020-Don-t-say-GNU-Linux-in-generated-menus.patch
rename to 0020-Don-t-say-GNU-Linux-in-generated-menus.patch
diff --git a/SOURCES/0021-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0021-Add-.eh_frame-to-list-of-relocations-stripped.patch
similarity index 100%
rename from SOURCES/0021-Add-.eh_frame-to-list-of-relocations-stripped.patch
rename to 0021-Add-.eh_frame-to-list-of-relocations-stripped.patch
diff --git a/SOURCES/0022-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0022-Don-t-require-a-password-to-boot-entries-generated-b.patch
similarity index 100%
rename from SOURCES/0022-Don-t-require-a-password-to-boot-entries-generated-b.patch
rename to 0022-Don-t-require-a-password-to-boot-entries-generated-b.patch
diff --git a/SOURCES/0023-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0023-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
similarity index 100%
rename from SOURCES/0023-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
rename to 0023-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
diff --git a/SOURCES/0024-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0024-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
similarity index 100%
rename from SOURCES/0024-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
rename to 0024-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
diff --git a/SOURCES/0025-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0025-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
similarity index 100%
rename from SOURCES/0025-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
rename to 0025-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
diff --git a/SOURCES/0026-Try-prefix-if-fw_path-doesn-t-work.patch b/0026-Try-prefix-if-fw_path-doesn-t-work.patch
similarity index 100%
rename from SOURCES/0026-Try-prefix-if-fw_path-doesn-t-work.patch
rename to 0026-Try-prefix-if-fw_path-doesn-t-work.patch
diff --git a/SOURCES/0027-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0027-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
similarity index 100%
rename from SOURCES/0027-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
rename to 0027-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
diff --git a/SOURCES/0028-Add-friendly-grub2-password-config-tool-985962.patch b/0028-Add-friendly-grub2-password-config-tool-985962.patch
similarity index 100%
rename from SOURCES/0028-Add-friendly-grub2-password-config-tool-985962.patch
rename to 0028-Add-friendly-grub2-password-config-tool-985962.patch
diff --git a/SOURCES/0029-tcp-add-window-scaling-support.patch b/0029-tcp-add-window-scaling-support.patch
similarity index 100%
rename from SOURCES/0029-tcp-add-window-scaling-support.patch
rename to 0029-tcp-add-window-scaling-support.patch
diff --git a/SOURCES/0030-efinet-and-bootp-add-support-for-dhcpv6.patch b/0030-efinet-and-bootp-add-support-for-dhcpv6.patch
similarity index 100%
rename from SOURCES/0030-efinet-and-bootp-add-support-for-dhcpv6.patch
rename to 0030-efinet-and-bootp-add-support-for-dhcpv6.patch
diff --git a/SOURCES/0031-bootp-New-net_bootp6-command.patch b/0031-bootp-New-net_bootp6-command.patch
similarity index 100%
rename from SOURCES/0031-bootp-New-net_bootp6-command.patch
rename to 0031-bootp-New-net_bootp6-command.patch
diff --git a/SOURCES/0032-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0032-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
similarity index 100%
rename from SOURCES/0032-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
rename to 0032-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
diff --git a/SOURCES/0033-Make-grub_fatal-also-backtrace.patch b/0033-Make-grub_fatal-also-backtrace.patch
similarity index 100%
rename from SOURCES/0033-Make-grub_fatal-also-backtrace.patch
rename to 0033-Make-grub_fatal-also-backtrace.patch
diff --git a/SOURCES/0034-Make-our-info-pages-say-grub2-where-appropriate.patch b/0034-Make-our-info-pages-say-grub2-where-appropriate.patch
similarity index 100%
rename from SOURCES/0034-Make-our-info-pages-say-grub2-where-appropriate.patch
rename to 0034-Make-our-info-pages-say-grub2-where-appropriate.patch
diff --git a/SOURCES/0035-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0035-macos-just-build-chainloader-entries-don-t-try-any-x.patch
similarity index 100%
rename from SOURCES/0035-macos-just-build-chainloader-entries-don-t-try-any-x.patch
rename to 0035-macos-just-build-chainloader-entries-don-t-try-any-x.patch
diff --git a/SOURCES/0036-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0036-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
similarity index 100%
rename from SOURCES/0036-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
rename to 0036-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
diff --git a/SOURCES/0037-btrfs-fix-a-bad-null-check.patch b/0037-btrfs-fix-a-bad-null-check.patch
similarity index 100%
rename from SOURCES/0037-btrfs-fix-a-bad-null-check.patch
rename to 0037-btrfs-fix-a-bad-null-check.patch
diff --git a/SOURCES/0038-export-btrfs_subvol-and-btrfs_subvolid.patch b/0038-export-btrfs_subvol-and-btrfs_subvolid.patch
similarity index 100%
rename from SOURCES/0038-export-btrfs_subvol-and-btrfs_subvolid.patch
rename to 0038-export-btrfs_subvol-and-btrfs_subvolid.patch
diff --git a/SOURCES/0039-grub2-btrfs-03-follow_default.patch b/0039-grub2-btrfs-03-follow_default.patch
similarity index 100%
rename from SOURCES/0039-grub2-btrfs-03-follow_default.patch
rename to 0039-grub2-btrfs-03-follow_default.patch
diff --git a/SOURCES/0040-grub2-btrfs-04-grub2-install.patch b/0040-grub2-btrfs-04-grub2-install.patch
similarity index 100%
rename from SOURCES/0040-grub2-btrfs-04-grub2-install.patch
rename to 0040-grub2-btrfs-04-grub2-install.patch
diff --git a/SOURCES/0041-grub2-btrfs-05-grub2-mkconfig.patch b/0041-grub2-btrfs-05-grub2-mkconfig.patch
similarity index 100%
rename from SOURCES/0041-grub2-btrfs-05-grub2-mkconfig.patch
rename to 0041-grub2-btrfs-05-grub2-mkconfig.patch
diff --git a/SOURCES/0042-grub2-btrfs-06-subvol-mount.patch b/0042-grub2-btrfs-06-subvol-mount.patch
similarity index 100%
rename from SOURCES/0042-grub2-btrfs-06-subvol-mount.patch
rename to 0042-grub2-btrfs-06-subvol-mount.patch
diff --git a/SOURCES/0043-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0043-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
similarity index 100%
rename from SOURCES/0043-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
rename to 0043-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
diff --git a/SOURCES/0044-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0044-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
similarity index 100%
rename from SOURCES/0044-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
rename to 0044-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
diff --git a/SOURCES/0045-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0045-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
similarity index 100%
rename from SOURCES/0045-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
rename to 0045-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
diff --git a/SOURCES/0046-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0046-Use-grub_efi_.-memory-helpers-where-reasonable.patch
similarity index 100%
rename from SOURCES/0046-Use-grub_efi_.-memory-helpers-where-reasonable.patch
rename to 0046-Use-grub_efi_.-memory-helpers-where-reasonable.patch
diff --git a/SOURCES/0047-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0047-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
similarity index 100%
rename from SOURCES/0047-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
rename to 0047-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
diff --git a/SOURCES/0048-don-t-use-int-for-efi-status.patch b/0048-don-t-use-int-for-efi-status.patch
similarity index 100%
rename from SOURCES/0048-don-t-use-int-for-efi-status.patch
rename to 0048-don-t-use-int-for-efi-status.patch
diff --git a/SOURCES/0049-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0049-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
similarity index 100%
rename from SOURCES/0049-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
rename to 0049-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
diff --git a/SOURCES/0050-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0050-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
similarity index 100%
rename from SOURCES/0050-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
rename to 0050-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
diff --git a/SOURCES/0051-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/0051-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
similarity index 100%
rename from SOURCES/0051-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
rename to 0051-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
diff --git a/SOURCES/0052-align-struct-efi_variable-better.patch b/0052-align-struct-efi_variable-better.patch
similarity index 100%
rename from SOURCES/0052-align-struct-efi_variable-better.patch
rename to 0052-align-struct-efi_variable-better.patch
diff --git a/SOURCES/0053-Add-BLS-support-to-grub-mkconfig.patch b/0053-Add-BLS-support-to-grub-mkconfig.patch
similarity index 100%
rename from SOURCES/0053-Add-BLS-support-to-grub-mkconfig.patch
rename to 0053-Add-BLS-support-to-grub-mkconfig.patch
diff --git a/SOURCES/0054-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch b/0054-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
similarity index 100%
rename from SOURCES/0054-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
rename to 0054-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
diff --git a/SOURCES/0055-Add-grub2-switch-to-blscfg.patch b/0055-Add-grub2-switch-to-blscfg.patch
similarity index 100%
rename from SOURCES/0055-Add-grub2-switch-to-blscfg.patch
rename to 0055-Add-grub2-switch-to-blscfg.patch
diff --git a/SOURCES/0056-normal-don-t-draw-our-startup-message-if-debug-is-se.patch b/0056-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
similarity index 100%
rename from SOURCES/0056-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
rename to 0056-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
diff --git a/SOURCES/0057-Work-around-some-minor-include-path-weirdnesses.patch b/0057-Work-around-some-minor-include-path-weirdnesses.patch
similarity index 100%
rename from SOURCES/0057-Work-around-some-minor-include-path-weirdnesses.patch
rename to 0057-Work-around-some-minor-include-path-weirdnesses.patch
diff --git a/SOURCES/0058-Make-it-possible-to-enabled-build-id-sha1.patch b/0058-Make-it-possible-to-enabled-build-id-sha1.patch
similarity index 100%
rename from SOURCES/0058-Make-it-possible-to-enabled-build-id-sha1.patch
rename to 0058-Make-it-possible-to-enabled-build-id-sha1.patch
diff --git a/SOURCES/0059-make-better-backtraces.patch b/0059-make-better-backtraces.patch
similarity index 100%
rename from SOURCES/0059-make-better-backtraces.patch
rename to 0059-make-better-backtraces.patch
diff --git a/SOURCES/0060-Fixup-for-newer-compiler.patch b/0060-Fixup-for-newer-compiler.patch
similarity index 100%
rename from SOURCES/0060-Fixup-for-newer-compiler.patch
rename to 0060-Fixup-for-newer-compiler.patch
diff --git a/SOURCES/0061-Don-t-attempt-to-export-the-start-and-_start-symbols.patch b/0061-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
similarity index 100%
rename from SOURCES/0061-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
rename to 0061-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
diff --git a/SOURCES/0062-Fixup-for-newer-compiler.patch b/0062-Fixup-for-newer-compiler.patch
similarity index 100%
rename from SOURCES/0062-Fixup-for-newer-compiler.patch
rename to 0062-Fixup-for-newer-compiler.patch
diff --git a/SOURCES/0063-Add-support-for-non-Ethernet-network-cards.patch b/0063-Add-support-for-non-Ethernet-network-cards.patch
similarity index 100%
rename from SOURCES/0063-Add-support-for-non-Ethernet-network-cards.patch
rename to 0063-Add-support-for-non-Ethernet-network-cards.patch
diff --git a/SOURCES/0064-efinet-UEFI-IPv6-PXE-support.patch b/0064-efinet-UEFI-IPv6-PXE-support.patch
similarity index 100%
rename from SOURCES/0064-efinet-UEFI-IPv6-PXE-support.patch
rename to 0064-efinet-UEFI-IPv6-PXE-support.patch
diff --git a/SOURCES/0065-grub.texi-Add-net_bootp6-doument.patch b/0065-grub.texi-Add-net_bootp6-doument.patch
similarity index 100%
rename from SOURCES/0065-grub.texi-Add-net_bootp6-doument.patch
rename to 0065-grub.texi-Add-net_bootp6-doument.patch
diff --git a/SOURCES/0066-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch b/0066-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
similarity index 100%
rename from SOURCES/0066-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
rename to 0066-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
diff --git a/SOURCES/0067-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch b/0067-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
similarity index 100%
rename from SOURCES/0067-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
rename to 0067-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch
diff --git a/SOURCES/0068-efinet-Setting-network-from-UEFI-device-path.patch b/0068-efinet-Setting-network-from-UEFI-device-path.patch
similarity index 100%
rename from SOURCES/0068-efinet-Setting-network-from-UEFI-device-path.patch
rename to 0068-efinet-Setting-network-from-UEFI-device-path.patch
diff --git a/SOURCES/0069-efinet-Setting-DNS-server-from-UEFI-protocol.patch b/0069-efinet-Setting-DNS-server-from-UEFI-protocol.patch
similarity index 100%
rename from SOURCES/0069-efinet-Setting-DNS-server-from-UEFI-protocol.patch
rename to 0069-efinet-Setting-DNS-server-from-UEFI-protocol.patch
diff --git a/SOURCES/0070-Support-UEFI-networking-protocols.patch b/0070-Support-UEFI-networking-protocols.patch
similarity index 100%
rename from SOURCES/0070-Support-UEFI-networking-protocols.patch
rename to 0070-Support-UEFI-networking-protocols.patch
diff --git a/SOURCES/0071-AUDIT-0-http-boot-tracker-bug.patch b/0071-AUDIT-0-http-boot-tracker-bug.patch
similarity index 100%
rename from SOURCES/0071-AUDIT-0-http-boot-tracker-bug.patch
rename to 0071-AUDIT-0-http-boot-tracker-bug.patch
diff --git a/SOURCES/0072-grub-editenv-Add-incr-command-to-increment-integer-v.patch b/0072-grub-editenv-Add-incr-command-to-increment-integer-v.patch
similarity index 100%
rename from SOURCES/0072-grub-editenv-Add-incr-command-to-increment-integer-v.patch
rename to 0072-grub-editenv-Add-incr-command-to-increment-integer-v.patch
diff --git a/SOURCES/0073-Add-auto-hide-menu-support.patch b/0073-Add-auto-hide-menu-support.patch
similarity index 100%
rename from SOURCES/0073-Add-auto-hide-menu-support.patch
rename to 0073-Add-auto-hide-menu-support.patch
diff --git a/SOURCES/0074-Add-grub-set-bootflag-utility.patch b/0074-Add-grub-set-bootflag-utility.patch
similarity index 100%
rename from SOURCES/0074-Add-grub-set-bootflag-utility.patch
rename to 0074-Add-grub-set-bootflag-utility.patch
diff --git a/SOURCES/0075-docs-Add-grub-boot-indeterminate.service-example.patch b/0075-docs-Add-grub-boot-indeterminate.service-example.patch
similarity index 100%
rename from SOURCES/0075-docs-Add-grub-boot-indeterminate.service-example.patch
rename to 0075-docs-Add-grub-boot-indeterminate.service-example.patch
diff --git a/SOURCES/0076-gentpl-add-disable-support.patch b/0076-gentpl-add-disable-support.patch
similarity index 100%
rename from SOURCES/0076-gentpl-add-disable-support.patch
rename to 0076-gentpl-add-disable-support.patch
diff --git a/SOURCES/0077-gentpl-add-pc-firmware-type.patch b/0077-gentpl-add-pc-firmware-type.patch
similarity index 100%
rename from SOURCES/0077-gentpl-add-pc-firmware-type.patch
rename to 0077-gentpl-add-pc-firmware-type.patch
diff --git a/SOURCES/0078-efinet-also-use-the-firmware-acceleration-for-http.patch b/0078-efinet-also-use-the-firmware-acceleration-for-http.patch
similarity index 100%
rename from SOURCES/0078-efinet-also-use-the-firmware-acceleration-for-http.patch
rename to 0078-efinet-also-use-the-firmware-acceleration-for-http.patch
diff --git a/SOURCES/0079-efi-http-Make-root_url-reflect-the-protocol-hostname.patch b/0079-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
similarity index 100%
rename from SOURCES/0079-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
rename to 0079-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
diff --git a/SOURCES/0080-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch b/0080-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
similarity index 100%
rename from SOURCES/0080-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
rename to 0080-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
diff --git a/SOURCES/0081-Rework-how-the-fdt-command-builds.patch b/0081-Rework-how-the-fdt-command-builds.patch
similarity index 100%
rename from SOURCES/0081-Rework-how-the-fdt-command-builds.patch
rename to 0081-Rework-how-the-fdt-command-builds.patch
diff --git a/SOURCES/0082-Disable-non-wordsize-allocations-on-arm.patch b/0082-Disable-non-wordsize-allocations-on-arm.patch
similarity index 100%
rename from SOURCES/0082-Disable-non-wordsize-allocations-on-arm.patch
rename to 0082-Disable-non-wordsize-allocations-on-arm.patch
diff --git a/SOURCES/0083-Prepend-prefix-when-HTTP-path-is-relative.patch b/0083-Prepend-prefix-when-HTTP-path-is-relative.patch
similarity index 100%
rename from SOURCES/0083-Prepend-prefix-when-HTTP-path-is-relative.patch
rename to 0083-Prepend-prefix-when-HTTP-path-is-relative.patch
diff --git a/SOURCES/0084-Make-grub_error-more-verbose.patch b/0084-Make-grub_error-more-verbose.patch
similarity index 100%
rename from SOURCES/0084-Make-grub_error-more-verbose.patch
rename to 0084-Make-grub_error-more-verbose.patch
diff --git a/SOURCES/0085-Make-reset-an-alias-for-the-reboot-command.patch b/0085-Make-reset-an-alias-for-the-reboot-command.patch
similarity index 100%
rename from SOURCES/0085-Make-reset-an-alias-for-the-reboot-command.patch
rename to 0085-Make-reset-an-alias-for-the-reboot-command.patch
diff --git a/SOURCES/0086-Add-a-version-command.patch b/0086-Add-a-version-command.patch
similarity index 100%
rename from SOURCES/0086-Add-a-version-command.patch
rename to 0086-Add-a-version-command.patch
diff --git a/SOURCES/0087-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch b/0087-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
similarity index 100%
rename from SOURCES/0087-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
rename to 0087-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
diff --git a/SOURCES/0088-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch b/0088-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
similarity index 100%
rename from SOURCES/0088-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
rename to 0088-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch
diff --git a/SOURCES/0089-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch b/0089-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
similarity index 100%
rename from SOURCES/0089-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
rename to 0089-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch
diff --git a/SOURCES/0090-Fix-getroot.c-s-trampolines.patch b/0090-Fix-getroot.c-s-trampolines.patch
similarity index 100%
rename from SOURCES/0090-Fix-getroot.c-s-trampolines.patch
rename to 0090-Fix-getroot.c-s-trampolines.patch
diff --git a/SOURCES/0091-Do-not-allow-stack-trampolines-anywhere.patch b/0091-Do-not-allow-stack-trampolines-anywhere.patch
similarity index 100%
rename from SOURCES/0091-Do-not-allow-stack-trampolines-anywhere.patch
rename to 0091-Do-not-allow-stack-trampolines-anywhere.patch
diff --git a/SOURCES/0092-Reimplement-boot_counter.patch b/0092-Reimplement-boot_counter.patch
similarity index 100%
rename from SOURCES/0092-Reimplement-boot_counter.patch
rename to 0092-Reimplement-boot_counter.patch
diff --git a/SOURCES/0093-Fix-menu-entry-selection-based-on-ID-and-title.patch b/0093-Fix-menu-entry-selection-based-on-ID-and-title.patch
similarity index 100%
rename from SOURCES/0093-Fix-menu-entry-selection-based-on-ID-and-title.patch
rename to 0093-Fix-menu-entry-selection-based-on-ID-and-title.patch
diff --git a/SOURCES/0094-Make-the-menu-entry-users-option-argument-to-be-opti.patch b/0094-Make-the-menu-entry-users-option-argument-to-be-opti.patch
similarity index 100%
rename from SOURCES/0094-Make-the-menu-entry-users-option-argument-to-be-opti.patch
rename to 0094-Make-the-menu-entry-users-option-argument-to-be-opti.patch
diff --git a/SOURCES/0095-Add-efi-export-env-and-efi-load-env-commands.patch b/0095-Add-efi-export-env-and-efi-load-env-commands.patch
similarity index 100%
rename from SOURCES/0095-Add-efi-export-env-and-efi-load-env-commands.patch
rename to 0095-Add-efi-export-env-and-efi-load-env-commands.patch
diff --git a/SOURCES/0096-Export-all-variables-from-the-initial-context-when-c.patch b/0096-Export-all-variables-from-the-initial-context-when-c.patch
similarity index 100%
rename from SOURCES/0096-Export-all-variables-from-the-initial-context-when-c.patch
rename to 0096-Export-all-variables-from-the-initial-context-when-c.patch
diff --git a/SOURCES/0097-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch b/0097-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
similarity index 100%
rename from SOURCES/0097-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
rename to 0097-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
diff --git a/SOURCES/0098-Don-t-assume-that-boot-commands-will-only-return-on-.patch b/0098-Don-t-assume-that-boot-commands-will-only-return-on-.patch
similarity index 100%
rename from SOURCES/0098-Don-t-assume-that-boot-commands-will-only-return-on-.patch
rename to 0098-Don-t-assume-that-boot-commands-will-only-return-on-.patch
diff --git a/SOURCES/0099-grub-set-bootflag-Update-comment-about-running-as-ro.patch b/0099-grub-set-bootflag-Update-comment-about-running-as-ro.patch
similarity index 100%
rename from SOURCES/0099-grub-set-bootflag-Update-comment-about-running-as-ro.patch
rename to 0099-grub-set-bootflag-Update-comment-about-running-as-ro.patch
diff --git a/SOURCES/0100-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch b/0100-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
similarity index 100%
rename from SOURCES/0100-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
rename to 0100-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
diff --git a/SOURCES/0101-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch b/0101-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
similarity index 100%
rename from SOURCES/0101-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
rename to 0101-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
diff --git a/SOURCES/0102-Add-start-symbol-for-RISC-V.patch b/0102-Add-start-symbol-for-RISC-V.patch
similarity index 100%
rename from SOURCES/0102-Add-start-symbol-for-RISC-V.patch
rename to 0102-Add-start-symbol-for-RISC-V.patch
diff --git a/SOURCES/0103-bootstrap.conf-Force-autogen.sh-to-use-python3.patch b/0103-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
similarity index 100%
rename from SOURCES/0103-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
rename to 0103-bootstrap.conf-Force-autogen.sh-to-use-python3.patch
diff --git a/SOURCES/0104-efi-http-Export-fw-http-_path-variables-to-make-them.patch b/0104-efi-http-Export-fw-http-_path-variables-to-make-them.patch
similarity index 100%
rename from SOURCES/0104-efi-http-Export-fw-http-_path-variables-to-make-them.patch
rename to 0104-efi-http-Export-fw-http-_path-variables-to-make-them.patch
diff --git a/SOURCES/0105-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch b/0105-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
similarity index 100%
rename from SOURCES/0105-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
rename to 0105-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
diff --git a/SOURCES/0106-efi-net-Allow-to-specify-a-port-number-in-addresses.patch b/0106-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
similarity index 100%
rename from SOURCES/0106-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
rename to 0106-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
diff --git a/SOURCES/0107-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch b/0107-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
similarity index 100%
rename from SOURCES/0107-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
rename to 0107-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
diff --git a/SOURCES/0108-efi-net-Print-a-debug-message-if-parsing-the-address.patch b/0108-efi-net-Print-a-debug-message-if-parsing-the-address.patch
similarity index 100%
rename from SOURCES/0108-efi-net-Print-a-debug-message-if-parsing-the-address.patch
rename to 0108-efi-net-Print-a-debug-message-if-parsing-the-address.patch
diff --git a/SOURCES/0109-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch b/0109-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
similarity index 100%
rename from SOURCES/0109-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
rename to 0109-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch
diff --git a/SOURCES/0110-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch b/0110-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
similarity index 100%
rename from SOURCES/0110-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
rename to 0110-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch
diff --git a/SOURCES/0111-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch b/0111-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
similarity index 100%
rename from SOURCES/0111-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
rename to 0111-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch
diff --git a/SOURCES/0112-efi-dhcp-fix-some-allocation-error-checking.patch b/0112-efi-dhcp-fix-some-allocation-error-checking.patch
similarity index 100%
rename from SOURCES/0112-efi-dhcp-fix-some-allocation-error-checking.patch
rename to 0112-efi-dhcp-fix-some-allocation-error-checking.patch
diff --git a/SOURCES/0113-efi-http-fix-some-allocation-error-checking.patch b/0113-efi-http-fix-some-allocation-error-checking.patch
similarity index 100%
rename from SOURCES/0113-efi-http-fix-some-allocation-error-checking.patch
rename to 0113-efi-http-fix-some-allocation-error-checking.patch
diff --git a/SOURCES/0114-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch b/0114-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
similarity index 100%
rename from SOURCES/0114-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
rename to 0114-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
diff --git a/SOURCES/0115-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch b/0115-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
similarity index 100%
rename from SOURCES/0115-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
rename to 0115-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch
diff --git a/SOURCES/0116-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch b/0116-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
similarity index 100%
rename from SOURCES/0116-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
rename to 0116-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch
diff --git a/SOURCES/0117-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch b/0117-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
similarity index 100%
rename from SOURCES/0117-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
rename to 0117-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch
diff --git a/SOURCES/0118-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch b/0118-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
similarity index 100%
rename from SOURCES/0118-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
rename to 0118-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch
diff --git a/SOURCES/0119-Add-systemd-integration-scripts-to-make-systemctl-re.patch b/0119-Add-systemd-integration-scripts-to-make-systemctl-re.patch
similarity index 100%
rename from SOURCES/0119-Add-systemd-integration-scripts-to-make-systemctl-re.patch
rename to 0119-Add-systemd-integration-scripts-to-make-systemctl-re.patch
diff --git a/SOURCES/0120-systemd-integration.sh-Also-set-old-menu_show_once-g.patch b/0120-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
similarity index 100%
rename from SOURCES/0120-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
rename to 0120-systemd-integration.sh-Also-set-old-menu_show_once-g.patch
diff --git a/SOURCES/0121-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch b/0121-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
similarity index 100%
rename from SOURCES/0121-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
rename to 0121-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
diff --git a/SOURCES/0122-grub-install-disable-support-for-EFI-platforms.patch b/0122-grub-install-disable-support-for-EFI-platforms.patch
similarity index 100%
rename from SOURCES/0122-grub-install-disable-support-for-EFI-platforms.patch
rename to 0122-grub-install-disable-support-for-EFI-platforms.patch
diff --git a/SOURCES/0123-New-with-debug-timestamps-configure-flag-to-prepend-.patch b/0123-New-with-debug-timestamps-configure-flag-to-prepend-.patch
similarity index 100%
rename from SOURCES/0123-New-with-debug-timestamps-configure-flag-to-prepend-.patch
rename to 0123-New-with-debug-timestamps-configure-flag-to-prepend-.patch
diff --git a/SOURCES/0124-Added-debug-statements-to-grub_disk_open-and-grub_di.patch b/0124-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
similarity index 100%
rename from SOURCES/0124-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
rename to 0124-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
diff --git a/SOURCES/0125-Introduce-function-grub_debug_is_enabled-void-return.patch b/0125-Introduce-function-grub_debug_is_enabled-void-return.patch
similarity index 100%
rename from SOURCES/0125-Introduce-function-grub_debug_is_enabled-void-return.patch
rename to 0125-Introduce-function-grub_debug_is_enabled-void-return.patch
diff --git a/SOURCES/0126-Don-t-clear-screen-when-debugging-is-enabled.patch b/0126-Don-t-clear-screen-when-debugging-is-enabled.patch
similarity index 100%
rename from SOURCES/0126-Don-t-clear-screen-when-debugging-is-enabled.patch
rename to 0126-Don-t-clear-screen-when-debugging-is-enabled.patch
diff --git a/SOURCES/0127-grub_file_-instrumentation-new-file-debug-tag.patch b/0127-grub_file_-instrumentation-new-file-debug-tag.patch
similarity index 100%
rename from SOURCES/0127-grub_file_-instrumentation-new-file-debug-tag.patch
rename to 0127-grub_file_-instrumentation-new-file-debug-tag.patch
diff --git a/SOURCES/0128-ieee1275-Avoiding-many-unecessary-open-close.patch b/0128-ieee1275-Avoiding-many-unecessary-open-close.patch
similarity index 100%
rename from SOURCES/0128-ieee1275-Avoiding-many-unecessary-open-close.patch
rename to 0128-ieee1275-Avoiding-many-unecessary-open-close.patch
diff --git a/SOURCES/0129-ieee1275-powerpc-implements-fibre-channel-discovery-.patch b/0129-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
similarity index 100%
rename from SOURCES/0129-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
rename to 0129-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
diff --git a/SOURCES/0130-ieee1275-powerpc-enables-device-mapper-discovery.patch b/0130-ieee1275-powerpc-enables-device-mapper-discovery.patch
similarity index 100%
rename from SOURCES/0130-ieee1275-powerpc-enables-device-mapper-discovery.patch
rename to 0130-ieee1275-powerpc-enables-device-mapper-discovery.patch
diff --git a/SOURCES/0131-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch b/0131-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
similarity index 100%
rename from SOURCES/0131-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
rename to 0131-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
diff --git a/SOURCES/0132-Add-suport-for-signing-grub-with-an-appended-signatu.patch b/0132-Add-suport-for-signing-grub-with-an-appended-signatu.patch
similarity index 100%
rename from SOURCES/0132-Add-suport-for-signing-grub-with-an-appended-signatu.patch
rename to 0132-Add-suport-for-signing-grub-with-an-appended-signatu.patch
diff --git a/SOURCES/0133-docs-grub-Document-signing-grub-under-UEFI.patch b/0133-docs-grub-Document-signing-grub-under-UEFI.patch
similarity index 100%
rename from SOURCES/0133-docs-grub-Document-signing-grub-under-UEFI.patch
rename to 0133-docs-grub-Document-signing-grub-under-UEFI.patch
diff --git a/SOURCES/0134-docs-grub-Document-signing-grub-with-an-appended-sig.patch b/0134-docs-grub-Document-signing-grub-with-an-appended-sig.patch
similarity index 100%
rename from SOURCES/0134-docs-grub-Document-signing-grub-with-an-appended-sig.patch
rename to 0134-docs-grub-Document-signing-grub-with-an-appended-sig.patch
diff --git a/SOURCES/0135-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch b/0135-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
similarity index 100%
rename from SOURCES/0135-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
rename to 0135-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
diff --git a/SOURCES/0136-pgp-factor-out-rsa_pad.patch b/0136-pgp-factor-out-rsa_pad.patch
similarity index 100%
rename from SOURCES/0136-pgp-factor-out-rsa_pad.patch
rename to 0136-pgp-factor-out-rsa_pad.patch
diff --git a/SOURCES/0137-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch b/0137-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
similarity index 100%
rename from SOURCES/0137-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
rename to 0137-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
diff --git a/SOURCES/0138-posix_wrap-tweaks-in-preparation-for-libtasn1.patch b/0138-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
similarity index 100%
rename from SOURCES/0138-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
rename to 0138-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
diff --git a/SOURCES/0139-libtasn1-import-libtasn1-4.16.0.patch b/0139-libtasn1-import-libtasn1-4.16.0.patch
similarity index 100%
rename from SOURCES/0139-libtasn1-import-libtasn1-4.16.0.patch
rename to 0139-libtasn1-import-libtasn1-4.16.0.patch
diff --git a/SOURCES/0140-libtasn1-disable-code-not-needed-in-grub.patch b/0140-libtasn1-disable-code-not-needed-in-grub.patch
similarity index 100%
rename from SOURCES/0140-libtasn1-disable-code-not-needed-in-grub.patch
rename to 0140-libtasn1-disable-code-not-needed-in-grub.patch
diff --git a/SOURCES/0141-libtasn1-changes-for-grub-compatibility.patch b/0141-libtasn1-changes-for-grub-compatibility.patch
similarity index 100%
rename from SOURCES/0141-libtasn1-changes-for-grub-compatibility.patch
rename to 0141-libtasn1-changes-for-grub-compatibility.patch
diff --git a/SOURCES/0142-libtasn1-compile-into-asn1-module.patch b/0142-libtasn1-compile-into-asn1-module.patch
similarity index 100%
rename from SOURCES/0142-libtasn1-compile-into-asn1-module.patch
rename to 0142-libtasn1-compile-into-asn1-module.patch
diff --git a/SOURCES/0143-test_asn1-test-module-for-libtasn1.patch b/0143-test_asn1-test-module-for-libtasn1.patch
similarity index 100%
rename from SOURCES/0143-test_asn1-test-module-for-libtasn1.patch
rename to 0143-test_asn1-test-module-for-libtasn1.patch
diff --git a/SOURCES/0144-grub-install-support-embedding-x509-certificates.patch b/0144-grub-install-support-embedding-x509-certificates.patch
similarity index 100%
rename from SOURCES/0144-grub-install-support-embedding-x509-certificates.patch
rename to 0144-grub-install-support-embedding-x509-certificates.patch
diff --git a/SOURCES/0145-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch b/0145-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
similarity index 100%
rename from SOURCES/0145-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
rename to 0145-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
diff --git a/SOURCES/0146-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch b/0146-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
similarity index 100%
rename from SOURCES/0146-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
rename to 0146-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
diff --git a/SOURCES/0147-appended-signatures-support-verifying-appended-signa.patch b/0147-appended-signatures-support-verifying-appended-signa.patch
similarity index 100%
rename from SOURCES/0147-appended-signatures-support-verifying-appended-signa.patch
rename to 0147-appended-signatures-support-verifying-appended-signa.patch
diff --git a/SOURCES/0148-appended-signatures-verification-tests.patch b/0148-appended-signatures-verification-tests.patch
similarity index 100%
rename from SOURCES/0148-appended-signatures-verification-tests.patch
rename to 0148-appended-signatures-verification-tests.patch
diff --git a/SOURCES/0149-appended-signatures-documentation.patch b/0149-appended-signatures-documentation.patch
similarity index 100%
rename from SOURCES/0149-appended-signatures-documentation.patch
rename to 0149-appended-signatures-documentation.patch
diff --git a/SOURCES/0150-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch b/0150-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
similarity index 100%
rename from SOURCES/0150-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
rename to 0150-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch
diff --git a/SOURCES/0151-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch b/0151-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
similarity index 100%
rename from SOURCES/0151-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
rename to 0151-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
diff --git a/SOURCES/0152-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch b/0152-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
similarity index 100%
rename from SOURCES/0152-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
rename to 0152-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
diff --git a/SOURCES/0153-ieee1275-ofdisk-retry-on-open-failure.patch b/0153-ieee1275-ofdisk-retry-on-open-failure.patch
similarity index 100%
rename from SOURCES/0153-ieee1275-ofdisk-retry-on-open-failure.patch
rename to 0153-ieee1275-ofdisk-retry-on-open-failure.patch
diff --git a/SOURCES/0154-efinet-Add-DHCP-proxy-support.patch b/0154-efinet-Add-DHCP-proxy-support.patch
similarity index 100%
rename from SOURCES/0154-efinet-Add-DHCP-proxy-support.patch
rename to 0154-efinet-Add-DHCP-proxy-support.patch
diff --git a/SOURCES/0155-Don-t-update-the-cmdline-when-generating-legacy-menu.patch b/0155-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
similarity index 100%
rename from SOURCES/0155-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
rename to 0155-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
diff --git a/SOURCES/0156-Suppress-gettext-error-message.patch b/0156-Suppress-gettext-error-message.patch
similarity index 100%
rename from SOURCES/0156-Suppress-gettext-error-message.patch
rename to 0156-Suppress-gettext-error-message.patch
diff --git a/SOURCES/0157-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch b/0157-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
similarity index 100%
rename from SOURCES/0157-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
rename to 0157-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch
diff --git a/SOURCES/0158-normal-main-Discover-the-device-to-read-the-config-f.patch b/0158-normal-main-Discover-the-device-to-read-the-config-f.patch
similarity index 100%
rename from SOURCES/0158-normal-main-Discover-the-device-to-read-the-config-f.patch
rename to 0158-normal-main-Discover-the-device-to-read-the-config-f.patch
diff --git a/SOURCES/0159-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch b/0159-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
similarity index 100%
rename from SOURCES/0159-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
rename to 0159-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
diff --git a/SOURCES/0160-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch b/0160-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
similarity index 100%
rename from SOURCES/0160-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
rename to 0160-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch
diff --git a/SOURCES/0161-Add-Fedora-location-of-DejaVu-SANS-font.patch b/0161-Add-Fedora-location-of-DejaVu-SANS-font.patch
similarity index 100%
rename from SOURCES/0161-Add-Fedora-location-of-DejaVu-SANS-font.patch
rename to 0161-Add-Fedora-location-of-DejaVu-SANS-font.patch
diff --git a/SOURCES/0162-efi-new-connectefi-command.patch b/0162-efi-new-connectefi-command.patch
similarity index 100%
rename from SOURCES/0162-efi-new-connectefi-command.patch
rename to 0162-efi-new-connectefi-command.patch
diff --git a/SOURCES/0163-powerpc-prefix-detection-support-device-names-with-c.patch b/0163-powerpc-prefix-detection-support-device-names-with-c.patch
similarity index 100%
rename from SOURCES/0163-powerpc-prefix-detection-support-device-names-with-c.patch
rename to 0163-powerpc-prefix-detection-support-device-names-with-c.patch
diff --git a/SOURCES/0164-make-ofdisk_retries-optional.patch b/0164-make-ofdisk_retries-optional.patch
similarity index 100%
rename from SOURCES/0164-make-ofdisk_retries-optional.patch
rename to 0164-make-ofdisk_retries-optional.patch
diff --git a/SOURCES/0165-misc-Make-grub_min-and-grub_max-more-resilient.patch b/0165-misc-Make-grub_min-and-grub_max-more-resilient.patch
similarity index 100%
rename from SOURCES/0165-misc-Make-grub_min-and-grub_max-more-resilient.patch
rename to 0165-misc-Make-grub_min-and-grub_max-more-resilient.patch
diff --git a/SOURCES/0166-ReiserFS-switch-to-using-grub_min-grub_max.patch b/0166-ReiserFS-switch-to-using-grub_min-grub_max.patch
similarity index 100%
rename from SOURCES/0166-ReiserFS-switch-to-using-grub_min-grub_max.patch
rename to 0166-ReiserFS-switch-to-using-grub_min-grub_max.patch
diff --git a/SOURCES/0167-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch b/0167-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch
similarity index 100%
rename from SOURCES/0167-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch
rename to 0167-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch
diff --git a/SOURCES/0168-modules-make-.module_license-read-only.patch b/0168-modules-make-.module_license-read-only.patch
similarity index 100%
rename from SOURCES/0168-modules-make-.module_license-read-only.patch
rename to 0168-modules-make-.module_license-read-only.patch
diff --git a/SOURCES/0169-modules-strip-.llvm_addrsig-sections-and-similar.patch b/0169-modules-strip-.llvm_addrsig-sections-and-similar.patch
similarity index 100%
rename from SOURCES/0169-modules-strip-.llvm_addrsig-sections-and-similar.patch
rename to 0169-modules-strip-.llvm_addrsig-sections-and-similar.patch
diff --git a/SOURCES/0170-modules-Don-t-allocate-space-for-non-allocable-secti.patch b/0170-modules-Don-t-allocate-space-for-non-allocable-secti.patch
similarity index 100%
rename from SOURCES/0170-modules-Don-t-allocate-space-for-non-allocable-secti.patch
rename to 0170-modules-Don-t-allocate-space-for-non-allocable-secti.patch
diff --git a/SOURCES/0171-modules-load-module-sections-at-page-aligned-address.patch b/0171-modules-load-module-sections-at-page-aligned-address.patch
similarity index 100%
rename from SOURCES/0171-modules-load-module-sections-at-page-aligned-address.patch
rename to 0171-modules-load-module-sections-at-page-aligned-address.patch
diff --git a/SOURCES/0172-nx-add-memory-attribute-get-set-API.patch b/0172-nx-add-memory-attribute-get-set-API.patch
similarity index 100%
rename from SOURCES/0172-nx-add-memory-attribute-get-set-API.patch
rename to 0172-nx-add-memory-attribute-get-set-API.patch
diff --git a/SOURCES/0173-nx-set-page-permissions-for-loaded-modules.patch b/0173-nx-set-page-permissions-for-loaded-modules.patch
similarity index 100%
rename from SOURCES/0173-nx-set-page-permissions-for-loaded-modules.patch
rename to 0173-nx-set-page-permissions-for-loaded-modules.patch
diff --git a/SOURCES/0174-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch b/0174-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch
similarity index 100%
rename from SOURCES/0174-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch
rename to 0174-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch
diff --git a/SOURCES/0175-grub_fs_probe-dprint-errors-from-filesystems.patch b/0175-grub_fs_probe-dprint-errors-from-filesystems.patch
similarity index 100%
rename from SOURCES/0175-grub_fs_probe-dprint-errors-from-filesystems.patch
rename to 0175-grub_fs_probe-dprint-errors-from-filesystems.patch
diff --git a/SOURCES/0176-Make-debug-file-show-which-file-filters-get-run.patch b/0176-Make-debug-file-show-which-file-filters-get-run.patch
similarity index 100%
rename from SOURCES/0176-Make-debug-file-show-which-file-filters-get-run.patch
rename to 0176-Make-debug-file-show-which-file-filters-get-run.patch
diff --git a/SOURCES/0177-BLS-create-etc-kernel-cmdline-during-mkconfig.patch b/0177-BLS-create-etc-kernel-cmdline-during-mkconfig.patch
similarity index 100%
rename from SOURCES/0177-BLS-create-etc-kernel-cmdline-during-mkconfig.patch
rename to 0177-BLS-create-etc-kernel-cmdline-during-mkconfig.patch
diff --git a/SOURCES/0178-squish-don-t-dup-rhgb-quiet-check-mtimes.patch b/0178-squish-don-t-dup-rhgb-quiet-check-mtimes.patch
similarity index 100%
rename from SOURCES/0178-squish-don-t-dup-rhgb-quiet-check-mtimes.patch
rename to 0178-squish-don-t-dup-rhgb-quiet-check-mtimes.patch
diff --git a/SOURCES/0179-squish-give-up-on-rhgb-quiet.patch b/0179-squish-give-up-on-rhgb-quiet.patch
similarity index 100%
rename from SOURCES/0179-squish-give-up-on-rhgb-quiet.patch
rename to 0179-squish-give-up-on-rhgb-quiet.patch
diff --git a/SOURCES/0180-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch b/0180-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch
similarity index 100%
rename from SOURCES/0180-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch
rename to 0180-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch
diff --git a/SOURCES/0181-blscfg-Don-t-root-device-in-emu-builds.patch b/0181-blscfg-Don-t-root-device-in-emu-builds.patch
similarity index 100%
rename from SOURCES/0181-blscfg-Don-t-root-device-in-emu-builds.patch
rename to 0181-blscfg-Don-t-root-device-in-emu-builds.patch
diff --git a/SOURCES/0182-ppc64le-signed-boot-media-changes.patch b/0182-ppc64le-signed-boot-media-changes.patch
similarity index 100%
rename from SOURCES/0182-ppc64le-signed-boot-media-changes.patch
rename to 0182-ppc64le-signed-boot-media-changes.patch
diff --git a/SOURCES/0183-core-Fix-several-implicit-function-declarations.patch b/0183-core-Fix-several-implicit-function-declarations.patch
similarity index 100%
rename from SOURCES/0183-core-Fix-several-implicit-function-declarations.patch
rename to 0183-core-Fix-several-implicit-function-declarations.patch
diff --git a/SOURCES/0184-ieee1275-request-memory-with-ibm-client-architecture.patch b/0184-ieee1275-request-memory-with-ibm-client-architecture.patch
similarity index 100%
rename from SOURCES/0184-ieee1275-request-memory-with-ibm-client-architecture.patch
rename to 0184-ieee1275-request-memory-with-ibm-client-architecture.patch
diff --git a/SOURCES/0185-hostdisk-work-around-proc-not-reporting-size.patch b/0185-hostdisk-work-around-proc-not-reporting-size.patch
similarity index 100%
rename from SOURCES/0185-hostdisk-work-around-proc-not-reporting-size.patch
rename to 0185-hostdisk-work-around-proc-not-reporting-size.patch
diff --git a/SOURCES/0186-blscfg-check-for-mounted-boot-in-emu.patch b/0186-blscfg-check-for-mounted-boot-in-emu.patch
similarity index 100%
rename from SOURCES/0186-blscfg-check-for-mounted-boot-in-emu.patch
rename to 0186-blscfg-check-for-mounted-boot-in-emu.patch
diff --git a/SOURCES/0187-grub_dl_set_mem_attrs-fix-format-string.patch b/0187-grub_dl_set_mem_attrs-fix-format-string.patch
similarity index 100%
rename from SOURCES/0187-grub_dl_set_mem_attrs-fix-format-string.patch
rename to 0187-grub_dl_set_mem_attrs-fix-format-string.patch
diff --git a/SOURCES/0188-grub_dl_set_mem_attrs-add-self-check-for-the-tramp-G.patch b/0188-grub_dl_set_mem_attrs-add-self-check-for-the-tramp-G.patch
similarity index 100%
rename from SOURCES/0188-grub_dl_set_mem_attrs-add-self-check-for-the-tramp-G.patch
rename to 0188-grub_dl_set_mem_attrs-add-self-check-for-the-tramp-G.patch
diff --git a/SOURCES/0189-grub_dl_load_segments-page-align-the-tramp-GOT-areas.patch b/0189-grub_dl_load_segments-page-align-the-tramp-GOT-areas.patch
similarity index 100%
rename from SOURCES/0189-grub_dl_load_segments-page-align-the-tramp-GOT-areas.patch
rename to 0189-grub_dl_load_segments-page-align-the-tramp-GOT-areas.patch
diff --git a/SOURCES/0190-emu-Add-switch-root-to-grub-emu.patch b/0190-emu-Add-switch-root-to-grub-emu.patch
similarity index 100%
rename from SOURCES/0190-emu-Add-switch-root-to-grub-emu.patch
rename to 0190-emu-Add-switch-root-to-grub-emu.patch
diff --git a/SOURCES/0191-util-Enable-default-kernel-for-updates.patch b/0191-util-Enable-default-kernel-for-updates.patch
similarity index 100%
rename from SOURCES/0191-util-Enable-default-kernel-for-updates.patch
rename to 0191-util-Enable-default-kernel-for-updates.patch
diff --git a/SOURCES/0192-efi-http-change-uint32_t-to-uintn_t.patch b/0192-efi-http-change-uint32_t-to-uintn_t.patch
similarity index 100%
rename from SOURCES/0192-efi-http-change-uint32_t-to-uintn_t.patch
rename to 0192-efi-http-change-uint32_t-to-uintn_t.patch
diff --git a/SOURCES/0193-Add-Install-section-to-aux-systemd-units.patch b/0193-Add-Install-section-to-aux-systemd-units.patch
similarity index 100%
rename from SOURCES/0193-Add-Install-section-to-aux-systemd-units.patch
rename to 0193-Add-Install-section-to-aux-systemd-units.patch
diff --git a/SOURCES/0194-Fix-missing-include-in-ofdisk.c.patch b/0194-Fix-missing-include-in-ofdisk.c.patch
similarity index 100%
rename from SOURCES/0194-Fix-missing-include-in-ofdisk.c.patch
rename to 0194-Fix-missing-include-in-ofdisk.c.patch
diff --git a/SOURCES/0195-add-flag-to-only-search-root-dev.patch b/0195-add-flag-to-only-search-root-dev.patch
similarity index 100%
rename from SOURCES/0195-add-flag-to-only-search-root-dev.patch
rename to 0195-add-flag-to-only-search-root-dev.patch
diff --git a/SOURCES/0196-cryptdisk-fix-incorrect-sign-comparison.patch b/0196-cryptdisk-fix-incorrect-sign-comparison.patch
similarity index 100%
rename from SOURCES/0196-cryptdisk-fix-incorrect-sign-comparison.patch
rename to 0196-cryptdisk-fix-incorrect-sign-comparison.patch
diff --git a/SOURCES/0197-grub-install-fix-a-sign-comparison-error.patch b/0197-grub-install-fix-a-sign-comparison-error.patch
similarity index 100%
rename from SOURCES/0197-grub-install-fix-a-sign-comparison-error.patch
rename to 0197-grub-install-fix-a-sign-comparison-error.patch
diff --git a/SOURCES/0198-grub-mount-work-around-bad-integer-comparison.patch b/0198-grub-mount-work-around-bad-integer-comparison.patch
similarity index 100%
rename from SOURCES/0198-grub-mount-work-around-bad-integer-comparison.patch
rename to 0198-grub-mount-work-around-bad-integer-comparison.patch
diff --git a/SOURCES/0199-power-Fix-use-after-free-in-get_slave_from_dm.patch b/0199-power-Fix-use-after-free-in-get_slave_from_dm.patch
similarity index 100%
rename from SOURCES/0199-power-Fix-use-after-free-in-get_slave_from_dm.patch
rename to 0199-power-Fix-use-after-free-in-get_slave_from_dm.patch
diff --git a/SOURCES/0200-Fix-some-sign-comparison-errors.patch b/0200-Fix-some-sign-comparison-errors.patch
similarity index 100%
rename from SOURCES/0200-Fix-some-sign-comparison-errors.patch
rename to 0200-Fix-some-sign-comparison-errors.patch
diff --git a/SOURCES/0201-normal-Fix-a-discarded-const.patch b/0201-normal-Fix-a-discarded-const.patch
similarity index 100%
rename from SOURCES/0201-normal-Fix-a-discarded-const.patch
rename to 0201-normal-Fix-a-discarded-const.patch
diff --git a/SOURCES/0202-at_keyboard-mark-grub_keyboard_controller_write-unus.patch b/0202-at_keyboard-mark-grub_keyboard_controller_write-unus.patch
similarity index 100%
rename from SOURCES/0202-at_keyboard-mark-grub_keyboard_controller_write-unus.patch
rename to 0202-at_keyboard-mark-grub_keyboard_controller_write-unus.patch
diff --git a/SOURCES/0203-Fix-another-minor-sign-comparison-error.patch b/0203-Fix-another-minor-sign-comparison-error.patch
similarity index 100%
rename from SOURCES/0203-Fix-another-minor-sign-comparison-error.patch
rename to 0203-Fix-another-minor-sign-comparison-error.patch
diff --git a/SOURCES/0204-Track-explicit-module-dependencies-in-Makefile.core..patch b/0204-Track-explicit-module-dependencies-in-Makefile.core..patch
similarity index 100%
rename from SOURCES/0204-Track-explicit-module-dependencies-in-Makefile.core..patch
rename to 0204-Track-explicit-module-dependencies-in-Makefile.core..patch
diff --git a/SOURCES/0205-Revert-mm-Assert-that-we-preserve-header-vs-region-a.patch b/0205-Revert-mm-Assert-that-we-preserve-header-vs-region-a.patch
similarity index 100%
rename from SOURCES/0205-Revert-mm-Assert-that-we-preserve-header-vs-region-a.patch
rename to 0205-Revert-mm-Assert-that-we-preserve-header-vs-region-a.patch
diff --git a/SOURCES/0206-make-use-the-_CPU-variety-of-build-flags-for-PROGRAM.patch b/0206-make-use-the-_CPU-variety-of-build-flags-for-PROGRAM.patch
similarity index 100%
rename from SOURCES/0206-make-use-the-_CPU-variety-of-build-flags-for-PROGRAM.patch
rename to 0206-make-use-the-_CPU-variety-of-build-flags-for-PROGRAM.patch
diff --git a/SOURCES/0207-Work-around-extra_deps.lst-issue.patch b/0207-Work-around-extra_deps.lst-issue.patch
similarity index 100%
rename from SOURCES/0207-Work-around-extra_deps.lst-issue.patch
rename to 0207-Work-around-extra_deps.lst-issue.patch
diff --git a/SOURCES/0208-include-proper-attribute-for-an-EFI-API-call-definit.patch b/0208-include-proper-attribute-for-an-EFI-API-call-definit.patch
similarity index 100%
rename from SOURCES/0208-include-proper-attribute-for-an-EFI-API-call-definit.patch
rename to 0208-include-proper-attribute-for-an-EFI-API-call-definit.patch
diff --git a/SOURCES/0209-cast-grub_error-status-parameter.patch b/0209-cast-grub_error-status-parameter.patch
similarity index 100%
rename from SOURCES/0209-cast-grub_error-status-parameter.patch
rename to 0209-cast-grub_error-status-parameter.patch
diff --git a/SOURCES/0210-remove-unused-varible.patch b/0210-remove-unused-varible.patch
similarity index 100%
rename from SOURCES/0210-remove-unused-varible.patch
rename to 0210-remove-unused-varible.patch
diff --git a/SOURCES/0211-cast-grub_net_bootp_packet-pointer.patch b/0211-cast-grub_net_bootp_packet-pointer.patch
similarity index 100%
rename from SOURCES/0211-cast-grub_net_bootp_packet-pointer.patch
rename to 0211-cast-grub_net_bootp_packet-pointer.patch
diff --git a/SOURCES/0212-libtasn1-fix-string-overflow-warning.patch b/0212-libtasn1-fix-string-overflow-warning.patch
similarity index 100%
rename from SOURCES/0212-libtasn1-fix-string-overflow-warning.patch
rename to 0212-libtasn1-fix-string-overflow-warning.patch
diff --git a/SOURCES/0213-Add-support-for-Linux-EFI-stub-loading.patch b/0213-Add-support-for-Linux-EFI-stub-loading.patch
similarity index 100%
rename from SOURCES/0213-Add-support-for-Linux-EFI-stub-loading.patch
rename to 0213-Add-support-for-Linux-EFI-stub-loading.patch
diff --git a/SOURCES/0214-fix-i386_pc-on-legacycfg-module.patch b/0214-fix-i386_pc-on-legacycfg-module.patch
similarity index 100%
rename from SOURCES/0214-fix-i386_pc-on-legacycfg-module.patch
rename to 0214-fix-i386_pc-on-legacycfg-module.patch
diff --git a/SOURCES/0215-Add-secureboot-support-on-efi-chainloader.patch b/0215-Add-secureboot-support-on-efi-chainloader.patch
similarity index 100%
rename from SOURCES/0215-Add-secureboot-support-on-efi-chainloader.patch
rename to 0215-Add-secureboot-support-on-efi-chainloader.patch
diff --git a/SOURCES/0216-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0216-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
similarity index 100%
rename from SOURCES/0216-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
rename to 0216-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
diff --git a/SOURCES/0217-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0217-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
similarity index 100%
rename from SOURCES/0217-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
rename to 0217-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
diff --git a/SOURCES/0218-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch b/0218-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
similarity index 100%
rename from SOURCES/0218-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
rename to 0218-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
diff --git a/SOURCES/0219-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/0219-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
similarity index 100%
rename from SOURCES/0219-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
rename to 0219-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
diff --git a/SOURCES/0220-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/0220-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
similarity index 100%
rename from SOURCES/0220-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
rename to 0220-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
diff --git a/SOURCES/0221-Try-to-pick-better-locations-for-kernel-and-initrd.patch b/0221-Try-to-pick-better-locations-for-kernel-and-initrd.patch
similarity index 100%
rename from SOURCES/0221-Try-to-pick-better-locations-for-kernel-and-initrd.patch
rename to 0221-Try-to-pick-better-locations-for-kernel-and-initrd.patch
diff --git a/SOURCES/0222-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch b/0222-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
similarity index 100%
rename from SOURCES/0222-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
rename to 0222-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
diff --git a/SOURCES/0223-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch b/0223-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
similarity index 100%
rename from SOURCES/0223-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
rename to 0223-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
diff --git a/SOURCES/0224-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch b/0224-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
similarity index 100%
rename from SOURCES/0224-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
rename to 0224-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
diff --git a/SOURCES/0225-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch b/0225-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
similarity index 100%
rename from SOURCES/0225-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
rename to 0225-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
diff --git a/SOURCES/0226-efi-Set-image-base-address-before-jumping-to-the-PE-.patch b/0226-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
similarity index 100%
rename from SOURCES/0226-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
rename to 0226-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
diff --git a/SOURCES/0227-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch b/0227-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
similarity index 100%
rename from SOURCES/0227-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
rename to 0227-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
diff --git a/SOURCES/0228-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch b/0228-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
similarity index 100%
rename from SOURCES/0228-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
rename to 0228-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
diff --git a/SOURCES/0229-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/0229-linuxefi-fail-kernel-validation-without-shim-protoco.patch
similarity index 100%
rename from SOURCES/0229-linuxefi-fail-kernel-validation-without-shim-protoco.patch
rename to 0229-linuxefi-fail-kernel-validation-without-shim-protoco.patch
diff --git a/SOURCES/0230-Allow-chainloading-EFI-apps-from-loop-mounts.patch b/0230-Allow-chainloading-EFI-apps-from-loop-mounts.patch
similarity index 100%
rename from SOURCES/0230-Allow-chainloading-EFI-apps-from-loop-mounts.patch
rename to 0230-Allow-chainloading-EFI-apps-from-loop-mounts.patch
diff --git a/SOURCES/0231-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch b/0231-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
similarity index 100%
rename from SOURCES/0231-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
rename to 0231-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch
diff --git a/SOURCES/0232-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch b/0232-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
similarity index 100%
rename from SOURCES/0232-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
rename to 0232-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch
diff --git a/SOURCES/0233-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch b/0233-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
similarity index 100%
rename from SOURCES/0233-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
rename to 0233-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch
diff --git a/SOURCES/0234-loader-efi-chainloader-grub_load_and_start_image-doe.patch b/0234-loader-efi-chainloader-grub_load_and_start_image-doe.patch
similarity index 100%
rename from SOURCES/0234-loader-efi-chainloader-grub_load_and_start_image-doe.patch
rename to 0234-loader-efi-chainloader-grub_load_and_start_image-doe.patch
diff --git a/SOURCES/0235-loader-efi-chainloader-simplify-the-loader-state.patch b/0235-loader-efi-chainloader-simplify-the-loader-state.patch
similarity index 100%
rename from SOURCES/0235-loader-efi-chainloader-simplify-the-loader-state.patch
rename to 0235-loader-efi-chainloader-simplify-the-loader-state.patch
diff --git a/SOURCES/0236-loader-efi-chainloader-Use-grub_loader_set_ex.patch b/0236-loader-efi-chainloader-Use-grub_loader_set_ex.patch
similarity index 100%
rename from SOURCES/0236-loader-efi-chainloader-Use-grub_loader_set_ex.patch
rename to 0236-loader-efi-chainloader-Use-grub_loader_set_ex.patch
diff --git a/SOURCES/0237-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch b/0237-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch
similarity index 100%
rename from SOURCES/0237-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch
rename to 0237-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch
diff --git a/SOURCES/0238-loader-i386-efi-linux-Use-grub_loader_set_ex.patch b/0238-loader-i386-efi-linux-Use-grub_loader_set_ex.patch
similarity index 100%
rename from SOURCES/0238-loader-i386-efi-linux-Use-grub_loader_set_ex.patch
rename to 0238-loader-i386-efi-linux-Use-grub_loader_set_ex.patch
diff --git a/SOURCES/0239-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch b/0239-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch
similarity index 100%
rename from SOURCES/0239-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch
rename to 0239-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch
diff --git a/SOURCES/0240-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch b/0240-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch
similarity index 100%
rename from SOURCES/0240-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch
rename to 0240-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch
diff --git a/SOURCES/0241-efi-use-enumerated-array-positions-for-our-allocatio.patch b/0241-efi-use-enumerated-array-positions-for-our-allocatio.patch
similarity index 100%
rename from SOURCES/0241-efi-use-enumerated-array-positions-for-our-allocatio.patch
rename to 0241-efi-use-enumerated-array-positions-for-our-allocatio.patch
diff --git a/SOURCES/0242-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch b/0242-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch
similarity index 100%
rename from SOURCES/0242-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch
rename to 0242-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch
diff --git a/SOURCES/0243-efi-allocate-the-initrd-within-the-bounds-expressed-.patch b/0243-efi-allocate-the-initrd-within-the-bounds-expressed-.patch
similarity index 100%
rename from SOURCES/0243-efi-allocate-the-initrd-within-the-bounds-expressed-.patch
rename to 0243-efi-allocate-the-initrd-within-the-bounds-expressed-.patch
diff --git a/SOURCES/0244-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch b/0244-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch
similarity index 100%
rename from SOURCES/0244-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch
rename to 0244-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch
diff --git a/SOURCES/0245-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch b/0245-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch
similarity index 100%
rename from SOURCES/0245-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch
rename to 0245-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch
diff --git a/SOURCES/0246-grub-install-on-EFI-if-forced.patch b/0246-grub-install-on-EFI-if-forced.patch
similarity index 100%
rename from SOURCES/0246-grub-install-on-EFI-if-forced.patch
rename to 0246-grub-install-on-EFI-if-forced.patch
diff --git a/SOURCES/0247-Remove-Install-section-from-aux-systemd-units.patch b/0247-Remove-Install-section-from-aux-systemd-units.patch
similarity index 100%
rename from SOURCES/0247-Remove-Install-section-from-aux-systemd-units.patch
rename to 0247-Remove-Install-section-from-aux-systemd-units.patch
diff --git a/SOURCES/0248-chainloader-remove-device-path-debug-message.patch b/0248-chainloader-remove-device-path-debug-message.patch
similarity index 100%
rename from SOURCES/0248-chainloader-remove-device-path-debug-message.patch
rename to 0248-chainloader-remove-device-path-debug-message.patch
diff --git a/SOURCES/0249-grub-set-bootflag-Conservative-partial-fix-for-CVE-2.patch b/0249-grub-set-bootflag-Conservative-partial-fix-for-CVE-2.patch
similarity index 100%
rename from SOURCES/0249-grub-set-bootflag-Conservative-partial-fix-for-CVE-2.patch
rename to 0249-grub-set-bootflag-Conservative-partial-fix-for-CVE-2.patch
diff --git a/SOURCES/0250-grub-set-bootflag-More-complete-fix-for-CVE-2024-104.patch b/0250-grub-set-bootflag-More-complete-fix-for-CVE-2024-104.patch
similarity index 100%
rename from SOURCES/0250-grub-set-bootflag-More-complete-fix-for-CVE-2024-104.patch
rename to 0250-grub-set-bootflag-More-complete-fix-for-CVE-2024-104.patch
diff --git a/SOURCES/0251-grub-set-bootflag-Exit-calmly-when-not-running-as-ro.patch b/0251-grub-set-bootflag-Exit-calmly-when-not-running-as-ro.patch
similarity index 100%
rename from SOURCES/0251-grub-set-bootflag-Exit-calmly-when-not-running-as-ro.patch
rename to 0251-grub-set-bootflag-Exit-calmly-when-not-running-as-ro.patch
diff --git a/SOURCES/0252-Makefile.core.def-fix-linux-module.patch b/0252-Makefile.core.def-fix-linux-module.patch
similarity index 100%
rename from SOURCES/0252-Makefile.core.def-fix-linux-module.patch
rename to 0252-Makefile.core.def-fix-linux-module.patch
diff --git a/SOURCES/0253-Add-support-for-Linux-EFI-stub-loading-on-arm-archit.patch b/0253-Add-support-for-Linux-EFI-stub-loading-on-arm-archit.patch
similarity index 100%
rename from SOURCES/0253-Add-support-for-Linux-EFI-stub-loading-on-arm-archit.patch
rename to 0253-Add-support-for-Linux-EFI-stub-loading-on-arm-archit.patch
diff --git a/SOURCES/0254-arm-arm64-loader-Better-memory-allocation-and-error-.patch b/0254-arm-arm64-loader-Better-memory-allocation-and-error-.patch
similarity index 100%
rename from SOURCES/0254-arm-arm64-loader-Better-memory-allocation-and-error-.patch
rename to 0254-arm-arm64-loader-Better-memory-allocation-and-error-.patch
diff --git a/SOURCES/0255-arm64-Fix-EFI-loader-kernel-image-allocation.patch b/0255-arm64-Fix-EFI-loader-kernel-image-allocation.patch
similarity index 100%
rename from SOURCES/0255-arm64-Fix-EFI-loader-kernel-image-allocation.patch
rename to 0255-arm64-Fix-EFI-loader-kernel-image-allocation.patch
diff --git a/SOURCES/0256-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch b/0256-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch
similarity index 100%
rename from SOURCES/0256-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch
rename to 0256-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch
diff --git a/SOURCES/0257-Correct-BSS-zeroing-on-aarch64.patch b/0257-Correct-BSS-zeroing-on-aarch64.patch
similarity index 100%
rename from SOURCES/0257-Correct-BSS-zeroing-on-aarch64.patch
rename to 0257-Correct-BSS-zeroing-on-aarch64.patch
diff --git a/SOURCES/0258-arm64-Use-proper-memory-type-for-kernel-allocation.patch b/0258-arm64-Use-proper-memory-type-for-kernel-allocation.patch
similarity index 100%
rename from SOURCES/0258-arm64-Use-proper-memory-type-for-kernel-allocation.patch
rename to 0258-arm64-Use-proper-memory-type-for-kernel-allocation.patch
diff --git a/SOURCES/0259-normal-Remove-grub_env_set-prefix-in-grub_try_normal.patch b/0259-normal-Remove-grub_env_set-prefix-in-grub_try_normal.patch
similarity index 100%
rename from SOURCES/0259-normal-Remove-grub_env_set-prefix-in-grub_try_normal.patch
rename to 0259-normal-Remove-grub_env_set-prefix-in-grub_try_normal.patch
diff --git a/SOURCES/0260-fs-xfs-Handle-non-continuous-data-blocks-in-director.patch b/0260-fs-xfs-Handle-non-continuous-data-blocks-in-director.patch
similarity index 100%
rename from SOURCES/0260-fs-xfs-Handle-non-continuous-data-blocks-in-director.patch
rename to 0260-fs-xfs-Handle-non-continuous-data-blocks-in-director.patch
diff --git a/SOURCES/0261-Ignore-warnings-for-incompatible-types.patch b/0261-Ignore-warnings-for-incompatible-types.patch
similarity index 100%
rename from SOURCES/0261-Ignore-warnings-for-incompatible-types.patch
rename to 0261-Ignore-warnings-for-incompatible-types.patch
diff --git a/SOURCES/0262-cmd-search-Rework-of-CVE-2023-4001-fix.patch b/0262-cmd-search-Rework-of-CVE-2023-4001-fix.patch
similarity index 100%
rename from SOURCES/0262-cmd-search-Rework-of-CVE-2023-4001-fix.patch
rename to 0262-cmd-search-Rework-of-CVE-2023-4001-fix.patch
diff --git a/SOURCES/0263-loader-efi-linux.c-read-the-kernel-image-before-head.patch b/0263-loader-efi-linux.c-read-the-kernel-image-before-head.patch
similarity index 100%
rename from SOURCES/0263-loader-efi-linux.c-read-the-kernel-image-before-head.patch
rename to 0263-loader-efi-linux.c-read-the-kernel-image-before-head.patch
diff --git a/SOURCES/0264-nx-set-attrs-in-our-kernel-loaders.patch b/0264-nx-set-attrs-in-our-kernel-loaders.patch
similarity index 100%
rename from SOURCES/0264-nx-set-attrs-in-our-kernel-loaders.patch
rename to 0264-nx-set-attrs-in-our-kernel-loaders.patch
diff --git a/SOURCES/0265-efi-Provide-wrappers-for-load_image-start_image.patch b/0265-efi-Provide-wrappers-for-load_image-start_image.patch
similarity index 100%
rename from SOURCES/0265-efi-Provide-wrappers-for-load_image-start_image.patch
rename to 0265-efi-Provide-wrappers-for-load_image-start_image.patch
diff --git a/SOURCES/0266-efi-Disallow-fallback-to-legacy-Linux-loader-when-sh.patch b/0266-efi-Disallow-fallback-to-legacy-Linux-loader-when-sh.patch
similarity index 100%
rename from SOURCES/0266-efi-Disallow-fallback-to-legacy-Linux-loader-when-sh.patch
rename to 0266-efi-Disallow-fallback-to-legacy-Linux-loader-when-sh.patch
diff --git a/SOURCES/0267-Set-non-executable-stack-sections-on-EFI-assembly-fi.patch b/0267-Set-non-executable-stack-sections-on-EFI-assembly-fi.patch
similarity index 100%
rename from SOURCES/0267-Set-non-executable-stack-sections-on-EFI-assembly-fi.patch
rename to 0267-Set-non-executable-stack-sections-on-EFI-assembly-fi.patch
diff --git a/SOURCES/0268-grub-mkconfig.in-turn-off-executable-owner-bit.patch b/0268-grub-mkconfig.in-turn-off-executable-owner-bit.patch
similarity index 100%
rename from SOURCES/0268-grub-mkconfig.in-turn-off-executable-owner-bit.patch
rename to 0268-grub-mkconfig.in-turn-off-executable-owner-bit.patch
diff --git a/SOURCES/0269-kern-ieee1275-init-Add-IEEE-1275-Radix-support-for-K.patch b/0269-kern-ieee1275-init-Add-IEEE-1275-Radix-support-for-K.patch
similarity index 100%
rename from SOURCES/0269-kern-ieee1275-init-Add-IEEE-1275-Radix-support-for-K.patch
rename to 0269-kern-ieee1275-init-Add-IEEE-1275-Radix-support-for-K.patch
diff --git a/SOURCES/0270-grub2-mkconfig-Ensure-grub-cfg-stub-is-not-overwritt.patch b/0270-grub2-mkconfig-Ensure-grub-cfg-stub-is-not-overwritt.patch
similarity index 100%
rename from SOURCES/0270-grub2-mkconfig-Ensure-grub-cfg-stub-is-not-overwritt.patch
rename to 0270-grub2-mkconfig-Ensure-grub-cfg-stub-is-not-overwritt.patch
diff --git a/SOURCES/0271-grub2-mkconfig-Simplify-os_name-detection.patch b/0271-grub2-mkconfig-Simplify-os_name-detection.patch
similarity index 100%
rename from SOURCES/0271-grub2-mkconfig-Simplify-os_name-detection.patch
rename to 0271-grub2-mkconfig-Simplify-os_name-detection.patch
diff --git a/SOURCES/0272-grub-mkconfig-Remove-check-for-mount-point-for-grub-.patch b/0272-grub-mkconfig-Remove-check-for-mount-point-for-grub-.patch
similarity index 100%
rename from SOURCES/0272-grub-mkconfig-Remove-check-for-mount-point-for-grub-.patch
rename to 0272-grub-mkconfig-Remove-check-for-mount-point-for-grub-.patch
diff --git a/SOURCES/0273-efi-api.h-include-missing-__grub_efi_api-macros-on-E.patch b/0273-efi-api.h-include-missing-__grub_efi_api-macros-on-E.patch
similarity index 100%
rename from SOURCES/0273-efi-api.h-include-missing-__grub_efi_api-macros-on-E.patch
rename to 0273-efi-api.h-include-missing-__grub_efi_api-macros-on-E.patch
diff --git a/SOURCES/0274-grub-core-net-arp.c-fix-variable-name.patch b/0274-grub-core-net-arp.c-fix-variable-name.patch
similarity index 100%
rename from SOURCES/0274-grub-core-net-arp.c-fix-variable-name.patch
rename to 0274-grub-core-net-arp.c-fix-variable-name.patch
diff --git a/SOURCES/0275-load-EFI-commands-inside-test-expressions.patch b/0275-load-EFI-commands-inside-test-expressions.patch
similarity index 100%
rename from SOURCES/0275-load-EFI-commands-inside-test-expressions.patch
rename to 0275-load-EFI-commands-inside-test-expressions.patch
diff --git a/SOURCES/0276-efi-loader-Check-if-NX-is-required-in-grub_efi_linux.patch b/0276-efi-loader-Check-if-NX-is-required-in-grub_efi_linux.patch
similarity index 100%
rename from SOURCES/0276-efi-loader-Check-if-NX-is-required-in-grub_efi_linux.patch
rename to 0276-efi-loader-Check-if-NX-is-required-in-grub_efi_linux.patch
diff --git a/SOURCES/0277-Stop-grub.efi-from-always-printing-dynamic_load_symb.patch b/0277-Stop-grub.efi-from-always-printing-dynamic_load_symb.patch
similarity index 100%
rename from SOURCES/0277-Stop-grub.efi-from-always-printing-dynamic_load_symb.patch
rename to 0277-Stop-grub.efi-from-always-printing-dynamic_load_symb.patch
diff --git a/SOURCES/0278-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch b/0278-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch
similarity index 100%
rename from SOURCES/0278-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch
rename to 0278-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch
diff --git a/SOURCES/0279-grub-mkconfig-dont-overwrite-BLS-cmdline-if-BLSCFG.patch b/0279-grub-mkconfig-dont-overwrite-BLS-cmdline-if-BLSCFG.patch
similarity index 100%
rename from SOURCES/0279-grub-mkconfig-dont-overwrite-BLS-cmdline-if-BLSCFG.patch
rename to 0279-grub-mkconfig-dont-overwrite-BLS-cmdline-if-BLSCFG.patch
diff --git a/SOURCES/0280-grub2-mkconfig-Pass-all-boot-params-when-used-by-ana.patch b/0280-grub2-mkconfig-Pass-all-boot-params-when-used-by-ana.patch
similarity index 100%
rename from SOURCES/0280-grub2-mkconfig-Pass-all-boot-params-when-used-by-ana.patch
rename to 0280-grub2-mkconfig-Pass-all-boot-params-when-used-by-ana.patch
diff --git a/SOURCES/0281-10_linux.in-escape-semicolon-and-ampersand-on-BLS-up.patch b/0281-10_linux.in-escape-semicolon-and-ampersand-on-BLS-up.patch
similarity index 100%
rename from SOURCES/0281-10_linux.in-escape-semicolon-and-ampersand-on-BLS-up.patch
rename to 0281-10_linux.in-escape-semicolon-and-ampersand-on-BLS-up.patch
diff --git a/SOURCES/0282-acpi-Fix-out-of-bounds-access-in-grub_acpi_xsdt_find.patch b/0282-acpi-Fix-out-of-bounds-access-in-grub_acpi_xsdt_find.patch
similarity index 100%
rename from SOURCES/0282-acpi-Fix-out-of-bounds-access-in-grub_acpi_xsdt_find.patch
rename to 0282-acpi-Fix-out-of-bounds-access-in-grub_acpi_xsdt_find.patch
diff --git a/SOURCES/0283-fs-xfs-Fix-large-extent-counters-incompat-feature-su.patch b/0283-fs-xfs-Fix-large-extent-counters-incompat-feature-su.patch
similarity index 100%
rename from SOURCES/0283-fs-xfs-Fix-large-extent-counters-incompat-feature-su.patch
rename to 0283-fs-xfs-Fix-large-extent-counters-incompat-feature-su.patch
diff --git a/SOURCES/0284-term-ns8250-spcr-return-if-redirection-is-disabled.patch b/0284-term-ns8250-spcr-return-if-redirection-is-disabled.patch
similarity index 100%
rename from SOURCES/0284-term-ns8250-spcr-return-if-redirection-is-disabled.patch
rename to 0284-term-ns8250-spcr-return-if-redirection-is-disabled.patch
diff --git a/SOURCES/0285-commands-legacycfg-Avoid-closing-file-twice.patch b/0285-commands-legacycfg-Avoid-closing-file-twice.patch
similarity index 100%
rename from SOURCES/0285-commands-legacycfg-Avoid-closing-file-twice.patch
rename to 0285-commands-legacycfg-Avoid-closing-file-twice.patch
diff --git a/SOURCES/0286-disk-ahci.c-remove-conditional-operator-for-endtime.patch b/0286-disk-ahci.c-remove-conditional-operator-for-endtime.patch
similarity index 100%
rename from SOURCES/0286-disk-ahci.c-remove-conditional-operator-for-endtime.patch
rename to 0286-disk-ahci.c-remove-conditional-operator-for-endtime.patch
diff --git a/SOURCES/0287-misc-Implement-grub_strlcpy.patch b/0287-misc-Implement-grub_strlcpy.patch
similarity index 100%
rename from SOURCES/0287-misc-Implement-grub_strlcpy.patch
rename to 0287-misc-Implement-grub_strlcpy.patch
diff --git a/SOURCES/0288-fs-ufs-Fix-a-heap-OOB-write.patch b/0288-fs-ufs-Fix-a-heap-OOB-write.patch
similarity index 100%
rename from SOURCES/0288-fs-ufs-Fix-a-heap-OOB-write.patch
rename to 0288-fs-ufs-Fix-a-heap-OOB-write.patch
diff --git a/SOURCES/0289-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch b/0289-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch
similarity index 100%
rename from SOURCES/0289-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch
rename to 0289-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch
diff --git a/SOURCES/0290-fs-tar-Initialize-name-in-grub_cpio_find_file.patch b/0290-fs-tar-Initialize-name-in-grub_cpio_find_file.patch
similarity index 100%
rename from SOURCES/0290-fs-tar-Initialize-name-in-grub_cpio_find_file.patch
rename to 0290-fs-tar-Initialize-name-in-grub_cpio_find_file.patch
diff --git a/SOURCES/0291-fs-tar-Integer-overflow-leads-to-heap-OOB-write.patch b/0291-fs-tar-Integer-overflow-leads-to-heap-OOB-write.patch
similarity index 100%
rename from SOURCES/0291-fs-tar-Integer-overflow-leads-to-heap-OOB-write.patch
rename to 0291-fs-tar-Integer-overflow-leads-to-heap-OOB-write.patch
diff --git a/SOURCES/0292-fs-f2fs-Set-a-grub_errno-if-mount-fails.patch b/0292-fs-f2fs-Set-a-grub_errno-if-mount-fails.patch
similarity index 100%
rename from SOURCES/0292-fs-f2fs-Set-a-grub_errno-if-mount-fails.patch
rename to 0292-fs-f2fs-Set-a-grub_errno-if-mount-fails.patch
diff --git a/SOURCES/0293-fs-hfsplus-Set-a-grub_errno-if-mount-fails.patch b/0293-fs-hfsplus-Set-a-grub_errno-if-mount-fails.patch
similarity index 100%
rename from SOURCES/0293-fs-hfsplus-Set-a-grub_errno-if-mount-fails.patch
rename to 0293-fs-hfsplus-Set-a-grub_errno-if-mount-fails.patch
diff --git a/SOURCES/0294-fs-iso9660-Set-a-grub_errno-if-mount-fails.patch b/0294-fs-iso9660-Set-a-grub_errno-if-mount-fails.patch
similarity index 100%
rename from SOURCES/0294-fs-iso9660-Set-a-grub_errno-if-mount-fails.patch
rename to 0294-fs-iso9660-Set-a-grub_errno-if-mount-fails.patch
diff --git a/SOURCES/0295-fs-iso9660-Fix-invalid-free.patch b/0295-fs-iso9660-Fix-invalid-free.patch
similarity index 100%
rename from SOURCES/0295-fs-iso9660-Fix-invalid-free.patch
rename to 0295-fs-iso9660-Fix-invalid-free.patch
diff --git a/SOURCES/0296-fs-jfs-Fix-OOB-read-in-jfs_getent.patch b/0296-fs-jfs-Fix-OOB-read-in-jfs_getent.patch
similarity index 100%
rename from SOURCES/0296-fs-jfs-Fix-OOB-read-in-jfs_getent.patch
rename to 0296-fs-jfs-Fix-OOB-read-in-jfs_getent.patch
diff --git a/SOURCES/0297-fs-jfs-Fix-OOB-read-caused-by-invalid-dir-slot-index.patch b/0297-fs-jfs-Fix-OOB-read-caused-by-invalid-dir-slot-index.patch
similarity index 100%
rename from SOURCES/0297-fs-jfs-Fix-OOB-read-caused-by-invalid-dir-slot-index.patch
rename to 0297-fs-jfs-Fix-OOB-read-caused-by-invalid-dir-slot-index.patch
diff --git a/SOURCES/0298-fs-jfs-Use-full-40-bits-offset-and-address-for-a-dat.patch b/0298-fs-jfs-Use-full-40-bits-offset-and-address-for-a-dat.patch
similarity index 100%
rename from SOURCES/0298-fs-jfs-Use-full-40-bits-offset-and-address-for-a-dat.patch
rename to 0298-fs-jfs-Use-full-40-bits-offset-and-address-for-a-dat.patch
diff --git a/SOURCES/0299-fs-jfs-Inconsistent-signed-unsigned-types-usage-in-r.patch b/0299-fs-jfs-Inconsistent-signed-unsigned-types-usage-in-r.patch
similarity index 100%
rename from SOURCES/0299-fs-jfs-Inconsistent-signed-unsigned-types-usage-in-r.patch
rename to 0299-fs-jfs-Inconsistent-signed-unsigned-types-usage-in-r.patch
diff --git a/SOURCES/0300-fs-ext2-Fix-out-of-bounds-read-for-inline-extents.patch b/0300-fs-ext2-Fix-out-of-bounds-read-for-inline-extents.patch
similarity index 100%
rename from SOURCES/0300-fs-ext2-Fix-out-of-bounds-read-for-inline-extents.patch
rename to 0300-fs-ext2-Fix-out-of-bounds-read-for-inline-extents.patch
diff --git a/SOURCES/0301-fs-ntfs-Fix-out-of-bounds-read.patch b/0301-fs-ntfs-Fix-out-of-bounds-read.patch
similarity index 100%
rename from SOURCES/0301-fs-ntfs-Fix-out-of-bounds-read.patch
rename to 0301-fs-ntfs-Fix-out-of-bounds-read.patch
diff --git a/SOURCES/0302-fs-ntfs-Track-the-end-of-the-MFT-attribute-buffer.patch b/0302-fs-ntfs-Track-the-end-of-the-MFT-attribute-buffer.patch
similarity index 100%
rename from SOURCES/0302-fs-ntfs-Track-the-end-of-the-MFT-attribute-buffer.patch
rename to 0302-fs-ntfs-Track-the-end-of-the-MFT-attribute-buffer.patch
diff --git a/SOURCES/0303-fs-ntfs-Use-a-helper-function-to-access-attributes.patch b/0303-fs-ntfs-Use-a-helper-function-to-access-attributes.patch
similarity index 100%
rename from SOURCES/0303-fs-ntfs-Use-a-helper-function-to-access-attributes.patch
rename to 0303-fs-ntfs-Use-a-helper-function-to-access-attributes.patch
diff --git a/SOURCES/0305-fs-xfs-Fix-out-of-bounds-read.patch b/0305-fs-xfs-Fix-out-of-bounds-read.patch
similarity index 100%
rename from SOURCES/0305-fs-xfs-Fix-out-of-bounds-read.patch
rename to 0305-fs-xfs-Fix-out-of-bounds-read.patch
diff --git a/SOURCES/0306-fs-xfs-Ensuring-failing-to-mount-sets-a-grub_errno.patch b/0306-fs-xfs-Ensuring-failing-to-mount-sets-a-grub_errno.patch
similarity index 100%
rename from SOURCES/0306-fs-xfs-Ensuring-failing-to-mount-sets-a-grub_errno.patch
rename to 0306-fs-xfs-Ensuring-failing-to-mount-sets-a-grub_errno.patch
diff --git a/SOURCES/0307-kern-file-Ensure-file-data-is-set.patch b/0307-kern-file-Ensure-file-data-is-set.patch
similarity index 100%
rename from SOURCES/0307-kern-file-Ensure-file-data-is-set.patch
rename to 0307-kern-file-Ensure-file-data-is-set.patch
diff --git a/SOURCES/0308-kern-file-Implement-filesystem-reference-counting.patch b/0308-kern-file-Implement-filesystem-reference-counting.patch
similarity index 100%
rename from SOURCES/0308-kern-file-Implement-filesystem-reference-counting.patch
rename to 0308-kern-file-Implement-filesystem-reference-counting.patch
diff --git a/SOURCES/0309-cli_lock-Add-build-option-to-block-command-line-inte.patch b/0309-cli_lock-Add-build-option-to-block-command-line-inte.patch
similarity index 100%
rename from SOURCES/0309-cli_lock-Add-build-option-to-block-command-line-inte.patch
rename to 0309-cli_lock-Add-build-option-to-block-command-line-inte.patch
diff --git a/SOURCES/0310-disk-cryptodisk-Require-authentication-after-TPM-unl.patch b/0310-disk-cryptodisk-Require-authentication-after-TPM-unl.patch
similarity index 100%
rename from SOURCES/0310-disk-cryptodisk-Require-authentication-after-TPM-unl.patch
rename to 0310-disk-cryptodisk-Require-authentication-after-TPM-unl.patch
diff --git a/SOURCES/0311-disk-loopback-Reference-tracking-for-the-loopback.patch b/0311-disk-loopback-Reference-tracking-for-the-loopback.patch
similarity index 100%
rename from SOURCES/0311-disk-loopback-Reference-tracking-for-the-loopback.patch
rename to 0311-disk-loopback-Reference-tracking-for-the-loopback.patch
diff --git a/SOURCES/0312-kern-disk-Limit-recursion-depth.patch b/0312-kern-disk-Limit-recursion-depth.patch
similarity index 100%
rename from SOURCES/0312-kern-disk-Limit-recursion-depth.patch
rename to 0312-kern-disk-Limit-recursion-depth.patch
diff --git a/SOURCES/0313-kern-partition-Limit-recursion-in-part_iterate.patch b/0313-kern-partition-Limit-recursion-in-part_iterate.patch
similarity index 100%
rename from SOURCES/0313-kern-partition-Limit-recursion-in-part_iterate.patch
rename to 0313-kern-partition-Limit-recursion-in-part_iterate.patch
diff --git a/SOURCES/0314-script-execute-Limit-the-recursion-depth.patch b/0314-script-execute-Limit-the-recursion-depth.patch
similarity index 100%
rename from SOURCES/0314-script-execute-Limit-the-recursion-depth.patch
rename to 0314-script-execute-Limit-the-recursion-depth.patch
diff --git a/SOURCES/0315-net-Unregister-net_default_ip-and-net_default_mac-va.patch b/0315-net-Unregister-net_default_ip-and-net_default_mac-va.patch
similarity index 100%
rename from SOURCES/0315-net-Unregister-net_default_ip-and-net_default_mac-va.patch
rename to 0315-net-Unregister-net_default_ip-and-net_default_mac-va.patch
diff --git a/SOURCES/0316-net-Remove-variables-hooks-when-interface-is-unregis.patch b/0316-net-Remove-variables-hooks-when-interface-is-unregis.patch
similarity index 100%
rename from SOURCES/0316-net-Remove-variables-hooks-when-interface-is-unregis.patch
rename to 0316-net-Remove-variables-hooks-when-interface-is-unregis.patch
diff --git a/SOURCES/0317-net-Fix-OOB-write-in-grub_net_search_config_file.patch b/0317-net-Fix-OOB-write-in-grub_net_search_config_file.patch
similarity index 100%
rename from SOURCES/0317-net-Fix-OOB-write-in-grub_net_search_config_file.patch
rename to 0317-net-Fix-OOB-write-in-grub_net_search_config_file.patch
diff --git a/SOURCES/0318-net-tftp-Fix-stack-buffer-overflow-in-tftp_open.patch b/0318-net-tftp-Fix-stack-buffer-overflow-in-tftp_open.patch
similarity index 100%
rename from SOURCES/0318-net-tftp-Fix-stack-buffer-overflow-in-tftp_open.patch
rename to 0318-net-tftp-Fix-stack-buffer-overflow-in-tftp_open.patch
diff --git a/SOURCES/0319-video-readers-jpeg-Do-not-permit-duplicate-SOF0-mark.patch b/0319-video-readers-jpeg-Do-not-permit-duplicate-SOF0-mark.patch
similarity index 100%
rename from SOURCES/0319-video-readers-jpeg-Do-not-permit-duplicate-SOF0-mark.patch
rename to 0319-video-readers-jpeg-Do-not-permit-duplicate-SOF0-mark.patch
diff --git a/SOURCES/0320-kern-dl-Fix-for-an-integer-overflow-in-grub_dl_ref.patch b/0320-kern-dl-Fix-for-an-integer-overflow-in-grub_dl_ref.patch
similarity index 100%
rename from SOURCES/0320-kern-dl-Fix-for-an-integer-overflow-in-grub_dl_ref.patch
rename to 0320-kern-dl-Fix-for-an-integer-overflow-in-grub_dl_ref.patch
diff --git a/SOURCES/0321-kern-dl-Check-for-the-SHF_INFO_LINK-flag-in-grub_dl_.patch b/0321-kern-dl-Check-for-the-SHF_INFO_LINK-flag-in-grub_dl_.patch
similarity index 100%
rename from SOURCES/0321-kern-dl-Check-for-the-SHF_INFO_LINK-flag-in-grub_dl_.patch
rename to 0321-kern-dl-Check-for-the-SHF_INFO_LINK-flag-in-grub_dl_.patch
diff --git a/SOURCES/0322-commands-extcmd-Missing-check-for-failed-allocation.patch b/0322-commands-extcmd-Missing-check-for-failed-allocation.patch
similarity index 100%
rename from SOURCES/0322-commands-extcmd-Missing-check-for-failed-allocation.patch
rename to 0322-commands-extcmd-Missing-check-for-failed-allocation.patch
diff --git a/SOURCES/0323-commands-ls-Fix-NULL-dereference.patch b/0323-commands-ls-Fix-NULL-dereference.patch
similarity index 100%
rename from SOURCES/0323-commands-ls-Fix-NULL-dereference.patch
rename to 0323-commands-ls-Fix-NULL-dereference.patch
diff --git a/SOURCES/0324-commands-pgp-Unregister-the-check_signatures-hooks-o.patch b/0324-commands-pgp-Unregister-the-check_signatures-hooks-o.patch
similarity index 100%
rename from SOURCES/0324-commands-pgp-Unregister-the-check_signatures-hooks-o.patch
rename to 0324-commands-pgp-Unregister-the-check_signatures-hooks-o.patch
diff --git a/SOURCES/0325-normal-Remove-variables-hooks-on-module-unload.patch b/0325-normal-Remove-variables-hooks-on-module-unload.patch
similarity index 100%
rename from SOURCES/0325-normal-Remove-variables-hooks-on-module-unload.patch
rename to 0325-normal-Remove-variables-hooks-on-module-unload.patch
diff --git a/SOURCES/0326-gettext-Remove-variables-hooks-on-module-unload.patch b/0326-gettext-Remove-variables-hooks-on-module-unload.patch
similarity index 100%
rename from SOURCES/0326-gettext-Remove-variables-hooks-on-module-unload.patch
rename to 0326-gettext-Remove-variables-hooks-on-module-unload.patch
diff --git a/SOURCES/0327-gettext-Integer-overflow-leads-to-heap-OOB-write-or-.patch b/0327-gettext-Integer-overflow-leads-to-heap-OOB-write-or-.patch
similarity index 100%
rename from SOURCES/0327-gettext-Integer-overflow-leads-to-heap-OOB-write-or-.patch
rename to 0327-gettext-Integer-overflow-leads-to-heap-OOB-write-or-.patch
diff --git a/SOURCES/0328-gettext-Integer-overflow-leads-to-heap-OOB-write.patch b/0328-gettext-Integer-overflow-leads-to-heap-OOB-write.patch
similarity index 100%
rename from SOURCES/0328-gettext-Integer-overflow-leads-to-heap-OOB-write.patch
rename to 0328-gettext-Integer-overflow-leads-to-heap-OOB-write.patch
diff --git a/SOURCES/0329-commands-read-Fix-an-integer-overflow-when-supplying.patch b/0329-commands-read-Fix-an-integer-overflow-when-supplying.patch
similarity index 100%
rename from SOURCES/0329-commands-read-Fix-an-integer-overflow-when-supplying.patch
rename to 0329-commands-read-Fix-an-integer-overflow-when-supplying.patch
diff --git a/SOURCES/0330-commands-test-Stack-overflow-due-to-unlimited-recurs.patch b/0330-commands-test-Stack-overflow-due-to-unlimited-recurs.patch
similarity index 100%
rename from SOURCES/0330-commands-test-Stack-overflow-due-to-unlimited-recurs.patch
rename to 0330-commands-test-Stack-overflow-due-to-unlimited-recurs.patch
diff --git a/SOURCES/0331-commands-minicmd-Block-the-dump-command-in-lockdown-.patch b/0331-commands-minicmd-Block-the-dump-command-in-lockdown-.patch
similarity index 100%
rename from SOURCES/0331-commands-minicmd-Block-the-dump-command-in-lockdown-.patch
rename to 0331-commands-minicmd-Block-the-dump-command-in-lockdown-.patch
diff --git a/SOURCES/0332-commands-memrw-Disable-memory-reading-in-lockdown-mo.patch b/0332-commands-memrw-Disable-memory-reading-in-lockdown-mo.patch
similarity index 100%
rename from SOURCES/0332-commands-memrw-Disable-memory-reading-in-lockdown-mo.patch
rename to 0332-commands-memrw-Disable-memory-reading-in-lockdown-mo.patch
diff --git a/SOURCES/0333-commands-hexdump-Disable-memory-reading-in-lockdown-.patch b/0333-commands-hexdump-Disable-memory-reading-in-lockdown-.patch
similarity index 100%
rename from SOURCES/0333-commands-hexdump-Disable-memory-reading-in-lockdown-.patch
rename to 0333-commands-hexdump-Disable-memory-reading-in-lockdown-.patch
diff --git a/SOURCES/0334-fs-bfs-Disable-under-lockdown.patch b/0334-fs-bfs-Disable-under-lockdown.patch
similarity index 100%
rename from SOURCES/0334-fs-bfs-Disable-under-lockdown.patch
rename to 0334-fs-bfs-Disable-under-lockdown.patch
diff --git a/SOURCES/0335-fs-Disable-many-filesystems-under-lockdown.patch b/0335-fs-Disable-many-filesystems-under-lockdown.patch
similarity index 100%
rename from SOURCES/0335-fs-Disable-many-filesystems-under-lockdown.patch
rename to 0335-fs-Disable-many-filesystems-under-lockdown.patch
diff --git a/SOURCES/0336-disk-Use-safe-math-macros-to-prevent-overflows.patch b/0336-disk-Use-safe-math-macros-to-prevent-overflows.patch
similarity index 100%
rename from SOURCES/0336-disk-Use-safe-math-macros-to-prevent-overflows.patch
rename to 0336-disk-Use-safe-math-macros-to-prevent-overflows.patch
diff --git a/SOURCES/0337-disk-Prevent-overflows-when-allocating-memory-for-ar.patch b/0337-disk-Prevent-overflows-when-allocating-memory-for-ar.patch
similarity index 100%
rename from SOURCES/0337-disk-Prevent-overflows-when-allocating-memory-for-ar.patch
rename to 0337-disk-Prevent-overflows-when-allocating-memory-for-ar.patch
diff --git a/SOURCES/0338-disk-Check-if-returned-pointer-for-allocated-memory-.patch b/0338-disk-Check-if-returned-pointer-for-allocated-memory-.patch
similarity index 100%
rename from SOURCES/0338-disk-Check-if-returned-pointer-for-allocated-memory-.patch
rename to 0338-disk-Check-if-returned-pointer-for-allocated-memory-.patch
diff --git a/SOURCES/0339-disk-ieee1275-ofdisk-Call-grub_ieee1275_close-when-g.patch b/0339-disk-ieee1275-ofdisk-Call-grub_ieee1275_close-when-g.patch
similarity index 100%
rename from SOURCES/0339-disk-ieee1275-ofdisk-Call-grub_ieee1275_close-when-g.patch
rename to 0339-disk-ieee1275-ofdisk-Call-grub_ieee1275_close-when-g.patch
diff --git a/SOURCES/0340-fs-Use-safe-math-macros-to-prevent-overflows.patch b/0340-fs-Use-safe-math-macros-to-prevent-overflows.patch
similarity index 100%
rename from SOURCES/0340-fs-Use-safe-math-macros-to-prevent-overflows.patch
rename to 0340-fs-Use-safe-math-macros-to-prevent-overflows.patch
diff --git a/SOURCES/0341-fs-Prevent-overflows-when-allocating-memory-for-arra.patch b/0341-fs-Prevent-overflows-when-allocating-memory-for-arra.patch
similarity index 100%
rename from SOURCES/0341-fs-Prevent-overflows-when-allocating-memory-for-arra.patch
rename to 0341-fs-Prevent-overflows-when-allocating-memory-for-arra.patch
diff --git a/SOURCES/0342-fs-Prevent-overflows-when-assigning-returned-values-.patch b/0342-fs-Prevent-overflows-when-assigning-returned-values-.patch
similarity index 100%
rename from SOURCES/0342-fs-Prevent-overflows-when-assigning-returned-values-.patch
rename to 0342-fs-Prevent-overflows-when-assigning-returned-values-.patch
diff --git a/SOURCES/0343-fs-zfs-Use-safe-math-macros-to-prevent-overflows.patch b/0343-fs-zfs-Use-safe-math-macros-to-prevent-overflows.patch
similarity index 100%
rename from SOURCES/0343-fs-zfs-Use-safe-math-macros-to-prevent-overflows.patch
rename to 0343-fs-zfs-Use-safe-math-macros-to-prevent-overflows.patch
diff --git a/SOURCES/0344-fs-zfs-Prevent-overflows-when-allocating-memory-for-.patch b/0344-fs-zfs-Prevent-overflows-when-allocating-memory-for-.patch
similarity index 100%
rename from SOURCES/0344-fs-zfs-Prevent-overflows-when-allocating-memory-for-.patch
rename to 0344-fs-zfs-Prevent-overflows-when-allocating-memory-for-.patch
diff --git a/SOURCES/0345-fs-zfs-Check-if-returned-pointer-for-allocated-memor.patch b/0345-fs-zfs-Check-if-returned-pointer-for-allocated-memor.patch
similarity index 100%
rename from SOURCES/0345-fs-zfs-Check-if-returned-pointer-for-allocated-memor.patch
rename to 0345-fs-zfs-Check-if-returned-pointer-for-allocated-memor.patch
diff --git a/SOURCES/0346-fs-zfs-Add-missing-NULL-check-after-grub_strdup-call.patch b/0346-fs-zfs-Add-missing-NULL-check-after-grub_strdup-call.patch
similarity index 100%
rename from SOURCES/0346-fs-zfs-Add-missing-NULL-check-after-grub_strdup-call.patch
rename to 0346-fs-zfs-Add-missing-NULL-check-after-grub_strdup-call.patch
diff --git a/SOURCES/0347-net-Use-safe-math-macros-to-prevent-overflows.patch b/0347-net-Use-safe-math-macros-to-prevent-overflows.patch
similarity index 100%
rename from SOURCES/0347-net-Use-safe-math-macros-to-prevent-overflows.patch
rename to 0347-net-Use-safe-math-macros-to-prevent-overflows.patch
diff --git a/SOURCES/0348-net-Prevent-overflows-when-allocating-memory-for-arr.patch b/0348-net-Prevent-overflows-when-allocating-memory-for-arr.patch
similarity index 100%
rename from SOURCES/0348-net-Prevent-overflows-when-allocating-memory-for-arr.patch
rename to 0348-net-Prevent-overflows-when-allocating-memory-for-arr.patch
diff --git a/SOURCES/0349-net-Check-if-returned-pointer-for-allocated-memory-i.patch b/0349-net-Check-if-returned-pointer-for-allocated-memory-i.patch
similarity index 100%
rename from SOURCES/0349-net-Check-if-returned-pointer-for-allocated-memory-i.patch
rename to 0349-net-Check-if-returned-pointer-for-allocated-memory-i.patch
diff --git a/SOURCES/0350-fs-sfs-Check-if-allocated-memory-is-NULL.patch b/0350-fs-sfs-Check-if-allocated-memory-is-NULL.patch
similarity index 100%
rename from SOURCES/0350-fs-sfs-Check-if-allocated-memory-is-NULL.patch
rename to 0350-fs-sfs-Check-if-allocated-memory-is-NULL.patch
diff --git a/SOURCES/0351-script-execute-Fix-potential-underflow-and-NULL-dere.patch b/0351-script-execute-Fix-potential-underflow-and-NULL-dere.patch
similarity index 100%
rename from SOURCES/0351-script-execute-Fix-potential-underflow-and-NULL-dere.patch
rename to 0351-script-execute-Fix-potential-underflow-and-NULL-dere.patch
diff --git a/SOURCES/0352-osdep-unix-getroot-Fix-potential-underflow.patch b/0352-osdep-unix-getroot-Fix-potential-underflow.patch
similarity index 100%
rename from SOURCES/0352-osdep-unix-getroot-Fix-potential-underflow.patch
rename to 0352-osdep-unix-getroot-Fix-potential-underflow.patch
diff --git a/SOURCES/0353-misc-Ensure-consistent-overflow-error-messages.patch b/0353-misc-Ensure-consistent-overflow-error-messages.patch
similarity index 100%
rename from SOURCES/0353-misc-Ensure-consistent-overflow-error-messages.patch
rename to 0353-misc-Ensure-consistent-overflow-error-messages.patch
diff --git a/SOURCES/0354-bus-usb-ehci-Define-GRUB_EHCI_TOGGLE-as-grub_uint32_.patch b/0354-bus-usb-ehci-Define-GRUB_EHCI_TOGGLE-as-grub_uint32_.patch
similarity index 100%
rename from SOURCES/0354-bus-usb-ehci-Define-GRUB_EHCI_TOGGLE-as-grub_uint32_.patch
rename to 0354-bus-usb-ehci-Define-GRUB_EHCI_TOGGLE-as-grub_uint32_.patch
diff --git a/SOURCES/0355-normal-menu-Use-safe-math-to-avoid-an-integer-overfl.patch b/0355-normal-menu-Use-safe-math-to-avoid-an-integer-overfl.patch
similarity index 100%
rename from SOURCES/0355-normal-menu-Use-safe-math-to-avoid-an-integer-overfl.patch
rename to 0355-normal-menu-Use-safe-math-to-avoid-an-integer-overfl.patch
diff --git a/SOURCES/0356-kern-partition-Add-sanity-check-after-grub_strtoul-c.patch b/0356-kern-partition-Add-sanity-check-after-grub_strtoul-c.patch
similarity index 100%
rename from SOURCES/0356-kern-partition-Add-sanity-check-after-grub_strtoul-c.patch
rename to 0356-kern-partition-Add-sanity-check-after-grub_strtoul-c.patch
diff --git a/SOURCES/0357-kern-misc-Add-sanity-check-after-grub_strtoul-call.patch b/0357-kern-misc-Add-sanity-check-after-grub_strtoul-call.patch
similarity index 100%
rename from SOURCES/0357-kern-misc-Add-sanity-check-after-grub_strtoul-call.patch
rename to 0357-kern-misc-Add-sanity-check-after-grub_strtoul-call.patch
diff --git a/SOURCES/0358-loader-i386-linux-Cast-left-shift-to-grub_uint32_t.patch b/0358-loader-i386-linux-Cast-left-shift-to-grub_uint32_t.patch
similarity index 100%
rename from SOURCES/0358-loader-i386-linux-Cast-left-shift-to-grub_uint32_t.patch
rename to 0358-loader-i386-linux-Cast-left-shift-to-grub_uint32_t.patch
diff --git a/SOURCES/0359-loader-i386-bsd-Use-safe-math-to-avoid-underflow.patch b/0359-loader-i386-bsd-Use-safe-math-to-avoid-underflow.patch
similarity index 100%
rename from SOURCES/0359-loader-i386-bsd-Use-safe-math-to-avoid-underflow.patch
rename to 0359-loader-i386-bsd-Use-safe-math-to-avoid-underflow.patch
diff --git a/SOURCES/0360-fs-ext2-Rework-out-of-bounds-read-for-inline-and-ext.patch b/0360-fs-ext2-Rework-out-of-bounds-read-for-inline-and-ext.patch
similarity index 100%
rename from SOURCES/0360-fs-ext2-Rework-out-of-bounds-read-for-inline-and-ext.patch
rename to 0360-fs-ext2-Rework-out-of-bounds-read-for-inline-and-ext.patch
diff --git a/SOURCES/0361-powerpc-increase-MIN-RMA-size-for-CAS-negotiation.patch b/0361-powerpc-increase-MIN-RMA-size-for-CAS-negotiation.patch
similarity index 100%
rename from SOURCES/0361-powerpc-increase-MIN-RMA-size-for-CAS-negotiation.patch
rename to 0361-powerpc-increase-MIN-RMA-size-for-CAS-negotiation.patch
diff --git a/SOURCES/0362-ieee1275-ofnet-Fix-grub_malloc-removed-after-added-s.patch b/0362-ieee1275-ofnet-Fix-grub_malloc-removed-after-added-s.patch
similarity index 100%
rename from SOURCES/0362-ieee1275-ofnet-Fix-grub_malloc-removed-after-added-s.patch
rename to 0362-ieee1275-ofnet-Fix-grub_malloc-removed-after-added-s.patch
diff --git a/0363-grub-mkimage-Create-new-ELF-note-for-SBAT.patch b/0363-grub-mkimage-Create-new-ELF-note-for-SBAT.patch
new file mode 100644
index 0000000..25023c8
--- /dev/null
+++ b/0363-grub-mkimage-Create-new-ELF-note-for-SBAT.patch
@@ -0,0 +1,167 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
+Date: Wed, 23 Oct 2024 17:54:32 +0530
+Subject: [PATCH] grub-mkimage: Create new ELF note for SBAT
+
+In order to store the SBAT data we create a new ELF note. The string
+".sbat", zero-padded to 4 byte alignment, shall be entered in the name
+field. The string "SBAT"'s ASCII values, 0x53424154, should be entered
+in the type field.
+
+Signed-off-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ include/grub/util/mkimage.h |  4 ++--
+ util/grub-mkimagexx.c       | 48 +++++++++++++++++++++++++++++++++++++++++++--
+ util/mkimage.c              |  5 +++--
+ 3 files changed, 51 insertions(+), 6 deletions(-)
+
+diff --git a/include/grub/util/mkimage.h b/include/grub/util/mkimage.h
+index 6f1da89b9b65..881e3031f41f 100644
+--- a/include/grub/util/mkimage.h
++++ b/include/grub/util/mkimage.h
+@@ -51,12 +51,12 @@ grub_mkimage_load_image64 (const char *kernel_path,
+ 			   const struct grub_install_image_target_desc *image_target);
+ void
+ grub_mkimage_generate_elf32 (const struct grub_install_image_target_desc *image_target,
+-			     int note, size_t appsig_size, char **core_img, size_t *core_size,
++			     int note, size_t appsig_size, char *sbat, char **core_img, size_t *core_size,
+ 			     Elf32_Addr target_addr,
+ 			     struct grub_mkimage_layout *layout);
+ void
+ grub_mkimage_generate_elf64 (const struct grub_install_image_target_desc *image_target,
+-			     int note, size_t appsig_size, char **core_img, size_t *core_size,
++			     int note, size_t appsig_size, char *sbat, char **core_img, size_t *core_size,
+ 			     Elf64_Addr target_addr,
+ 			     struct grub_mkimage_layout *layout);
+ 
+diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
+index 9488f052510a..b9930544889d 100644
+--- a/util/grub-mkimagexx.c
++++ b/util/grub-mkimagexx.c
+@@ -116,6 +116,14 @@ struct section_metadata
+   const char *strtab;
+ };
+ 
++#define GRUB_SBAT_NOTE_NAME ".sbat"
++#define GRUB_SBAT_NOTE_TYPE 0x53424154 /* "SBAT" */
++
++struct grub_sbat_note {
++  Elf32_Nhdr header;
++  char name[ALIGN_UP(sizeof(GRUB_SBAT_NOTE_NAME), 4)];
++};
++
+ static int
+ is_relocatable (const struct grub_install_image_target_desc *image_target)
+ {
+@@ -217,7 +225,7 @@ grub_arm_reloc_jump24 (grub_uint32_t *target, Elf32_Addr sym_addr)
+ 
+ void
+ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc *image_target,
+-				    int note, size_t appsig_size, char **core_img, size_t *core_size,
++				    int note, size_t appsig_size, char *sbat, char **core_img, size_t *core_size,
+ 				    Elf_Addr target_addr,
+ 				    struct grub_mkimage_layout *layout)
+ {
+@@ -226,10 +234,17 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
+   Elf_Ehdr *ehdr;
+   Elf_Phdr *phdr;
+   Elf_Shdr *shdr;
+-  int header_size, footer_size = 0;
++  int header_size, footer_size = 0, footer_offset = 0;
+   int phnum = 1;
+   int shnum = 4;
+   int string_size = sizeof (".text") + sizeof ("mods") + 1;
++  char *footer;
++
++  if (sbat)
++    {
++      phnum++;
++      footer_size += ALIGN_UP (sizeof (struct grub_sbat_note) + layout->sbat_size, 4);
++    }
+ 
+   if (appsig_size)
+     {
+@@ -263,6 +278,7 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
+   ehdr = (void *) elf_img;
+   phdr = (void *) (elf_img + sizeof (*ehdr));
+   shdr = (void *) (elf_img + sizeof (*ehdr) + phnum * sizeof (*phdr));
++  footer = elf_img + program_size + header_size;
+   memcpy (ehdr->e_ident, ELFMAG, SELFMAG);
+   ehdr->e_ident[EI_CLASS] = ELFCLASSXX;
+   if (!image_target->bigendian)
+@@ -435,6 +451,8 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
+       phdr->p_filesz = grub_host_to_target32 (XEN_NOTE_SIZE);
+       phdr->p_memsz = 0;
+       phdr->p_offset = grub_host_to_target32 (header_size + program_size);
++      footer = ptr;
++      footer_offset = XEN_NOTE_SIZE;
+     }
+ 
+   if (image_target->id == IMAGE_XEN_PVH)
+@@ -468,6 +486,8 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
+       phdr->p_filesz = grub_host_to_target32 (XEN_PVH_NOTE_SIZE);
+       phdr->p_memsz = 0;
+       phdr->p_offset = grub_host_to_target32 (header_size + program_size);
++      footer = ptr;
++      footer_offset = XEN_PVH_NOTE_SIZE;
+     }
+ 
+   if (note)
+@@ -498,6 +518,30 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc
+       phdr->p_filesz = grub_host_to_target32 (note_size);
+       phdr->p_memsz = 0;
+       phdr->p_offset = grub_host_to_target32 (header_size + program_size);
++      footer = (elf_img + program_size + header_size + note_size);
++      footer_offset += note_size;
++    }
++
++  if (sbat)
++    {
++      int note_size = ALIGN_UP (sizeof (struct grub_sbat_note) + layout->sbat_size, 4);
++      struct grub_sbat_note *note_ptr = (struct grub_sbat_note *) footer;
++
++      note_ptr->header.n_namesz = grub_host_to_target32 (sizeof (GRUB_SBAT_NOTE_NAME));
++      note_ptr->header.n_descsz = grub_host_to_target32 (ALIGN_UP(layout->sbat_size, 4));
++      note_ptr->header.n_type = grub_host_to_target32 (GRUB_SBAT_NOTE_TYPE);
++      memcpy (note_ptr->name, GRUB_SBAT_NOTE_NAME, sizeof (GRUB_SBAT_NOTE_NAME));
++      memcpy ((char *)(note_ptr + 1), sbat, layout->sbat_size);
++
++      phdr++;
++      phdr->p_type = grub_host_to_target32 (PT_NOTE);
++      phdr->p_flags = grub_host_to_target32 (PF_R);
++      phdr->p_align = grub_host_to_target32 (image_target->voidp_sizeof);
++      phdr->p_vaddr = 0;
++      phdr->p_paddr = 0;
++      phdr->p_filesz = grub_host_to_target32 (note_size);
++      phdr->p_memsz = 0;
++      phdr->p_offset = grub_host_to_target32 (header_size + program_size + footer_offset);
+     }
+ 
+   if (appsig_size) {
+diff --git a/util/mkimage.c b/util/mkimage.c
+index f31fdefa814a..7fa6a7b21954 100644
+--- a/util/mkimage.c
++++ b/util/mkimage.c
+@@ -1848,6 +1848,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
+     case IMAGE_I386_IEEE1275:
+       {
+ 	grub_uint64_t target_addr;
++	char *sbat = NULL;
+ 	if (image_target->id == IMAGE_LOONGSON_ELF)
+ 	  {
+ 	    if (comp == GRUB_COMPRESSION_NONE)
+@@ -1859,10 +1860,10 @@ grub_install_generate_image (const char *dir, const char *prefix,
+ 	else
+ 	  target_addr = image_target->link_addr;
+ 	if (image_target->voidp_sizeof == 4)
+-	  grub_mkimage_generate_elf32 (image_target, note, appsig_size, &core_img,
++	  grub_mkimage_generate_elf32 (image_target, note, appsig_size, sbat, &core_img,
+ 				       &core_size, target_addr, &layout);
+ 	else
+-	  grub_mkimage_generate_elf64 (image_target, note, appsig_size, &core_img,
++	  grub_mkimage_generate_elf64 (image_target, note, appsig_size, sbat, &core_img,
+ 				       &core_size, target_addr, &layout);
+       }
+       break;
diff --git a/0364-grub-mkimage-Add-SBAT-metadata-into-ELF-note-for-Pow.patch b/0364-grub-mkimage-Add-SBAT-metadata-into-ELF-note-for-Pow.patch
new file mode 100644
index 0000000..1ce74ae
--- /dev/null
+++ b/0364-grub-mkimage-Add-SBAT-metadata-into-ELF-note-for-Pow.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
+Date: Wed, 23 Oct 2024 17:54:33 +0530
+Subject: [PATCH] grub-mkimage: Add SBAT metadata into ELF note for PowerPC
+ targets
+
+The SBAT metadata is read from CSV file and transformed into an ELF note
+with the -s option.
+
+Signed-off-by: Daniel Axtens <dja@axtens.net>
+Signed-off-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ util/mkimage.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/util/mkimage.c b/util/mkimage.c
+index 7fa6a7b21954..f92949d1df25 100644
+--- a/util/mkimage.c
++++ b/util/mkimage.c
+@@ -957,8 +957,8 @@ grub_install_generate_image (const char *dir, const char *prefix,
+       total_module_size += dtb_size + sizeof (struct grub_module_header);
+     }
+ 
+-  if (sbat_path != NULL && image_target->id != IMAGE_EFI)
+-    grub_util_error (_(".sbat section can be embedded into EFI images only"));
++  if (sbat_path != NULL && (image_target->id != IMAGE_EFI && image_target->id != IMAGE_PPC))
++    grub_util_error (_("SBAT data can be added only to EFI or powerpc-ieee1275 images"));
+ 
+   if (disable_shim_lock)
+     total_module_size += sizeof (struct grub_module_header);
+@@ -1849,6 +1849,13 @@ grub_install_generate_image (const char *dir, const char *prefix,
+       {
+ 	grub_uint64_t target_addr;
+ 	char *sbat = NULL;
++	if (sbat_path != NULL)
++	  {
++	    sbat_size = grub_util_get_image_size (sbat_path);
++	    sbat = xmalloc (sbat_size);
++	    grub_util_load_image (sbat_path, sbat);
++	    layout.sbat_size = sbat_size;
++	  }
+ 	if (image_target->id == IMAGE_LOONGSON_ELF)
+ 	  {
+ 	    if (comp == GRUB_COMPRESSION_NONE)
diff --git a/0365-loader-efi-Fix-RISC-V-build.patch b/0365-loader-efi-Fix-RISC-V-build.patch
new file mode 100644
index 0000000..91ccb60
--- /dev/null
+++ b/0365-loader-efi-Fix-RISC-V-build.patch
@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Tue, 19 Nov 2024 15:42:01 +0000
+Subject: [PATCH] loader/efi: Fix RISC-V build
+
+Some struct definitions are currently limited to 32-bit and
+64-bit Arm architectures, but they actually apply to other
+architectures as well, specifically 32-bit and 64-bit RISC-V
+respectively.
+
+Update the preprocessor checks guarding their definition, and
+change their names to make them more accurate by replacing the
+word "arm" with the word "efi".
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+---
+ grub-core/loader/efi/linux.c |  2 +-
+ include/grub/efi/efi.h       | 12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index 5889e3f36f8..ef55556f2d9 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -684,7 +684,7 @@ parse_pe_header (void *kernel, grub_uint64_t *total_size,
+ 		 grub_uint32_t *alignment, grub_uint32_t *code_size)
+ {
+   struct linux_arch_kernel_header *lh = kernel;
+-  struct grub_armxx_linux_pe_header *pe;
++  struct grub_efixx_linux_pe_header *pe;
+   grub_uint16_t i;
+   struct grub_pe32_section_table *sections;
+ 
+diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
+index 7eed1bd791d..81daf6bead1 100644
+--- a/include/grub/efi/efi.h
++++ b/include/grub/efi/efi.h
+@@ -36,28 +36,28 @@ struct linux_arch_kernel_header {
+   struct grub_pe_image_header pe_image_header;
+ };
+ 
+-struct grub_arm_linux_pe_header
++struct grub_efi32_linux_pe_header
+ {
+   grub_uint32_t magic;
+   struct grub_pe32_coff_header coff;
+   struct grub_pe32_optional_header opt;
+ };
+ 
+-struct grub_arm64_linux_pe_header
++struct grub_efi64_linux_pe_header
+ {
+   grub_uint32_t magic;
+   struct grub_pe32_coff_header coff;
+   struct grub_pe64_optional_header opt;
+ };
+ 
+-#if defined(__arm__)
++#if defined(__arm__) || (defined(__riscv) && (__riscv_xlen == 32))
+ # define GRUB_PE32_PEXX_MAGIC GRUB_PE32_PE32_MAGIC
+-# define grub_armxx_linux_pe_header grub_arm_linux_pe_header
++# define grub_efixx_linux_pe_header grub_efi32_linux_pe_header
+ #endif
+ 
+-#if defined(__aarch64__)
++#if defined(__aarch64__) || (defined(__riscv) && (__riscv_xlen == 64))
+ # define GRUB_PE32_PEXX_MAGIC GRUB_PE32_PE64_MAGIC
+-# define grub_armxx_linux_pe_header grub_arm64_linux_pe_header
++# define grub_efixx_linux_pe_header grub_efi64_linux_pe_header
+ #endif
+ 
+ #define GRUB_EFI_GRUB_VARIABLE_GUID             \
diff --git a/0366-kern-riscv-efi-init-Use-time-register-in-grub_efi_ge.patch b/0366-kern-riscv-efi-init-Use-time-register-in-grub_efi_ge.patch
new file mode 100644
index 0000000..c38e333
--- /dev/null
+++ b/0366-kern-riscv-efi-init-Use-time-register-in-grub_efi_ge.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
+Date: Mon, 12 Aug 2024 16:13:18 +0200
+Subject: [PATCH] kern/riscv/efi/init: Use time register in
+ grub_efi_get_time_ms()
+
+The cycle register is not guaranteed to count at constant frequency.
+If it is counting at all depends on the state the performance monitoring
+unit. Use the time register to measure time.
+
+Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/kern/riscv/efi/init.c | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/grub-core/kern/riscv/efi/init.c b/grub-core/kern/riscv/efi/init.c
+index 38795fe6741..0d7de4f541a 100644
+--- a/grub-core/kern/riscv/efi/init.c
++++ b/grub-core/kern/riscv/efi/init.c
+@@ -33,16 +33,15 @@ grub_efi_get_time_ms (void)
+   grub_uint64_t tmr;
+ 
+ #if __riscv_xlen == 64
+-  asm volatile ("rdcycle %0" : "=r" (tmr));
++  asm volatile ("rdtime %0" : "=r"(tmr));
+ #else
+   grub_uint32_t lo, hi, tmp;
+-  asm volatile (
+-    "1:\n"
+-    "rdcycleh %0\n"
+-    "rdcycle %1\n"
+-    "rdcycleh %2\n"
+-    "bne %0, %2, 1b"
+-    : "=&r" (hi), "=&r" (lo), "=&r" (tmp));
++  asm volatile ("1:\n"
++                "rdtimeh %0\n"
++                "rdtime %1\n"
++                "rdtimeh %2\n"
++                "bne %0, %2, 1b"
++                : "=&r" (hi), "=&r" (lo), "=&r" (tmp));
+   tmr = ((grub_uint64_t)hi << 32) | lo;
+ #endif
+ 
diff --git a/0367-Use-medany-instead-of-large-model-for-RISCV.patch b/0367-Use-medany-instead-of-large-model-for-RISCV.patch
new file mode 100644
index 0000000..37540c4
--- /dev/null
+++ b/0367-Use-medany-instead-of-large-model-for-RISCV.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jason Montleon <jason@montleon.com>
+Date: Fri, 3 May 2024 13:18:37 -0400
+Subject: [PATCH] Use medany instead of large model for RISCV
+
+Signed-off-by: Jason Montleon <jason@montleon.com>
+---
+ configure.ac | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4788f3d6adc..a6a6957fbdb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1313,7 +1313,7 @@ AC_SUBST(TARGET_LDFLAGS_OLDMAGIC)
+ 
+ LDFLAGS="$TARGET_LDFLAGS"
+ 
+-if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 || test "$target_cpu" = riscv64 ; then
++if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 ; then
+   # Use large model to support 4G memory
+   AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
+     CFLAGS="$TARGET_CFLAGS -mcmodel=large"
+@@ -1323,9 +1323,11 @@ if test "$target_cpu" = x86_64 || test "$target_cpu" = sparc64 || test "$target_
+   ])
+   if test "x$grub_cv_cc_mcmodel" = xyes; then
+     TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
+-  elif test "$target_cpu" = sparc64 || test "$target_cpu" = riscv64; then
++  elif test "$target_cpu" = sparc64; then
+     TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=medany"
+   fi
++elif test "$target_cpu" = riscv64 ; then
++    TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=medany"
+ fi
+ 
+ if test "$target_cpu"-"$platform" = x86_64-efi; then
diff --git a/0368-10_linux.in-escape-kernel-option-characters-properly.patch b/0368-10_linux.in-escape-kernel-option-characters-properly.patch
new file mode 100644
index 0000000..1937cb9
--- /dev/null
+++ b/0368-10_linux.in-escape-kernel-option-characters-properly.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Wed, 7 May 2025 13:23:37 -0600
+Subject: [PATCH] 10_linux.in: escape kernel option characters properly
+
+This handles cases where kernel options, specifically the values,
+contain special characters, in this case ';', '&' and '$'.
+
+For example, the user defines the following GRUB_CMDLINE_LINUX on the
+default grub file /etc/default/grub, note the dolar sign on the 'memmap'
+option
+
+    GRUB_CMDLINE_LINUX="console=ttyS0 memmap=32g\\\$0x2000000000"
+
+then regenerating the grub cfg and BLS options line with the
+grub2-mkconfig command, resulting into
+
+    options root=UUID=6baedf23-2510-499a-815d-48b58cf6e619 ro
+    rootflags=subvol=root console=ttyS0 memmap=32g\$0x2000000000
+
+without this patch, we would end up with
+
+    options root=UUID=6baedf23-2510-499a-815d-48b58cf6e619 ro
+    rootflags=subvol=root console=ttyS0 memmap=32g$0x2000000000
+
+Note the missing '\' which is required to escape the '$', otherwise
+it would be consider a variable by blscfg parser which is not the case.
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ util/grub.d/10_linux.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index fafdfbc4d3..4276d5e240 100755
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -180,6 +180,7 @@ update_bls_cmdline()
+         options="$(echo "${options}" | sed -e 's/\//\\\//g')"
+         options="$(echo "${options}" | sed -e 's/\;/\\\;/g')"
+         options="$(echo "${options}" | sed -e 's/\\&/\\\\&/g')"
++        options="$(echo "${options}" | sed -e 's/\$/\\\$/g')"
+         sed -i -e "s/^options.*/options ${options}/" "${blsdir}/${bls}.conf"
+     done
+ }
diff --git a/0369-blscfg-check-if-variable-is-escaped-before-consideri.patch b/0369-blscfg-check-if-variable-is-escaped-before-consideri.patch
new file mode 100644
index 0000000..fba6906
--- /dev/null
+++ b/0369-blscfg-check-if-variable-is-escaped-before-consideri.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Wed, 7 May 2025 13:49:47 -0600
+Subject: [PATCH] blscfg: check if variable is escaped before considering one
+
+Otherwise escaped variables are considered real variables.
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/commands/blscfg.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
+index 6e398fc175..5d931b0c9b 100644
+--- a/grub-core/commands/blscfg.c
++++ b/grub-core/commands/blscfg.c
+@@ -695,7 +695,8 @@ static char *expand_val(const char *value)
+     return NULL;
+ 
+   while (*value) {
+-    if (*value == '$') {
++    /* It's a variable only when *value is '$' and it is not escaped with '\'*/
++    if (*value == '$' && *end != '\\') {
+       if (start != end) {
+ 	buffer = field_append(is_var, buffer, start, end);
+ 	if (!buffer)
diff --git a/0370-Set-correctly-the-memory-attributes-for-the-kernel-P.patch b/0370-Set-correctly-the-memory-attributes-for-the-kernel-P.patch
new file mode 100644
index 0000000..b7d640a
--- /dev/null
+++ b/0370-Set-correctly-the-memory-attributes-for-the-kernel-P.patch
@@ -0,0 +1,293 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Wed, 16 Jul 2025 12:38:24 -0600
+Subject: [PATCH] Set correctly the memory attributes for the kernel PE
+ sections
+
+Currently the whole kernel memory region is set to RO, so at some
+point when execution is passed to the kernel, the latter faults on a
+memory write access, e.g. zeroing .bss section. The proposed change
+sets the memory attribute appropriately for each kernel PE section.
+
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/loader/efi/linux.c      | 170 +++++++++++++++++++++++++++-----------
+ grub-core/loader/i386/efi/linux.c |   5 +-
+ include/grub/efi/linux.h          |   6 ++
+ 3 files changed, 134 insertions(+), 47 deletions(-)
+
+diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
+index efceb9b6dd..159bd9dc48 100644
+--- a/grub-core/loader/efi/linux.c
++++ b/grub-core/loader/efi/linux.c
+@@ -37,6 +37,7 @@
+ #include <grub/efi/sb.h>
+ #include <grub/i18n.h>
+ #include <grub/lib/cmdline.h>
++#include <grub/safemath.h>
+ #include <grub/verify.h>
+ 
+ GRUB_MOD_LICENSE ("GPLv3+");
+@@ -203,22 +204,133 @@ grub_efi_check_nx_required (int *nx_required)
+ typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *);
+ 
+ grub_err_t
+-grub_efi_linux_boot (grub_addr_t k_address, grub_size_t k_size,
++grub_efi_mem_set_att(grub_addr_t k_address, grub_size_t k_size,
++                     grub_size_t k_start, int nx_supported)
++{
++  grub_addr_t k_start_address = k_address + k_start;
++
++  grub_uint64_t default_set_attrs = GRUB_MEM_ATTR_R | GRUB_MEM_ATTR_W | GRUB_MEM_ATTR_X;
++  grub_uint64_t default_clear_attrs = 0;
++  grub_uint64_t stack_set_attrs = default_set_attrs;
++  grub_uint64_t stack_clear_attrs = default_clear_attrs;
++  grub_uint64_t kernel_set_attrs = default_set_attrs;
++  grub_uint64_t kernel_clear_attrs = default_clear_attrs;
++  grub_uint64_t attrs;
++
++  struct grub_msdos_image_header *header;
++  struct grub_pe_image_header *pe_image_header;
++  struct grub_pe32_coff_header *coff_header;
++  struct grub_pe32_section_table *section, *sections;
++  grub_uint16_t i;
++  grub_size_t sz;
++
++  header = (struct grub_msdos_image_header *)k_address;
++
++  if (grub_add ((grub_addr_t) header, header->pe_image_header_offset, &sz))
++    return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("Error on PE image header address calculation"));
++
++  pe_image_header = (struct grub_pe_image_header *) (sz);
++
++  if (pe_image_header > (k_address + k_size))
++    return grub_error (GRUB_ERR_BAD_OS, N_("PE image header address is invalid"));
++
++  if (grub_memcmp (pe_image_header->signature, GRUB_PE32_SIGNATURE,
++                   GRUB_PE32_SIGNATURE_SIZE) != 0)
++    return grub_error (GRUB_ERR_BAD_OS, N_("kernel PE magic is invalid"));
++
++  coff_header = &(pe_image_header->coff_header);
++  grub_dprintf ("nx", "coff_header 0x%"PRIxGRUB_ADDR" machine %08x\n", (grub_addr_t)coff_header, coff_header->machine);
++
++  if (grub_add ((grub_addr_t) coff_header, sizeof (*coff_header), &sz) ||
++      grub_add (sz, coff_header->optional_header_size, &sz))
++    return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("Error on PE sections calculation"));
++
++  sections = (struct grub_pe32_section_table *) (sz);
++
++  if (sections > (k_address + k_size))
++    return grub_error (GRUB_ERR_BAD_OS, N_("Section address is invalid"));
++
++  /* Parse the PE, remove W for code section, remove X for data sections, RO for the rest */
++  for (i = 0, section = sections; i < coff_header->num_sections; i++, section++)
++    {
++      kernel_set_attrs = default_set_attrs;
++      kernel_clear_attrs = default_clear_attrs;
++
++      if (nx_supported)
++        {
++          if (section->characteristics & GRUB_PE32_SCN_MEM_EXECUTE)
++            {
++              /* RX section */
++              kernel_set_attrs &= ~GRUB_MEM_ATTR_W;
++              kernel_clear_attrs |= GRUB_MEM_ATTR_W;
++            }
++          else if (section->characteristics & GRUB_PE32_SCN_MEM_WRITE)
++            {
++              /* RW section */
++              kernel_set_attrs &= ~GRUB_MEM_ATTR_X;
++              kernel_clear_attrs |= GRUB_MEM_ATTR_X;
++            }
++          else
++            {
++              /* RO section */
++              kernel_set_attrs &= ~GRUB_MEM_ATTR_W & ~GRUB_MEM_ATTR_X;
++              kernel_clear_attrs |= GRUB_MEM_ATTR_X | GRUB_MEM_ATTR_W ;
++            }
++        }
++
++      /* Make sure we are inside range */
++      if (grub_add ((grub_addr_t) k_address, section->raw_data_offset, &sz))
++        return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("Error on PE Executable section calculation"));
++
++      grub_update_mem_attrs (sz, section->raw_data_size, kernel_set_attrs, kernel_clear_attrs);
++
++      grub_get_mem_attrs (sz, 4096, &attrs);
++      grub_dprintf ("nx", "permissions for section %s 0x%"PRIxGRUB_ADDR" are %s%s%s\n",
++		    section->name,
++		    (grub_addr_t)sz,
++		    (attrs & GRUB_MEM_ATTR_R) ? "r" : "-",
++		    (attrs & GRUB_MEM_ATTR_W) ? "w" : "-",
++		    (attrs & GRUB_MEM_ATTR_X) ? "x" : "-");
++    }
++
++  if (grub_stack_addr != (grub_addr_t)-1ll)
++    {
++      if (nx_supported)
++        {
++          stack_set_attrs &= ~GRUB_MEM_ATTR_X;
++          stack_clear_attrs |= GRUB_MEM_ATTR_X;
++        }
++
++      grub_dprintf ("nx", "Setting attributes for stack at 0x%"PRIxGRUB_ADDR"-0x%"PRIxGRUB_ADDR" to rw%c\n",
++                    grub_stack_addr, grub_stack_addr + grub_stack_size - 1,
++                    (stack_set_attrs & GRUB_MEM_ATTR_X) ? 'x' : '-');
++
++      grub_update_mem_attrs (grub_stack_addr, grub_stack_size,
++                             stack_set_attrs, stack_clear_attrs);
++
++      grub_get_mem_attrs (grub_stack_addr, 4096, &attrs);
++      grub_dprintf ("nx", "permissions for 0x%"PRIxGRUB_ADDR" are %s%s%s\n",
++                    grub_stack_addr,
++                    (attrs & GRUB_MEM_ATTR_R) ? "r" : "-",
++                    (attrs & GRUB_MEM_ATTR_W) ? "w" : "-",
++                    (attrs & GRUB_MEM_ATTR_X) ? "x" : "-");
++    }
++
++  return GRUB_ERR_NONE;
++}
++
++
++grub_err_t
++grub_efi_linux_boot (grub_addr_t k_address, grub_size_t k_size, grub_size_t k_start,
+ 		     grub_off_t h_offset, void *k_params,
+ 		     int nx_supported)
+ {
++  grub_addr_t k_start_address = k_address + k_start;
+   grub_efi_loaded_image_t *loaded_image = NULL;
+   handover_func hf;
+   int offset = 0;
+-  grub_uint64_t stack_set_attrs = GRUB_MEM_ATTR_R |
+-				  GRUB_MEM_ATTR_W |
+-				  GRUB_MEM_ATTR_X;
+-  grub_uint64_t stack_clear_attrs = 0;
+-  grub_uint64_t kernel_set_attrs = stack_set_attrs;
+-  grub_uint64_t kernel_clear_attrs = stack_clear_attrs;
+-  grub_uint64_t attrs;
+   int nx_required = 0;
+-
++ 
+ #ifdef __x86_64__
+   offset = 512;
+ #endif
+@@ -242,41 +354,7 @@ grub_efi_linux_boot (grub_addr_t k_address, grub_size_t k_size,
+   if (nx_required && !nx_supported)
+     return grub_error (GRUB_ERR_BAD_OS, N_("kernel does not support NX loading required by policy"));
+ 
+-  if (nx_supported)
+-    {
+-      kernel_set_attrs &= ~GRUB_MEM_ATTR_W;
+-      kernel_clear_attrs |= GRUB_MEM_ATTR_W;
+-      stack_set_attrs &= ~GRUB_MEM_ATTR_X;
+-      stack_clear_attrs |= GRUB_MEM_ATTR_X;
+-    }
+-
+-  grub_dprintf ("nx", "Setting attributes for 0x%"PRIxGRUB_ADDR"-0x%"PRIxGRUB_ADDR" to r%cx\n",
+-		    k_address, k_address + k_size - 1,
+-		    (kernel_set_attrs & GRUB_MEM_ATTR_W) ? 'w' : '-');
+-  grub_update_mem_attrs (k_address, k_size,
+-			 kernel_set_attrs, kernel_clear_attrs);
+-
+-  grub_get_mem_attrs (k_address, 4096, &attrs);
+-  grub_dprintf ("nx", "permissions for 0x%"PRIxGRUB_ADDR" are %s%s%s\n",
+-		(grub_addr_t)k_address,
+-		(attrs & GRUB_MEM_ATTR_R) ? "r" : "-",
+-		(attrs & GRUB_MEM_ATTR_W) ? "w" : "-",
+-		(attrs & GRUB_MEM_ATTR_X) ? "x" : "-");
+-  if (grub_stack_addr != (grub_addr_t)-1ll)
+-    {
+-      grub_dprintf ("nx", "Setting attributes for stack at 0x%"PRIxGRUB_ADDR"-0x%"PRIxGRUB_ADDR" to rw%c\n",
+-		    grub_stack_addr, grub_stack_addr + grub_stack_size - 1,
+-		    (stack_set_attrs & GRUB_MEM_ATTR_X) ? 'x' : '-');
+-      grub_update_mem_attrs (grub_stack_addr, grub_stack_size,
+-			     stack_set_attrs, stack_clear_attrs);
+-
+-      grub_get_mem_attrs (grub_stack_addr, 4096, &attrs);
+-      grub_dprintf ("nx", "permissions for 0x%"PRIxGRUB_ADDR" are %s%s%s\n",
+-		    grub_stack_addr,
+-		    (attrs & GRUB_MEM_ATTR_R) ? "r" : "-",
+-		    (attrs & GRUB_MEM_ATTR_W) ? "w" : "-",
+-		    (attrs & GRUB_MEM_ATTR_X) ? "x" : "-");
+-    }
++  grub_efi_mem_set_att (k_address, k_size, k_start, nx_supported);
+ 
+ #if defined(__i386__) || defined(__x86_64__)
+   asm volatile ("cli");
+@@ -285,7 +363,7 @@ grub_efi_linux_boot (grub_addr_t k_address, grub_size_t k_size,
+   /* Invalidate the instruction cache */
+   grub_arch_sync_caches((void *)kernel_addr, kernel_size);
+ 
+-  hf = (handover_func)((char *)k_address + h_offset + offset);
++  hf = (handover_func)((char *)k_start_address + h_offset + offset);
+   hf (grub_efi_image_handle, grub_efi_system_table, k_params);
+ 
+   return GRUB_ERR_BUG;
+@@ -455,7 +533,7 @@ grub_arch_efi_linux_boot_image (grub_addr_t addr, grub_size_t size, char *args,
+ 
+   grub_dprintf ("linux", "linux command line: '%s'\n", args);
+ 
+-  retval = grub_efi_linux_boot (addr, size, handover_offset,
++  retval = grub_efi_linux_boot (addr, size, 0, handover_offset,
+ 				(void *)addr, nx_supported);
+ 
+   /* Never reached... */
+diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
+index abbf6b24f5..6c310d9879 100644
+--- a/grub-core/loader/i386/efi/linux.c
++++ b/grub-core/loader/i386/efi/linux.c
+@@ -41,6 +41,7 @@ static grub_command_t cmd_linuxefi, cmd_initrdefi;
+ struct grub_linuxefi_context {
+   void *kernel_mem;
+   grub_uint64_t kernel_size;
++  grub_uint64_t kernel_start;
+   grub_uint32_t handover_offset;
+   struct linux_kernel_params *params;
+   char *cmdline;
+@@ -169,6 +170,7 @@ grub_linuxefi_boot (void *data)
+ 
+   return grub_efi_linux_boot ((grub_addr_t)context->kernel_mem,
+ 			      context->kernel_size,
++			      context->kernel_start,
+ 			      context->handover_offset,
+ 			      context->params,
+ 			      context->nx_supported);
+@@ -527,7 +529,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ 		LOW_U32(kernel_mem));
+   lh->code32_start = LOW_U32(kernel_mem);
+ 
+-  grub_memcpy (kernel_mem, (char *)kernel + start, filelen - start);
++  grub_memcpy (kernel_mem, (char *)kernel, filelen);
+ 
+   lh->type_of_loader = 0x6;
+   grub_dprintf ("linux", "setting lh->type_of_loader = 0x%02x\n",
+@@ -544,6 +546,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+     goto fail;
+   context->kernel_mem = kernel_mem;
+   context->kernel_size = kernel_size;
++  context->kernel_start = start;
+   context->handover_offset = handover_offset;
+   context->params = params;
+   context->cmdline = cmdline;
+diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
+index 5b4e626c37..cd17be506a 100644
+--- a/include/grub/efi/linux.h
++++ b/include/grub/efi/linux.h
+@@ -27,6 +27,7 @@
+ grub_err_t
+ EXPORT_FUNC(grub_efi_linux_boot) (grub_addr_t kernel_address,
+                                   grub_size_t kernel_size,
++                                  grub_size_t kernel_start,
+                                   grub_off_t handover_offset,
+                                   void *kernel_param, int nx_enabled);
+ 
+@@ -38,4 +39,9 @@ EXPORT_FUNC(grub_efi_check_nx_image_support) (grub_addr_t kernel_addr,
+ grub_err_t
+ EXPORT_FUNC(grub_efi_check_nx_required) (int *nx_required);
+ 
++grub_err_t
++EXPORT_FUNC(grub_efi_mem_set_att) (grub_addr_t k_address,
++				   grub_size_t k_size,
++				   grub_size_t k_start, int nx_supported);
++
+ #endif /* ! GRUB_EFI_LINUX_HEADER */
diff --git a/0371-script-execute-Don-t-let-trailing-blank-lines-determ.patch b/0371-script-execute-Don-t-let-trailing-blank-lines-determ.patch
new file mode 100644
index 0000000..fd2eb2b
--- /dev/null
+++ b/0371-script-execute-Don-t-let-trailing-blank-lines-determ.patch
@@ -0,0 +1,66 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <jlecuirot@microsoft.com>
+Date: Thu, 24 Oct 2024 14:42:46 +0100
+Subject: [PATCH] script/execute: Don't let trailing blank lines determine the
+ return code
+
+grub_script_execute_sourcecode() parses and executes code one line at a
+time, updating the return code each time because only the last line
+determines the final status. However, trailing new lines were also
+executed, masking any failure on the previous line. Fix this by only
+trying to execute the command when there is actually one present.
+
+This has presumably never been noticed because this code is not used by
+regular functions, only in special cases like eval and menu entries. The
+latter generally don't return at all, having booted an OS. When failing
+to boot, upstream GRUB triggers the fallback mechanism regardless of the
+return code.
+
+We noticed the problem while using Red Hat's patches, which change this
+behaviour to take account of the return code. In that case, a failure
+takes you back to the menu rather than triggering a fallback.
+
+Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
+---
+ grub-core/script/execute.c |  5 ++++-
+ tests/grub_script_eval.in  | 10 +++++++++-
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
+index 014132703..3d26a3fe4 100644
+--- a/grub-core/script/execute.c
++++ b/grub-core/script/execute.c
+@@ -952,7 +952,10 @@ grub_script_execute_sourcecode (const char *source)
+ 	  break;
+ 	}
+ 
+-      ret = grub_script_execute (parsed_script);
++      /* Don't let trailing blank lines determine the return code.  */
++      if (parsed_script->cmd)
++	ret = grub_script_execute (parsed_script);
++
+       grub_script_free (parsed_script);
+       grub_free (line);
+     }
+diff --git a/tests/grub_script_eval.in b/tests/grub_script_eval.in
+index c97b78d77..9c6211042 100644
+--- a/tests/grub_script_eval.in
++++ b/tests/grub_script_eval.in
+@@ -3,4 +3,12 @@
+ eval echo "Hello world"
+ valname=tst
+ eval $valname=hi
+-echo $tst
+\ No newline at end of file
++echo $tst
++
++if eval "
++false
++"; then
++  echo should have failed
++else
++  echo failed as expected
++fi
+-- 
+2.48.1
+
diff --git a/0372-normal-menu-Check-return-code-of-the-script-when-exe.patch b/0372-normal-menu-Check-return-code-of-the-script-when-exe.patch
new file mode 100644
index 0000000..3ce0eec
--- /dev/null
+++ b/0372-normal-menu-Check-return-code-of-the-script-when-exe.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <jlecuirot@microsoft.com>
+Date: Thu, 24 Oct 2024 15:00:26 +0100
+Subject: [PATCH] normal/menu: Check return code of the script when executing a
+ menu entry
+
+Don't rely on grub_errno here because grub_script_execute_new_scope()
+calls grub_print_error(), which always resets grub_errno back to
+GRUB_ERR_NONE. It may also get reset by grub_wait_after_message().
+
+This problem was observed when a "bad signature" error resulted in the
+menu being redisplayed rather than the fallback mechanism being
+triggered, although another change was also needed to fix it. This only
+happens with Red Hat's patches because upstream GRUB triggers the
+fallback mechanism regardless of the return code.
+
+Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
+---
+ grub-core/normal/menu.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
+index 97687013c..a2703dabb 100644
+--- a/grub-core/normal/menu.c
++++ b/grub-core/normal/menu.c
+@@ -377,14 +377,14 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int auto_boot)
+   if (ptr && ptr[0] && ptr[1])
+     grub_env_set ("default", ptr + 1);
+ 
+-  grub_script_execute_new_scope (entry->sourcecode, entry->argc, entry->args);
++  err = grub_script_execute_new_scope (entry->sourcecode, entry->argc, entry->args);
+ 
+   if (errs_before != grub_err_printed_errors)
+     grub_wait_after_message ();
+ 
+   errs_before = grub_err_printed_errors;
+ 
+-  if (grub_errno == GRUB_ERR_NONE && grub_loader_is_loaded ())
++  if (err == GRUB_ERR_NONE && grub_loader_is_loaded ())
+     /* Implicit execution of boot, only if something is loaded.  */
+     err = grub_command_execute ("boot", 0, 0);
+ 
+-- 
+2.48.1
+
diff --git a/SOURCES/20-grub.install b/20-grub.install
similarity index 96%
rename from SOURCES/20-grub.install
rename to 20-grub.install
index 650b519..699fff7 100755
--- a/SOURCES/20-grub.install
+++ b/20-grub.install
@@ -186,6 +186,12 @@ case "$COMMAND" in
         ;;
     remove)
 
+        # If the boot entry type is type2, we are not removing the BLS entry
+        if [[ "x${KERNEL_INSTALL_BOOT_ENTRY_TYPE}" = "xtype2" ]]; then
+            [ "${KERNEL_INSTALL_VERBOSE}" -gt 0 ] && echo "The boot entry type is type2. Skip removing BLS entry."
+            exit 0
+        fi
+
         if [[ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]] || [[ ! -f /sbin/new-kernel-pkg ]]; then
             BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
             BLS_FAKE_TARGET="${BLS_DIR}/ffffffffffffffffffffffffffffffff-${KERNEL_VERSION}.conf"
diff --git a/SOURCES/99-grub-mkconfig.install b/99-grub-mkconfig.install
similarity index 100%
rename from SOURCES/99-grub-mkconfig.install
rename to 99-grub-mkconfig.install
diff --git a/SOURCES/bootstrap b/bootstrap
similarity index 100%
rename from SOURCES/bootstrap
rename to bootstrap
diff --git a/SOURCES/bootstrap.conf b/bootstrap.conf
similarity index 100%
rename from SOURCES/bootstrap.conf
rename to bootstrap.conf
diff --git a/gen_grub_cfgstub b/gen_grub_cfgstub
new file mode 100644
index 0000000..c73ee53
--- /dev/null
+++ b/gen_grub_cfgstub
@@ -0,0 +1,29 @@
+#!/bin/sh
+set -eu
+
+if [ $# -ne 2 ]
+  then
+    echo "Missing argument"
+    echo "Usage: script.sh GRUB_HOME EFI_HOME"
+    exit 1
+fi
+
+GRUB_HOME=$1
+EFI_HOME=$2
+
+# create a stub grub2 config in EFI
+BOOT_UUID=$(grub2-probe --target=fs_uuid "${GRUB_HOME}")
+GRUB_DIR=$(grub2-mkrelpath "${GRUB_HOME}")
+
+echo "Generating grub stub config for drive " "${BOOT_UUID}"
+echo "GRUB_DIR=" "${GRUB_DIR}"
+echo "EFI_HOME=" "${EFI_HOME}"
+
+cat << EOF > "${EFI_HOME}"/grub.cfg.stb
+search --no-floppy --root-dev-only --fs-uuid --set=dev ${BOOT_UUID}
+set prefix=(\$dev)${GRUB_DIR}
+export \$prefix
+configfile \$prefix/grub.cfg
+EOF
+
+mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
diff --git a/SOURCES/gitignore b/gitignore
similarity index 100%
rename from SOURCES/gitignore
rename to gitignore
diff --git a/SOURCES/grub.macros b/grub.macros
similarity index 99%
rename from SOURCES/grub.macros
rename to grub.macros
index 5038650..ed740de 100644
--- a/SOURCES/grub.macros
+++ b/grub.macros
@@ -401,7 +401,7 @@ install -m 644 %{1}.conf ${RPM_BUILD_ROOT}/etc/dnf/protected.d/ \
 rm -f %{1}.conf							\
 %{nil}
 
-%global grub_modules  " all_video boot blscfg                   \\\
+%global grub_modules  " all_video boot blscfg btrfs             \\\
 			cat configfile cryptodisk		\\\
 			echo ext2 f2fs fat font			\\\
 			gcry_rijndael gcry_rsa gcry_serpent	\\\
@@ -597,6 +597,8 @@ install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3}		\
 %ifarch %{arm}							\
 install -D -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_boot}/BOOTARM.EFI \
 %endif								\
+install -D -m 700 %{SOURCE13}                                  \\\
+    ${RPM_BUILD_ROOT}/usr/bin/gen_grub_cfgstub         		\
 install -D -m 700 unicode.pf2					\\\
 	${RPM_BUILD_ROOT}/boot/grub2/fonts/unicode.pf2		\
 ${RPM_BUILD_ROOT}/%{_bindir}/grub2-editenv			\\\
@@ -720,6 +722,7 @@ ln -s ../boot/grub2/grub.cfg					\\\
 %attr(0700,root,root) %verify(not mtime) %{efi_esp_boot}/BOOTARM.EFI \
 %endif								\
 %attr(0700,root,root)/boot/grub2/fonts			\
+%attr(0700,root,root)/usr/bin/gen_grub_cfgstub		\
 %dir %attr(0700,root,root)/boot/loader/entries			\
 %ghost %config(noreplace) %attr(0600,root,root)/boot/grub2/grub.cfg	\
 %ghost %config(noreplace) %verify(not mtime) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg	\
diff --git a/SOURCES/grub.patches b/grub.patches
similarity index 97%
rename from SOURCES/grub.patches
rename to grub.patches
index c18280a..f4a4658 100644
--- a/SOURCES/grub.patches
+++ b/grub.patches
@@ -359,3 +359,13 @@ Patch0359: 0359-loader-i386-bsd-Use-safe-math-to-avoid-underflow.patch
 Patch0360: 0360-fs-ext2-Rework-out-of-bounds-read-for-inline-and-ext.patch
 Patch0361: 0361-powerpc-increase-MIN-RMA-size-for-CAS-negotiation.patch
 Patch0362: 0362-ieee1275-ofnet-Fix-grub_malloc-removed-after-added-s.patch
+Patch0363: 0363-grub-mkimage-Create-new-ELF-note-for-SBAT.patch
+Patch0364: 0364-grub-mkimage-Add-SBAT-metadata-into-ELF-note-for-Pow.patch
+Patch0365: 0365-loader-efi-Fix-RISC-V-build.patch
+Patch0366: 0366-kern-riscv-efi-init-Use-time-register-in-grub_efi_ge.patch
+Patch0367: 0367-Use-medany-instead-of-large-model-for-RISCV.patch
+Patch0368: 0368-10_linux.in-escape-kernel-option-characters-properly.patch
+Patch0369: 0369-blscfg-check-if-variable-is-escaped-before-consideri.patch
+Patch0370: 0370-Set-correctly-the-memory-attributes-for-the-kernel-P.patch
+Patch0371: 0371-script-execute-Don-t-let-trailing-blank-lines-determ.patch
+Patch0372: 0372-normal-menu-Check-return-code-of-the-script-when-exe.patch
diff --git a/SPECS/grub2.spec b/grub2.spec
similarity index 97%
rename from SPECS/grub2.spec
rename to grub2.spec
index 7a6c47b..249ebfe 100644
--- a/SPECS/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.12
-Release:	15%{?dist}.alma.1
+Release:	29%{?dist}.alma.1
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPL-3.0-or-later
 URL:		http://www.gnu.org/software/grub/
@@ -35,6 +35,7 @@ Source9:	strtoull_test.c
 Source10:	20-grub.install
 Source11:	grub.patches
 Source12:	sbat.csv.in
+Source13:	gen_grub_cfgstub
 
 %include %{SOURCE1}
 
@@ -386,23 +387,13 @@ if test -f ${EFI_HOME}/grub.cfg; then
 fi
 
 # create a stub grub2 config in EFI
-BOOT_UUID=$(grub2-probe --target=fs_uuid ${GRUB_HOME})
-GRUB_DIR=$(grub2-mkrelpath ${GRUB_HOME})
-
-cat << EOF > ${EFI_HOME}/grub.cfg.stb
-search --no-floppy --root-dev-only --fs-uuid --set=dev ${BOOT_UUID}
-set prefix=(\$dev)${GRUB_DIR}
-export \$prefix
-configfile \$prefix/grub.cfg
-EOF
+gen_grub_cfgstub $GRUB_HOME $EFI_HOME || :
 
 if test -f ${EFI_HOME}/grubenv; then
     cp -a ${EFI_HOME}/grubenv ${EFI_HOME}/grubenv.rpmsave
     mv --force ${EFI_HOME}/grubenv ${GRUB_HOME}/grubenv
 fi
 
-mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
-
 %files common -f grub.lang
 %dir %{_libdir}/grub/
 %dir %{_datarootdir}/grub/
@@ -574,8 +565,65 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
-* Thu Sep 25 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1:2.12-15.alma.1
+* Fri Nov 14 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1:2.12-29.alma.1
 - Debrand for AlmaLinux
+- Build btrfs module
+
+* Mon Sep 08 2025 Leo Sandoval <lsandova@redhat.com> 2.12-29
+- Fix the fallback mechanism when menu entries fail to boot
+- Resolves: RHEL-113024
+
+* Thu Aug 21 2025 Leo Sandoval <lsandova@redhat.com> 2.12-28
+- Remove strong stack protector on target CFLAGS
+- Related: #RHEL-89464
+
+* Fri Aug 15 2025 Leo Sandoval <lsandova@redhat.com> 2.12-27
+- Revert annobin's regex removal into cflags_sed
+- Resolves: #RHEL-89464
+
+* Thu Jul 31 2025 Leo Sandoval <lsandova@redhat.com> 2.12-26
+- Enable strong stack protector on EFI configurations
+- Resolves: #RHEL-89464
+
+* Thu Jul 31 2025 Leo Sandoval <lsandova@redhat.com> 2.12-25
+- 20-grub.install: Skip BLS removal when entry type is type2
+- Resolves: #RHEL-104167
+
+* Tue Jul 29 2025 Nicolas Frayer <nfrayer@redhat.com> 2.12-24
+- spec/posttrans: move grub config stub creation out of spec
+- Resolves: #RHEL-69943
+
+* Tue Jul 15 2025 Leo Sandoval <lsandova@redhat.com> 2.12-23
+- Set correctly the memory attributes for the kernel PE sections
+- Resolves: #RHEL-97086
+
+* Tue Jul 15 2025 Leo Sandoval <lsandova@redhat.com> 2.12-22
+- workaround: do not update mem attrs even if EFI protocol is present
+- Resolves: #RHEL-97086
+
+* Fri Jun 6 2025 Leo Sandoval <lsandova@redhat.com> 2.12-21
+- Bump version (see CS-2896)
+- Resolves: #RHEL-94342
+
+* Mon Jun 2 2025 Leo Sandoval <lsandova@redhat.com> 2.12-20
+- Handle special kernel parameter characters properly
+- Resolves: #RHEL-94342
+
+* Wed May 14 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.12-19
+- sbat: bump grub sbat for new shim release
+- Resolves: #RHEL-91277
+
+* Tue May 13 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.12-18
+- sbat: add new sbat entry for centos
+- Resolves: #RHEL-91146
+
+* Wed Apr 16 2025 Andrea Bolognani <abologna@redhat.com> - 2.12-17
+- Fix riscv64 build
+  Resolves: RHEL-85987
+
+* Tue Apr 15 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.12-16
+- ppc/mkimage: SBAT support on powerpc
+- Resolves: #RHEL-87420
 
 * Mon Apr 7 2025 Marta Lewandowska <mlewando@redhat.com> - 2.12-15
 - 99-grub-mkconfig.install: Disable BLS and run grub2-mkconfig when GRUB_ENABLE_BLSCFG is disable
diff --git a/SOURCES/sbat.csv.in b/sbat.csv.in
similarity index 63%
rename from SOURCES/sbat.csv.in
rename to sbat.csv.in
index 63e255f..b52bb95 100755
--- a/SOURCES/sbat.csv.in
+++ b/sbat.csv.in
@@ -1,4 +1,5 @@
 sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
-grub,3,Free Software Foundation,grub,@@VERSION@@,https//www.gnu.org/software/grub/
+grub,5,Free Software Foundation,grub,@@VERSION@@,https//www.gnu.org/software/grub/
 grub.rh,2,Red Hat,grub2,@@RHEL_VERSION_RELEASE@@,mailto:secalert@redhat.com
+grub.centos,2,Red Hat,grub2,@@RHEL_VERSION_RELEASE@@,mailto:secalert@redhat.com
 grub.almalinux,2,AlmaLinux,grub2,@@VERSION_RELEASE@@,mailto:security@almalinux.org
diff --git a/sources b/sources
new file mode 100644
index 0000000..cf7ec7d
--- /dev/null
+++ b/sources
@@ -0,0 +1,4 @@
+SHA512 (gnulib-9f48fb992a3d7e96610c4ce8be969cff2d61a01b.tar.gz) = 6887dede2d4a403422ea045329ee9bd7ca4c1561bcaf39e805e1d1ce8f4c050a65ce286e7d8362fb8e815b5fab0b405730a3f93194e343e2aedcf9b4411a285e
+SHA512 (grub-2.12.tar.xz) = 761c060a4c3da9c0e810b0ea967e3ebc66baa4ddd682a503ae3d30a83707626bccaf49359304a16b3a26fc4435fe6bea1ee90be910c84de3c2b5485a31a15be3
+SHA512 (theme.tar.bz2) = 0f6f914d5f801509403094b28b8cfe5169cb56ae9bdd808ae21a6780a8236b434161a068351508dd78729c25ee2fed066c124c1eef9e15102750b409b4576a5c
+SHA512 (unifont-13.0.06.pcf.gz) = 25f1ea4e316cd77b65cf4f60aa10ed054db6df2195be7344216673dee6628ab055ebcdeea186996d931fd1e9e4f519f4a2e4b4544b8a9ad2fe410aadc4eecd2d
diff --git a/SOURCES/strtoull_test.c b/strtoull_test.c
similarity index 100%
rename from SOURCES/strtoull_test.c
rename to strtoull_test.c