diff --git a/0061-Add-grub2-switch-to-blscfg.patch b/0060-Add-grub2-switch-to-blscfg.patch similarity index 100% rename from 0061-Add-grub2-switch-to-blscfg.patch rename to 0060-Add-grub2-switch-to-blscfg.patch diff --git a/0062-make-better-backtraces.patch b/0061-make-better-backtraces.patch similarity index 99% rename from 0062-make-better-backtraces.patch rename to 0061-make-better-backtraces.patch index e6ae4e9..7fdcaf7 100644 --- a/0062-make-better-backtraces.patch +++ b/0061-make-better-backtraces.patch @@ -55,7 +55,7 @@ index 88f55e35c4..bda9fd1211 100644 library = { diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 5354f9613d..4b7c45a7b0 100644 +index 058c88ac3a..52ec0fafcd 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -142,6 +142,12 @@ kernel = { @@ -81,7 +81,7 @@ index 5354f9613d..4b7c45a7b0 100644 i386 = kern/i386/dl.c; i386_xen = kern/i386/dl.c; i386_xen_pvh = kern/i386/dl.c; -@@ -2398,15 +2401,12 @@ module = { +@@ -2399,15 +2402,12 @@ module = { module = { name = backtrace; @@ -897,7 +897,7 @@ index 03b916f053..701bf63abc 100644 ba codestart mov %o4, %o0 diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index 80e7a83edf..f512573c0d 100644 +index ee88e44e97..bfd29a3bf0 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -66,6 +66,7 @@ CLEANFILES += grub_script.yy.c grub_script.yy.h diff --git a/0063-normal-don-t-draw-our-startup-message-if-debug-is-se.patch b/0062-normal-don-t-draw-our-startup-message-if-debug-is-se.patch similarity index 100% rename from 0063-normal-don-t-draw-our-startup-message-if-debug-is-se.patch rename to 0062-normal-don-t-draw-our-startup-message-if-debug-is-se.patch diff --git a/0064-Work-around-some-minor-include-path-weirdnesses.patch b/0063-Work-around-some-minor-include-path-weirdnesses.patch similarity index 100% rename from 0064-Work-around-some-minor-include-path-weirdnesses.patch rename to 0063-Work-around-some-minor-include-path-weirdnesses.patch diff --git a/0065-Make-it-possible-to-enabled-build-id-sha1.patch b/0064-Make-it-possible-to-enabled-build-id-sha1.patch similarity index 100% rename from 0065-Make-it-possible-to-enabled-build-id-sha1.patch rename to 0064-Make-it-possible-to-enabled-build-id-sha1.patch diff --git a/0066-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch b/0065-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch similarity index 100% rename from 0066-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch rename to 0065-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch diff --git a/0067-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/0066-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch similarity index 100% rename from 0067-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch rename to 0066-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch diff --git a/0068-Fixup-for-newer-compiler.patch b/0067-Fixup-for-newer-compiler.patch similarity index 100% rename from 0068-Fixup-for-newer-compiler.patch rename to 0067-Fixup-for-newer-compiler.patch diff --git a/0069-Don-t-attempt-to-export-the-start-and-_start-symbols.patch b/0068-Don-t-attempt-to-export-the-start-and-_start-symbols.patch similarity index 100% rename from 0069-Don-t-attempt-to-export-the-start-and-_start-symbols.patch rename to 0068-Don-t-attempt-to-export-the-start-and-_start-symbols.patch diff --git a/0070-Fixup-for-newer-compiler.patch b/0069-Fixup-for-newer-compiler.patch similarity index 100% rename from 0070-Fixup-for-newer-compiler.patch rename to 0069-Fixup-for-newer-compiler.patch diff --git a/0071-Add-support-for-non-Ethernet-network-cards.patch b/0070-Add-support-for-non-Ethernet-network-cards.patch similarity index 100% rename from 0071-Add-support-for-non-Ethernet-network-cards.patch rename to 0070-Add-support-for-non-Ethernet-network-cards.patch diff --git a/0072-net-read-bracketed-ipv6-addrs-and-port-numbers.patch b/0071-net-read-bracketed-ipv6-addrs-and-port-numbers.patch similarity index 100% rename from 0072-net-read-bracketed-ipv6-addrs-and-port-numbers.patch rename to 0071-net-read-bracketed-ipv6-addrs-and-port-numbers.patch diff --git a/0073-bootp-New-net_bootp6-command.patch b/0072-bootp-New-net_bootp6-command.patch similarity index 100% rename from 0073-bootp-New-net_bootp6-command.patch rename to 0072-bootp-New-net_bootp6-command.patch diff --git a/0074-efinet-UEFI-IPv6-PXE-support.patch b/0073-efinet-UEFI-IPv6-PXE-support.patch similarity index 100% rename from 0074-efinet-UEFI-IPv6-PXE-support.patch rename to 0073-efinet-UEFI-IPv6-PXE-support.patch diff --git a/0075-grub.texi-Add-net_bootp6-doument.patch b/0074-grub.texi-Add-net_bootp6-doument.patch similarity index 100% rename from 0075-grub.texi-Add-net_bootp6-doument.patch rename to 0074-grub.texi-Add-net_bootp6-doument.patch diff --git a/0076-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch b/0075-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch similarity index 100% rename from 0076-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch rename to 0075-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch diff --git a/0077-efinet-Setting-network-from-UEFI-device-path.patch b/0076-efinet-Setting-network-from-UEFI-device-path.patch similarity index 100% rename from 0077-efinet-Setting-network-from-UEFI-device-path.patch rename to 0076-efinet-Setting-network-from-UEFI-device-path.patch diff --git a/0078-efinet-Setting-DNS-server-from-UEFI-protocol.patch b/0077-efinet-Setting-DNS-server-from-UEFI-protocol.patch similarity index 100% rename from 0078-efinet-Setting-DNS-server-from-UEFI-protocol.patch rename to 0077-efinet-Setting-DNS-server-from-UEFI-protocol.patch diff --git a/0079-Support-UEFI-networking-protocols.patch b/0078-Support-UEFI-networking-protocols.patch similarity index 99% rename from 0079-Support-UEFI-networking-protocols.patch rename to 0078-Support-UEFI-networking-protocols.patch index 740a9f8..145becf 100644 --- a/0079-Support-UEFI-networking-protocols.patch +++ b/0078-Support-UEFI-networking-protocols.patch @@ -57,10 +57,10 @@ Signed-off-by: Peter Jones create mode 100644 include/grub/net/efi.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 4b7c45a7b0..c40170f2dd 100644 +index 52ec0fafcd..12797336c9 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def -@@ -2299,6 +2299,12 @@ module = { +@@ -2300,6 +2300,12 @@ module = { common = hook/datehook.c; }; @@ -73,7 +73,7 @@ index 4b7c45a7b0..c40170f2dd 100644 module = { name = net; common = net/net.c; -@@ -2312,6 +2318,12 @@ module = { +@@ -2313,6 +2319,12 @@ module = { common = net/ethernet.c; common = net/arp.c; common = net/netbuff.c; diff --git a/0080-AUDIT-0-http-boot-tracker-bug.patch b/0079-AUDIT-0-http-boot-tracker-bug.patch similarity index 100% rename from 0080-AUDIT-0-http-boot-tracker-bug.patch rename to 0079-AUDIT-0-http-boot-tracker-bug.patch diff --git a/0081-grub-editenv-Add-incr-command-to-increment-integer-v.patch b/0080-grub-editenv-Add-incr-command-to-increment-integer-v.patch similarity index 100% rename from 0081-grub-editenv-Add-incr-command-to-increment-integer-v.patch rename to 0080-grub-editenv-Add-incr-command-to-increment-integer-v.patch diff --git a/0082-Add-auto-hide-menu-support.patch b/0081-Add-auto-hide-menu-support.patch similarity index 100% rename from 0082-Add-auto-hide-menu-support.patch rename to 0081-Add-auto-hide-menu-support.patch diff --git a/0083-Add-grub-set-bootflag-utility.patch b/0082-Add-grub-set-bootflag-utility.patch similarity index 100% rename from 0083-Add-grub-set-bootflag-utility.patch rename to 0082-Add-grub-set-bootflag-utility.patch diff --git a/0084-docs-Add-grub-boot-indeterminate.service-example.patch b/0083-docs-Add-grub-boot-indeterminate.service-example.patch similarity index 100% rename from 0084-docs-Add-grub-boot-indeterminate.service-example.patch rename to 0083-docs-Add-grub-boot-indeterminate.service-example.patch diff --git a/0085-gentpl-add-disable-support.patch b/0084-gentpl-add-disable-support.patch similarity index 100% rename from 0085-gentpl-add-disable-support.patch rename to 0084-gentpl-add-disable-support.patch diff --git a/0086-gentpl-add-pc-firmware-type.patch b/0085-gentpl-add-pc-firmware-type.patch similarity index 100% rename from 0086-gentpl-add-pc-firmware-type.patch rename to 0085-gentpl-add-pc-firmware-type.patch diff --git a/0087-efinet-also-use-the-firmware-acceleration-for-http.patch b/0086-efinet-also-use-the-firmware-acceleration-for-http.patch similarity index 100% rename from 0087-efinet-also-use-the-firmware-acceleration-for-http.patch rename to 0086-efinet-also-use-the-firmware-acceleration-for-http.patch diff --git a/0088-efi-http-Make-root_url-reflect-the-protocol-hostname.patch b/0087-efi-http-Make-root_url-reflect-the-protocol-hostname.patch similarity index 100% rename from 0088-efi-http-Make-root_url-reflect-the-protocol-hostname.patch rename to 0087-efi-http-Make-root_url-reflect-the-protocol-hostname.patch diff --git a/0089-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch b/0088-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch similarity index 100% rename from 0089-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch rename to 0088-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch diff --git a/0090-module-verifier-make-it-possible-to-run-checkers-on-.patch b/0089-module-verifier-make-it-possible-to-run-checkers-on-.patch similarity index 100% rename from 0090-module-verifier-make-it-possible-to-run-checkers-on-.patch rename to 0089-module-verifier-make-it-possible-to-run-checkers-on-.patch diff --git a/0091-Rework-how-the-fdt-command-builds.patch b/0090-Rework-how-the-fdt-command-builds.patch similarity index 97% rename from 0091-Rework-how-the-fdt-command-builds.patch rename to 0090-Rework-how-the-fdt-command-builds.patch index a374f90..8f41272 100644 --- a/0091-Rework-how-the-fdt-command-builds.patch +++ b/0090-Rework-how-the-fdt-command-builds.patch @@ -25,7 +25,7 @@ Signed-off-by: Robbie Harwood 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index c40170f2dd..84a3d89de9 100644 +index 12797336c9..4e7d90da76 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -177,7 +177,6 @@ kernel = { @@ -53,7 +53,7 @@ index c40170f2dd..84a3d89de9 100644 common = loader/linux.c; common = lib/cmdline.c; -@@ -1836,7 +1836,6 @@ module = { +@@ -1837,7 +1837,6 @@ module = { module = { name = fdt; efi = loader/efi/fdt.c; @@ -110,7 +110,7 @@ index e609c7e411..3514aa4a5b 100644 + #endif /* ! GRUB_FDT_HEADER */ diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index f512573c0d..dd49939aaa 100644 +index bfd29a3bf0..c2e8a82bce 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -76,6 +76,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h diff --git a/0092-Disable-non-wordsize-allocations-on-arm.patch b/0091-Disable-non-wordsize-allocations-on-arm.patch similarity index 100% rename from 0092-Disable-non-wordsize-allocations-on-arm.patch rename to 0091-Disable-non-wordsize-allocations-on-arm.patch diff --git a/0093-Prepend-prefix-when-HTTP-path-is-relative.patch b/0092-Prepend-prefix-when-HTTP-path-is-relative.patch similarity index 100% rename from 0093-Prepend-prefix-when-HTTP-path-is-relative.patch rename to 0092-Prepend-prefix-when-HTTP-path-is-relative.patch diff --git a/0094-Make-grub_error-more-verbose.patch b/0093-Make-grub_error-more-verbose.patch similarity index 100% rename from 0094-Make-grub_error-more-verbose.patch rename to 0093-Make-grub_error-more-verbose.patch diff --git a/0095-Make-reset-an-alias-for-the-reboot-command.patch b/0094-Make-reset-an-alias-for-the-reboot-command.patch similarity index 100% rename from 0095-Make-reset-an-alias-for-the-reboot-command.patch rename to 0094-Make-reset-an-alias-for-the-reboot-command.patch diff --git a/0096-Add-a-version-command.patch b/0095-Add-a-version-command.patch similarity index 99% rename from 0096-Add-a-version-command.patch rename to 0095-Add-a-version-command.patch index 10d40b3..18c355c 100644 --- a/0096-Add-a-version-command.patch +++ b/0095-Add-a-version-command.patch @@ -43,7 +43,7 @@ index 54462e0892..7b4e1854d3 100644 have_with_bootdir=n AC_ARG_WITH([bootdir], diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 84a3d89de9..498ca11762 100644 +index 4e7d90da76..4f203533f5 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -579,6 +579,11 @@ image = { diff --git a/0097-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch b/0096-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch similarity index 100% rename from 0097-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch rename to 0096-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch diff --git a/0098-arm-arm64-loader-Better-memory-allocation-and-error-.patch b/0097-arm-arm64-loader-Better-memory-allocation-and-error-.patch similarity index 100% rename from 0098-arm-arm64-loader-Better-memory-allocation-and-error-.patch rename to 0097-arm-arm64-loader-Better-memory-allocation-and-error-.patch diff --git a/0099-Try-to-pick-better-locations-for-kernel-and-initrd.patch b/0098-Try-to-pick-better-locations-for-kernel-and-initrd.patch similarity index 100% rename from 0099-Try-to-pick-better-locations-for-kernel-and-initrd.patch rename to 0098-Try-to-pick-better-locations-for-kernel-and-initrd.patch diff --git a/0100-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch b/0099-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch similarity index 98% rename from 0100-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch rename to 0099-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch index e94df4e..77db523 100644 --- a/0100-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch +++ b/0099-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch @@ -18,10 +18,10 @@ Signed-off-by: Peter Jones 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c -index eeea092752..f08a1bb841 100644 +index 0ff13bcaf8..d278c2921f 100644 --- a/grub-core/kern/emu/misc.c +++ b/grub-core/kern/emu/misc.c -@@ -189,7 +189,7 @@ grub_util_get_image_size (const char *path) +@@ -185,7 +185,7 @@ grub_util_get_image_size (const char *path) sz = ftello (f); if (sz < 0) grub_util_error (_("cannot open `%s': %s"), path, strerror (errno)); diff --git a/0101-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch b/0100-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch similarity index 100% rename from 0101-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch rename to 0100-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch diff --git a/0102-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch b/0101-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch similarity index 100% rename from 0102-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch rename to 0101-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch diff --git a/0103-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch b/0102-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch similarity index 100% rename from 0103-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch rename to 0102-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch diff --git a/0104-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch b/0103-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch similarity index 100% rename from 0104-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch rename to 0103-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch diff --git a/0105-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch b/0104-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch similarity index 100% rename from 0105-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch rename to 0104-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch diff --git a/0106-Fix-getroot.c-s-trampolines.patch b/0105-Fix-getroot.c-s-trampolines.patch similarity index 100% rename from 0106-Fix-getroot.c-s-trampolines.patch rename to 0105-Fix-getroot.c-s-trampolines.patch diff --git a/0107-Do-not-allow-stack-trampolines-anywhere.patch b/0106-Do-not-allow-stack-trampolines-anywhere.patch similarity index 100% rename from 0107-Do-not-allow-stack-trampolines-anywhere.patch rename to 0106-Do-not-allow-stack-trampolines-anywhere.patch diff --git a/0108-Reimplement-boot_counter.patch b/0107-Reimplement-boot_counter.patch similarity index 99% rename from 0108-Reimplement-boot_counter.patch rename to 0107-Reimplement-boot_counter.patch index 6104b87..d018de4 100644 --- a/0108-Reimplement-boot_counter.patch +++ b/0107-Reimplement-boot_counter.patch @@ -40,7 +40,7 @@ index d066652e9b..e10fe766d1 100644 name = '01_menu_auto_hide'; common = util/grub.d/01_menu_auto_hide.in; diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 498ca11762..1e15345107 100644 +index 4f203533f5..ea4d59f51b 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -398,6 +398,11 @@ kernel = { diff --git a/0109-Fix-menu-entry-selection-based-on-ID-and-title.patch b/0108-Fix-menu-entry-selection-based-on-ID-and-title.patch similarity index 100% rename from 0109-Fix-menu-entry-selection-based-on-ID-and-title.patch rename to 0108-Fix-menu-entry-selection-based-on-ID-and-title.patch diff --git a/0110-Make-the-menu-entry-users-option-argument-to-be-opti.patch b/0109-Make-the-menu-entry-users-option-argument-to-be-opti.patch similarity index 100% rename from 0110-Make-the-menu-entry-users-option-argument-to-be-opti.patch rename to 0109-Make-the-menu-entry-users-option-argument-to-be-opti.patch diff --git a/0111-Add-efi-export-env-and-efi-load-env-commands.patch b/0110-Add-efi-export-env-and-efi-load-env-commands.patch similarity index 99% rename from 0111-Add-efi-export-env-and-efi-load-env-commands.patch rename to 0110-Add-efi-export-env-and-efi-load-env-commands.patch index ac02876..33d2724 100644 --- a/0111-Add-efi-export-env-and-efi-load-env-commands.patch +++ b/0110-Add-efi-export-env-and-efi-load-env-commands.patch @@ -21,7 +21,7 @@ Signed-off-by: Peter Jones create mode 100644 grub-core/commands/efi/env.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 1e15345107..81fc274148 100644 +index ea4d59f51b..dc9fea6f44 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -820,6 +820,12 @@ module = { diff --git a/0112-Make-it-possible-to-subtract-conditions-from-debug.patch b/0111-Make-it-possible-to-subtract-conditions-from-debug.patch similarity index 100% rename from 0112-Make-it-possible-to-subtract-conditions-from-debug.patch rename to 0111-Make-it-possible-to-subtract-conditions-from-debug.patch diff --git a/0113-Export-all-variables-from-the-initial-context-when-c.patch b/0112-Export-all-variables-from-the-initial-context-when-c.patch similarity index 100% rename from 0113-Export-all-variables-from-the-initial-context-when-c.patch rename to 0112-Export-all-variables-from-the-initial-context-when-c.patch diff --git a/0114-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch b/0113-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch similarity index 100% rename from 0114-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch rename to 0113-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch diff --git a/0117-Don-t-assume-that-boot-commands-will-only-return-on-.patch b/0114-Don-t-assume-that-boot-commands-will-only-return-on-.patch similarity index 100% rename from 0117-Don-t-assume-that-boot-commands-will-only-return-on-.patch rename to 0114-Don-t-assume-that-boot-commands-will-only-return-on-.patch diff --git a/0115-Fix-systemctl-kexec-exit-status-check.patch b/0115-Fix-systemctl-kexec-exit-status-check.patch deleted file mode 100644 index 567e678..0000000 --- a/0115-Fix-systemctl-kexec-exit-status-check.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Tue, 9 Apr 2019 12:30:38 +0200 -Subject: [PATCH] Fix systemctl kexec exit status check - -There's always an error printed even when the systemctl kexec command does -succeed. That's because systemctl executes it asynchronously, but the emu -loader seems to expect it to be synchronous and that should never return. - -Also, it's wrong to test if kexecute == 1 since we already know that's the -case or otherwise the function wouldn't had called grub_fatal() earlier. - -Finally, systemctl kexec failing shouldn't be a fatal error since the emu -loader fallbacks to executing the kexec command in case of a failure. - -Signed-off-by: Javier Martinez Canillas ---- - grub-core/loader/emu/linux.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c -index fda9e00d24..5b85b225ee 100644 ---- a/grub-core/loader/emu/linux.c -+++ b/grub-core/loader/emu/linux.c -@@ -71,8 +71,10 @@ grub_linux_boot (void) - (kexecute==1) ? "do-or-die" : "just-in-case"); - rc = grub_util_exec (systemctl); - -- if (kexecute == 1) -- grub_fatal (N_("Error trying to perform 'systemctl kexec'")); -+ if (rc == GRUB_ERR_NONE) -+ return rc; -+ -+ grub_error (rc, N_("Error trying to perform 'systemctl kexec'")); - - /* need to check read-only root before resetting hard!? */ - grub_printf("Performing 'kexec -e'"); diff --git a/0118-grub-set-bootflag-Update-comment-about-running-as-ro.patch b/0115-grub-set-bootflag-Update-comment-about-running-as-ro.patch similarity index 100% rename from 0118-grub-set-bootflag-Update-comment-about-running-as-ro.patch rename to 0115-grub-set-bootflag-Update-comment-about-running-as-ro.patch diff --git a/0116-Print-grub-emu-linux-loader-messages-as-debug.patch b/0116-Print-grub-emu-linux-loader-messages-as-debug.patch deleted file mode 100644 index 2718a70..0000000 --- a/0116-Print-grub-emu-linux-loader-messages-as-debug.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Tue, 9 Apr 2019 12:42:37 +0200 -Subject: [PATCH] Print grub-emu linux loader messages as debug - -They just polute the output and should better be debug messages instead. - -Signed-off-by: Javier Martinez Canillas ---- - grub-core/loader/emu/linux.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c -index 5b85b225ee..22ab6af172 100644 ---- a/grub-core/loader/emu/linux.c -+++ b/grub-core/loader/emu/linux.c -@@ -50,7 +50,7 @@ grub_linux_boot (void) - initrd_param = grub_xasprintf("%s", ""); - } - -- grub_printf("%serforming 'kexec -l %s %s %s'\n", -+ grub_dprintf ("linux", "%serforming 'kexec -l %s %s %s'\n", - (kexecute) ? "P" : "Not p", - kernel_path, initrd_param, boot_cmdline); - -@@ -67,7 +67,7 @@ grub_linux_boot (void) - if (kexecute < 1) - grub_fatal (N_("Use '"PACKAGE"-emu --kexec' to force a system restart.")); - -- grub_printf("Performing 'systemctl kexec' (%s) ", -+ grub_dprintf ("linux", "Performing 'systemctl kexec' (%s) ", - (kexecute==1) ? "do-or-die" : "just-in-case"); - rc = grub_util_exec (systemctl); - diff --git a/0119-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch b/0116-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch similarity index 100% rename from 0119-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch rename to 0116-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch diff --git a/0120-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch b/0117-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch similarity index 100% rename from 0120-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch rename to 0117-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch diff --git a/0121-Add-start-symbol-for-RISC-V.patch b/0118-Add-start-symbol-for-RISC-V.patch similarity index 100% rename from 0121-Add-start-symbol-for-RISC-V.patch rename to 0118-Add-start-symbol-for-RISC-V.patch diff --git a/0122-bootstrap.conf-Force-autogen.sh-to-use-python3.patch b/0119-bootstrap.conf-Force-autogen.sh-to-use-python3.patch similarity index 100% rename from 0122-bootstrap.conf-Force-autogen.sh-to-use-python3.patch rename to 0119-bootstrap.conf-Force-autogen.sh-to-use-python3.patch diff --git a/0123-efi-http-Export-fw-http-_path-variables-to-make-them.patch b/0120-efi-http-Export-fw-http-_path-variables-to-make-them.patch similarity index 100% rename from 0123-efi-http-Export-fw-http-_path-variables-to-make-them.patch rename to 0120-efi-http-Export-fw-http-_path-variables-to-make-them.patch diff --git a/0124-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch b/0121-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch similarity index 100% rename from 0124-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch rename to 0121-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch diff --git a/0125-efi-net-Allow-to-specify-a-port-number-in-addresses.patch b/0122-efi-net-Allow-to-specify-a-port-number-in-addresses.patch similarity index 100% rename from 0125-efi-net-Allow-to-specify-a-port-number-in-addresses.patch rename to 0122-efi-net-Allow-to-specify-a-port-number-in-addresses.patch diff --git a/0126-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch b/0123-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch similarity index 100% rename from 0126-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch rename to 0123-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch diff --git a/0127-efi-net-Print-a-debug-message-if-parsing-the-address.patch b/0124-efi-net-Print-a-debug-message-if-parsing-the-address.patch similarity index 100% rename from 0127-efi-net-Print-a-debug-message-if-parsing-the-address.patch rename to 0124-efi-net-Print-a-debug-message-if-parsing-the-address.patch diff --git a/0128-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch b/0125-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch similarity index 100% rename from 0128-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch rename to 0125-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch diff --git a/0129-efi-Set-image-base-address-before-jumping-to-the-PE-.patch b/0126-efi-Set-image-base-address-before-jumping-to-the-PE-.patch similarity index 100% rename from 0129-efi-Set-image-base-address-before-jumping-to-the-PE-.patch rename to 0126-efi-Set-image-base-address-before-jumping-to-the-PE-.patch diff --git a/0130-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch b/0127-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch similarity index 100% rename from 0130-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch rename to 0127-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch diff --git a/0131-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch b/0128-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch similarity index 100% rename from 0131-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch rename to 0128-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch diff --git a/0132-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch b/0129-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch similarity index 100% rename from 0132-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch rename to 0129-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch diff --git a/0133-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch b/0130-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch similarity index 100% rename from 0133-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch rename to 0130-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch diff --git a/0134-efi-dhcp-fix-some-allocation-error-checking.patch b/0131-efi-dhcp-fix-some-allocation-error-checking.patch similarity index 100% rename from 0134-efi-dhcp-fix-some-allocation-error-checking.patch rename to 0131-efi-dhcp-fix-some-allocation-error-checking.patch diff --git a/0135-efi-http-fix-some-allocation-error-checking.patch b/0132-efi-http-fix-some-allocation-error-checking.patch similarity index 100% rename from 0135-efi-http-fix-some-allocation-error-checking.patch rename to 0132-efi-http-fix-some-allocation-error-checking.patch diff --git a/0136-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch b/0133-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch similarity index 100% rename from 0136-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch rename to 0133-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch diff --git a/0137-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch b/0134-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch similarity index 100% rename from 0137-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch rename to 0134-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch diff --git a/0138-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/0135-linuxefi-fail-kernel-validation-without-shim-protoco.patch similarity index 100% rename from 0138-linuxefi-fail-kernel-validation-without-shim-protoco.patch rename to 0135-linuxefi-fail-kernel-validation-without-shim-protoco.patch diff --git a/0139-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch b/0136-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch similarity index 100% rename from 0139-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch rename to 0136-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch diff --git a/0140-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch b/0137-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch similarity index 100% rename from 0140-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch rename to 0137-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch diff --git a/0141-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch b/0138-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch similarity index 100% rename from 0141-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch rename to 0138-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch diff --git a/0142-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch b/0139-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch similarity index 100% rename from 0142-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch rename to 0139-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch diff --git a/0143-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch b/0140-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch similarity index 100% rename from 0143-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch rename to 0140-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch diff --git a/0144-Add-systemd-integration-scripts-to-make-systemctl-re.patch b/0141-Add-systemd-integration-scripts-to-make-systemctl-re.patch similarity index 100% rename from 0144-Add-systemd-integration-scripts-to-make-systemctl-re.patch rename to 0141-Add-systemd-integration-scripts-to-make-systemctl-re.patch diff --git a/0145-systemd-integration.sh-Also-set-old-menu_show_once-g.patch b/0142-systemd-integration.sh-Also-set-old-menu_show_once-g.patch similarity index 100% rename from 0145-systemd-integration.sh-Also-set-old-menu_show_once-g.patch rename to 0142-systemd-integration.sh-Also-set-old-menu_show_once-g.patch diff --git a/0146-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch b/0143-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch similarity index 100% rename from 0146-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch rename to 0143-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch diff --git a/0147-grub-install-disable-support-for-EFI-platforms.patch b/0144-grub-install-disable-support-for-EFI-platforms.patch similarity index 100% rename from 0147-grub-install-disable-support-for-EFI-platforms.patch rename to 0144-grub-install-disable-support-for-EFI-platforms.patch diff --git a/0148-New-with-debug-timestamps-configure-flag-to-prepend-.patch b/0145-New-with-debug-timestamps-configure-flag-to-prepend-.patch similarity index 100% rename from 0148-New-with-debug-timestamps-configure-flag-to-prepend-.patch rename to 0145-New-with-debug-timestamps-configure-flag-to-prepend-.patch diff --git a/0149-Added-debug-statements-to-grub_disk_open-and-grub_di.patch b/0146-Added-debug-statements-to-grub_disk_open-and-grub_di.patch similarity index 100% rename from 0149-Added-debug-statements-to-grub_disk_open-and-grub_di.patch rename to 0146-Added-debug-statements-to-grub_disk_open-and-grub_di.patch diff --git a/0150-Introduce-function-grub_debug_is_enabled-void-return.patch b/0147-Introduce-function-grub_debug_is_enabled-void-return.patch similarity index 100% rename from 0150-Introduce-function-grub_debug_is_enabled-void-return.patch rename to 0147-Introduce-function-grub_debug_is_enabled-void-return.patch diff --git a/0151-Don-t-clear-screen-when-debugging-is-enabled.patch b/0148-Don-t-clear-screen-when-debugging-is-enabled.patch similarity index 100% rename from 0151-Don-t-clear-screen-when-debugging-is-enabled.patch rename to 0148-Don-t-clear-screen-when-debugging-is-enabled.patch diff --git a/0152-kern-file-Fix-error-handling-in-grub_file_open.patch b/0149-kern-file-Fix-error-handling-in-grub_file_open.patch similarity index 100% rename from 0152-kern-file-Fix-error-handling-in-grub_file_open.patch rename to 0149-kern-file-Fix-error-handling-in-grub_file_open.patch diff --git a/0153-grub_file_-instrumentation-new-file-debug-tag.patch b/0150-grub_file_-instrumentation-new-file-debug-tag.patch similarity index 100% rename from 0153-grub_file_-instrumentation-new-file-debug-tag.patch rename to 0150-grub_file_-instrumentation-new-file-debug-tag.patch diff --git a/0154-ieee1275-Avoiding-many-unecessary-open-close.patch b/0151-ieee1275-Avoiding-many-unecessary-open-close.patch similarity index 100% rename from 0154-ieee1275-Avoiding-many-unecessary-open-close.patch rename to 0151-ieee1275-Avoiding-many-unecessary-open-close.patch diff --git a/0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch b/0152-ieee1275-powerpc-implements-fibre-channel-discovery-.patch similarity index 100% rename from 0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch rename to 0152-ieee1275-powerpc-implements-fibre-channel-discovery-.patch diff --git a/0156-ieee1275-powerpc-enables-device-mapper-discovery.patch b/0153-ieee1275-powerpc-enables-device-mapper-discovery.patch similarity index 100% rename from 0156-ieee1275-powerpc-enables-device-mapper-discovery.patch rename to 0153-ieee1275-powerpc-enables-device-mapper-discovery.patch diff --git a/0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch b/0154-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch similarity index 100% rename from 0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch rename to 0154-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch diff --git a/0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch b/0155-Add-suport-for-signing-grub-with-an-appended-signatu.patch similarity index 100% rename from 0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch rename to 0155-Add-suport-for-signing-grub-with-an-appended-signatu.patch diff --git a/0159-docs-grub-Document-signing-grub-under-UEFI.patch b/0156-docs-grub-Document-signing-grub-under-UEFI.patch similarity index 100% rename from 0159-docs-grub-Document-signing-grub-under-UEFI.patch rename to 0156-docs-grub-Document-signing-grub-under-UEFI.patch diff --git a/0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch b/0157-docs-grub-Document-signing-grub-with-an-appended-sig.patch similarity index 100% rename from 0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch rename to 0157-docs-grub-Document-signing-grub-with-an-appended-sig.patch diff --git a/0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch b/0158-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch similarity index 100% rename from 0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch rename to 0158-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch diff --git a/0162-pgp-factor-out-rsa_pad.patch b/0159-pgp-factor-out-rsa_pad.patch similarity index 98% rename from 0162-pgp-factor-out-rsa_pad.patch rename to 0159-pgp-factor-out-rsa_pad.patch index f1e721d..43fd882 100644 --- a/0162-pgp-factor-out-rsa_pad.patch +++ b/0159-pgp-factor-out-rsa_pad.patch @@ -27,10 +27,10 @@ Signed-off-by: Daniel Axtens create mode 100644 include/grub/pkcs1_v15.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 81fc274148..97347ae76f 100644 +index dc9fea6f44..64cc758835 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def -@@ -2510,6 +2510,14 @@ module = { +@@ -2511,6 +2511,14 @@ module = { cppflags = '$(CPPFLAGS_GCRY)'; }; diff --git a/0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch b/0160-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch similarity index 100% rename from 0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch rename to 0160-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch diff --git a/0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch b/0161-posix_wrap-tweaks-in-preparation-for-libtasn1.patch similarity index 100% rename from 0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch rename to 0161-posix_wrap-tweaks-in-preparation-for-libtasn1.patch diff --git a/0165-libtasn1-import-libtasn1-4.16.0.patch b/0162-libtasn1-import-libtasn1-4.16.0.patch similarity index 100% rename from 0165-libtasn1-import-libtasn1-4.16.0.patch rename to 0162-libtasn1-import-libtasn1-4.16.0.patch diff --git a/0166-libtasn1-disable-code-not-needed-in-grub.patch b/0163-libtasn1-disable-code-not-needed-in-grub.patch similarity index 100% rename from 0166-libtasn1-disable-code-not-needed-in-grub.patch rename to 0163-libtasn1-disable-code-not-needed-in-grub.patch diff --git a/0167-libtasn1-changes-for-grub-compatibility.patch b/0164-libtasn1-changes-for-grub-compatibility.patch similarity index 100% rename from 0167-libtasn1-changes-for-grub-compatibility.patch rename to 0164-libtasn1-changes-for-grub-compatibility.patch diff --git a/0168-libtasn1-compile-into-asn1-module.patch b/0165-libtasn1-compile-into-asn1-module.patch similarity index 97% rename from 0168-libtasn1-compile-into-asn1-module.patch rename to 0165-libtasn1-compile-into-asn1-module.patch index b557403..0fb433f 100644 --- a/0168-libtasn1-compile-into-asn1-module.patch +++ b/0165-libtasn1-compile-into-asn1-module.patch @@ -14,10 +14,10 @@ Signed-off-by: Daniel Axtens create mode 100644 grub-core/lib/libtasn1_wrap/wrap.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 97347ae76f..21d2c54185 100644 +index 64cc758835..ea92468fa2 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def -@@ -2576,3 +2576,18 @@ module = { +@@ -2577,3 +2577,18 @@ module = { common = commands/i386/wrmsr.c; enable = x86; }; diff --git a/0169-test_asn1-test-module-for-libtasn1.patch b/0166-test_asn1-test-module-for-libtasn1.patch similarity index 99% rename from 0169-test_asn1-test-module-for-libtasn1.patch rename to 0166-test_asn1-test-module-for-libtasn1.patch index c95a00b..6cc13bd 100644 --- a/0169-test_asn1-test-module-for-libtasn1.patch +++ b/0166-test_asn1-test-module-for-libtasn1.patch @@ -68,10 +68,10 @@ index 6366442129..d04b3fe68a 100644 testcase; name = example_unit_test; diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 21d2c54185..b4aaccf7b5 100644 +index ea92468fa2..a32e6ada59 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def -@@ -2591,3 +2591,16 @@ module = { +@@ -2592,3 +2592,16 @@ module = { // -Wno-type-limits comes from libtasn1's configure.ac cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB) -I$(srcdir)/lib/libtasn1/lib -Wno-type-limits'; }; diff --git a/0170-grub-install-support-embedding-x509-certificates.patch b/0167-grub-install-support-embedding-x509-certificates.patch similarity index 100% rename from 0170-grub-install-support-embedding-x509-certificates.patch rename to 0167-grub-install-support-embedding-x509-certificates.patch diff --git a/0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch b/0168-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch similarity index 100% rename from 0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch rename to 0168-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch diff --git a/0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch b/0169-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch similarity index 100% rename from 0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch rename to 0169-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch diff --git a/0173-appended-signatures-support-verifying-appended-signa.patch b/0170-appended-signatures-support-verifying-appended-signa.patch similarity index 99% rename from 0173-appended-signatures-support-verifying-appended-signa.patch rename to 0170-appended-signatures-support-verifying-appended-signa.patch index 969293a..9e90d3b 100644 --- a/0173-appended-signatures-support-verifying-appended-signa.patch +++ b/0170-appended-signatures-support-verifying-appended-signa.patch @@ -30,7 +30,7 @@ Signed-off-by: Robbie Harwood create mode 100644 grub-core/commands/appendedsig/appendedsig.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index b4aaccf7b5..77321d218c 100644 +index a32e6ada59..6404384d90 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -980,6 +980,18 @@ module = { diff --git a/0174-appended-signatures-verification-tests.patch b/0171-appended-signatures-verification-tests.patch similarity index 99% rename from 0174-appended-signatures-verification-tests.patch rename to 0171-appended-signatures-verification-tests.patch index 982b3c8..b39a5af 100644 --- a/0174-appended-signatures-verification-tests.patch +++ b/0171-appended-signatures-verification-tests.patch @@ -17,10 +17,10 @@ Signed-off-by: Daniel Axtens create mode 100644 grub-core/tests/appended_signatures.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 77321d218c..6bddc841b8 100644 +index 6404384d90..9ea5fb38f1 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def -@@ -2161,6 +2161,12 @@ module = { +@@ -2162,6 +2162,12 @@ module = { common = tests/setjmp_test.c; }; diff --git a/0175-appended-signatures-documentation.patch b/0172-appended-signatures-documentation.patch similarity index 100% rename from 0175-appended-signatures-documentation.patch rename to 0172-appended-signatures-documentation.patch diff --git a/0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch b/0173-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch similarity index 98% rename from 0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch rename to 0173-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch index ed4c684..c90cc7e 100644 --- a/0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch +++ b/0173-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch @@ -15,7 +15,7 @@ Signed-off-by: Daniel Axtens 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 6bddc841b8..3f3459b2c7 100644 +index 9ea5fb38f1..4a57de975e 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -323,6 +323,7 @@ kernel = { diff --git a/0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch b/0174-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch similarity index 100% rename from 0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch rename to 0174-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch diff --git a/0178-ieee1275-claim-more-memory.patch b/0175-ieee1275-claim-more-memory.patch similarity index 100% rename from 0178-ieee1275-claim-more-memory.patch rename to 0175-ieee1275-claim-more-memory.patch diff --git a/0179-ieee1275-request-memory-with-ibm-client-architecture.patch b/0176-ieee1275-request-memory-with-ibm-client-architecture.patch similarity index 100% rename from 0179-ieee1275-request-memory-with-ibm-client-architecture.patch rename to 0176-ieee1275-request-memory-with-ibm-client-architecture.patch diff --git a/0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch b/0177-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch similarity index 100% rename from 0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch rename to 0177-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch diff --git a/0181-ieee1275-ofdisk-retry-on-open-failure.patch b/0178-ieee1275-ofdisk-retry-on-open-failure.patch similarity index 100% rename from 0181-ieee1275-ofdisk-retry-on-open-failure.patch rename to 0178-ieee1275-ofdisk-retry-on-open-failure.patch diff --git a/0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch b/0179-Allow-chainloading-EFI-apps-from-loop-mounts.patch similarity index 100% rename from 0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch rename to 0179-Allow-chainloading-EFI-apps-from-loop-mounts.patch diff --git a/0183-efinet-Add-DHCP-proxy-support.patch b/0180-efinet-Add-DHCP-proxy-support.patch similarity index 100% rename from 0183-efinet-Add-DHCP-proxy-support.patch rename to 0180-efinet-Add-DHCP-proxy-support.patch diff --git a/0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch b/0181-fs-ext2-Ignore-checksum-seed-incompat-feature.patch similarity index 100% rename from 0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch rename to 0181-fs-ext2-Ignore-checksum-seed-incompat-feature.patch diff --git a/0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch b/0182-Don-t-update-the-cmdline-when-generating-legacy-menu.patch similarity index 100% rename from 0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch rename to 0182-Don-t-update-the-cmdline-when-generating-legacy-menu.patch diff --git a/0186-Suppress-gettext-error-message.patch b/0183-Suppress-gettext-error-message.patch similarity index 100% rename from 0186-Suppress-gettext-error-message.patch rename to 0183-Suppress-gettext-error-message.patch diff --git a/0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch b/0184-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch similarity index 100% rename from 0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch rename to 0184-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch diff --git a/0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch b/0185-templates-Check-for-EFI-at-runtime-instead-of-config.patch similarity index 100% rename from 0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch rename to 0185-templates-Check-for-EFI-at-runtime-instead-of-config.patch diff --git a/0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch b/0186-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch similarity index 100% rename from 0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch rename to 0186-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch diff --git a/0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch b/0187-arm64-Fix-EFI-loader-kernel-image-allocation.patch similarity index 100% rename from 0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch rename to 0187-arm64-Fix-EFI-loader-kernel-image-allocation.patch diff --git a/0191-normal-main-Discover-the-device-to-read-the-config-f.patch b/0188-normal-main-Discover-the-device-to-read-the-config-f.patch similarity index 100% rename from 0191-normal-main-Discover-the-device-to-read-the-config-f.patch rename to 0188-normal-main-Discover-the-device-to-read-the-config-f.patch diff --git a/0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch b/0189-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch similarity index 100% rename from 0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch rename to 0189-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch diff --git a/0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch b/0190-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch similarity index 100% rename from 0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch rename to 0190-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch diff --git a/0194-Print-module-name-on-license-check-failure.patch b/0191-Print-module-name-on-license-check-failure.patch similarity index 100% rename from 0194-Print-module-name-on-license-check-failure.patch rename to 0191-Print-module-name-on-license-check-failure.patch diff --git a/0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch b/0192-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch similarity index 99% rename from 0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch rename to 0192-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch index 05417ed..216418b 100644 --- a/0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch +++ b/0192-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch @@ -79,7 +79,7 @@ Signed-off-by: Robbie Harwood 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 3f3459b2c7..6b00eb5557 100644 +index 4a57de975e..08ac0fb15f 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -89,7 +89,7 @@ kernel = { diff --git a/0196-grub-mkconfig-restore-umask-for-grub.cfg.patch b/0193-grub-mkconfig-restore-umask-for-grub.cfg.patch similarity index 100% rename from 0196-grub-mkconfig-restore-umask-for-grub.cfg.patch rename to 0193-grub-mkconfig-restore-umask-for-grub.cfg.patch diff --git a/0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch b/0194-fs-btrfs-Use-full-btrfs-bootloader-area.patch similarity index 100% rename from 0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch rename to 0194-fs-btrfs-Use-full-btrfs-bootloader-area.patch diff --git a/0198-Add-Fedora-location-of-DejaVu-SANS-font.patch b/0195-Add-Fedora-location-of-DejaVu-SANS-font.patch similarity index 100% rename from 0198-Add-Fedora-location-of-DejaVu-SANS-font.patch rename to 0195-Add-Fedora-location-of-DejaVu-SANS-font.patch diff --git a/0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch b/0196-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch similarity index 100% rename from 0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch rename to 0196-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch diff --git a/0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch b/0197-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch similarity index 100% rename from 0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch rename to 0197-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch diff --git a/0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch b/0198-EFI-console-Do-not-set-colorstate-until-the-first-te.patch similarity index 100% rename from 0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch rename to 0198-EFI-console-Do-not-set-colorstate-until-the-first-te.patch diff --git a/0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch b/0199-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch similarity index 100% rename from 0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch rename to 0199-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch diff --git a/0203-Use-visual-indentation-in-config.h.in.patch b/0200-Use-visual-indentation-in-config.h.in.patch similarity index 100% rename from 0203-Use-visual-indentation-in-config.h.in.patch rename to 0200-Use-visual-indentation-in-config.h.in.patch diff --git a/0204-Where-present-ensure-config-util.h-precedes-config.h.patch b/0201-Where-present-ensure-config-util.h-precedes-config.h.patch similarity index 99% rename from 0204-Where-present-ensure-config-util.h-precedes-config.h.patch rename to 0201-Where-present-ensure-config-util.h-precedes-config.h.patch index 626c4b4..22c2d9c 100644 --- a/0204-Where-present-ensure-config-util.h-precedes-config.h.patch +++ b/0201-Where-present-ensure-config-util.h-precedes-config.h.patch @@ -59,7 +59,7 @@ index 1668858703..8cb4608c3d 100644 #pragma GCC diagnostic ignored "-Wmissing-prototypes" #pragma GCC diagnostic ignored "-Wmissing-declarations" diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c -index 846fe9715e..3e7929cc4a 100644 +index 55ea5a11cc..12277c34d2 100644 --- a/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c @@ -16,8 +16,8 @@ diff --git a/0205-Drop-gnulib-fix-base64.patch.patch b/0202-Drop-gnulib-fix-base64.patch.patch similarity index 100% rename from 0205-Drop-gnulib-fix-base64.patch.patch rename to 0202-Drop-gnulib-fix-base64.patch.patch diff --git a/0206-Drop-gnulib-no-abort.patch.patch b/0203-Drop-gnulib-no-abort.patch.patch similarity index 100% rename from 0206-Drop-gnulib-no-abort.patch.patch rename to 0203-Drop-gnulib-no-abort.patch.patch diff --git a/0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch b/0204-Update-gnulib-version-and-drop-most-gnulib-patches.patch similarity index 99% rename from 0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch rename to 0204-Update-gnulib-version-and-drop-most-gnulib-patches.patch index f9fa207..c2c50f1 100644 --- a/0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch +++ b/0204-Update-gnulib-version-and-drop-most-gnulib-patches.patch @@ -61,7 +61,7 @@ index 40c4338bce..79f45ef1e1 100644 AC_CONFIG_HEADER([config-util.h]) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 6b00eb5557..39233096f2 100644 +index 08ac0fb15f..ec1ec5083b 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -762,6 +762,9 @@ module = { diff --git a/0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch b/0205-commands-search-Fix-bug-stopping-iteration-when-no-f.patch similarity index 100% rename from 0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch rename to 0205-commands-search-Fix-bug-stopping-iteration-when-no-f.patch diff --git a/0209-search-new-efidisk-only-option-on-EFI-systems.patch b/0206-search-new-efidisk-only-option-on-EFI-systems.patch similarity index 100% rename from 0209-search-new-efidisk-only-option-on-EFI-systems.patch rename to 0206-search-new-efidisk-only-option-on-EFI-systems.patch diff --git a/0210-efi-new-connectefi-command.patch b/0207-efi-new-connectefi-command.patch similarity index 99% rename from 0210-efi-new-connectefi-command.patch rename to 0207-efi-new-connectefi-command.patch index 55a49fd..f80de22 100644 --- a/0210-efi-new-connectefi-command.patch +++ b/0207-efi-new-connectefi-command.patch @@ -64,7 +64,7 @@ Signed-off-by: Robbie Harwood create mode 100644 grub-core/commands/efi/connectefi.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 39233096f2..3c0ac3b7bd 100644 +index ec1ec5083b..741a033978 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -836,6 +836,12 @@ module = { diff --git a/0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch b/0208-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch similarity index 100% rename from 0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch rename to 0208-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch diff --git a/0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch b/0209-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch similarity index 100% rename from 0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch rename to 0209-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch diff --git a/0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch b/0210-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch similarity index 100% rename from 0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch rename to 0210-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch diff --git a/0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch b/0211-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch similarity index 100% rename from 0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch rename to 0211-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch diff --git a/0215-powerpc-do-CAS-in-a-more-compatible-way.patch b/0212-powerpc-do-CAS-in-a-more-compatible-way.patch similarity index 100% rename from 0215-powerpc-do-CAS-in-a-more-compatible-way.patch rename to 0212-powerpc-do-CAS-in-a-more-compatible-way.patch diff --git a/0216-powerpc-prefix-detection-support-device-names-with-c.patch b/0213-powerpc-prefix-detection-support-device-names-with-c.patch similarity index 100% rename from 0216-powerpc-prefix-detection-support-device-names-with-c.patch rename to 0213-powerpc-prefix-detection-support-device-names-with-c.patch diff --git a/0217-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch b/0214-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch similarity index 99% rename from 0217-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch rename to 0214-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch index 3c73469..5e3a794 100644 --- a/0217-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch +++ b/0214-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch @@ -31,7 +31,7 @@ Signed-off-by: Stefan Berger create mode 100644 grub-core/commands/ieee1275/ibmvtpm.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 3c0ac3b7bd..2c1608bca4 100644 +index 741a033978..e038c5e6fd 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1175,6 +1175,13 @@ module = { diff --git a/0218-make-ofdisk_retries-optional.patch b/0215-make-ofdisk_retries-optional.patch similarity index 100% rename from 0218-make-ofdisk_retries-optional.patch rename to 0215-make-ofdisk_retries-optional.patch diff --git a/0219-loader-efi-chainloader-grub_load_and_start_image-doe.patch b/0216-loader-efi-chainloader-grub_load_and_start_image-doe.patch similarity index 100% rename from 0219-loader-efi-chainloader-grub_load_and_start_image-doe.patch rename to 0216-loader-efi-chainloader-grub_load_and_start_image-doe.patch diff --git a/0220-loader-efi-chainloader-simplify-the-loader-state.patch b/0217-loader-efi-chainloader-simplify-the-loader-state.patch similarity index 100% rename from 0220-loader-efi-chainloader-simplify-the-loader-state.patch rename to 0217-loader-efi-chainloader-simplify-the-loader-state.patch diff --git a/0221-commands-boot-Add-API-to-pass-context-to-loader.patch b/0218-commands-boot-Add-API-to-pass-context-to-loader.patch similarity index 100% rename from 0221-commands-boot-Add-API-to-pass-context-to-loader.patch rename to 0218-commands-boot-Add-API-to-pass-context-to-loader.patch diff --git a/0222-loader-efi-chainloader-Use-grub_loader_set_ex.patch b/0219-loader-efi-chainloader-Use-grub_loader_set_ex.patch similarity index 100% rename from 0222-loader-efi-chainloader-Use-grub_loader_set_ex.patch rename to 0219-loader-efi-chainloader-Use-grub_loader_set_ex.patch diff --git a/0223-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch b/0220-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch similarity index 100% rename from 0223-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch rename to 0220-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch diff --git a/0224-loader-i386-efi-linux-Use-grub_loader_set_ex.patch b/0221-loader-i386-efi-linux-Use-grub_loader_set_ex.patch similarity index 100% rename from 0224-loader-i386-efi-linux-Use-grub_loader_set_ex.patch rename to 0221-loader-i386-efi-linux-Use-grub_loader_set_ex.patch diff --git a/0225-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch b/0222-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch similarity index 100% rename from 0225-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch rename to 0222-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch diff --git a/0226-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch b/0223-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch similarity index 100% rename from 0226-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch rename to 0223-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch diff --git a/0227-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch b/0224-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch similarity index 100% rename from 0227-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch rename to 0224-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch diff --git a/0228-video-readers-png-Abort-sooner-if-a-read-operation-f.patch b/0225-video-readers-png-Abort-sooner-if-a-read-operation-f.patch similarity index 100% rename from 0228-video-readers-png-Abort-sooner-if-a-read-operation-f.patch rename to 0225-video-readers-png-Abort-sooner-if-a-read-operation-f.patch diff --git a/0229-video-readers-png-Refuse-to-handle-multiple-image-he.patch b/0226-video-readers-png-Refuse-to-handle-multiple-image-he.patch similarity index 100% rename from 0229-video-readers-png-Refuse-to-handle-multiple-image-he.patch rename to 0226-video-readers-png-Refuse-to-handle-multiple-image-he.patch diff --git a/0230-video-readers-png-Drop-greyscale-support-to-fix-heap.patch b/0227-video-readers-png-Drop-greyscale-support-to-fix-heap.patch similarity index 100% rename from 0230-video-readers-png-Drop-greyscale-support-to-fix-heap.patch rename to 0227-video-readers-png-Drop-greyscale-support-to-fix-heap.patch diff --git a/0231-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch b/0228-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch similarity index 100% rename from 0231-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch rename to 0228-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch diff --git a/0232-video-readers-png-Sanity-check-some-huffman-codes.patch b/0229-video-readers-png-Sanity-check-some-huffman-codes.patch similarity index 100% rename from 0232-video-readers-png-Sanity-check-some-huffman-codes.patch rename to 0229-video-readers-png-Sanity-check-some-huffman-codes.patch diff --git a/0233-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch b/0230-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch similarity index 100% rename from 0233-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch rename to 0230-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch diff --git a/0234-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch b/0231-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch similarity index 100% rename from 0234-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch rename to 0231-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch diff --git a/0235-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch b/0232-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch similarity index 100% rename from 0235-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch rename to 0232-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch diff --git a/0236-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch b/0233-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch similarity index 100% rename from 0236-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch rename to 0233-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch diff --git a/0237-normal-charset-Fix-array-out-of-bounds-formatting-un.patch b/0234-normal-charset-Fix-array-out-of-bounds-formatting-un.patch similarity index 100% rename from 0237-normal-charset-Fix-array-out-of-bounds-formatting-un.patch rename to 0234-normal-charset-Fix-array-out-of-bounds-formatting-un.patch diff --git a/0238-net-netbuff-Block-overly-large-netbuff-allocs.patch b/0235-net-netbuff-Block-overly-large-netbuff-allocs.patch similarity index 100% rename from 0238-net-netbuff-Block-overly-large-netbuff-allocs.patch rename to 0235-net-netbuff-Block-overly-large-netbuff-allocs.patch diff --git a/0239-net-ip-Do-IP-fragment-maths-safely.patch b/0236-net-ip-Do-IP-fragment-maths-safely.patch similarity index 100% rename from 0239-net-ip-Do-IP-fragment-maths-safely.patch rename to 0236-net-ip-Do-IP-fragment-maths-safely.patch diff --git a/0240-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch b/0237-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch similarity index 100% rename from 0240-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch rename to 0237-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch diff --git a/0241-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch b/0238-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch similarity index 100% rename from 0241-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch rename to 0238-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch diff --git a/0242-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch b/0239-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch similarity index 100% rename from 0242-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch rename to 0239-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch diff --git a/0243-net-tftp-Avoid-a-trivial-UAF.patch b/0240-net-tftp-Avoid-a-trivial-UAF.patch similarity index 100% rename from 0243-net-tftp-Avoid-a-trivial-UAF.patch rename to 0240-net-tftp-Avoid-a-trivial-UAF.patch diff --git a/0244-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch b/0241-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch similarity index 100% rename from 0244-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch rename to 0241-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch diff --git a/0245-net-http-Fix-OOB-write-for-split-http-headers.patch b/0242-net-http-Fix-OOB-write-for-split-http-headers.patch similarity index 100% rename from 0245-net-http-Fix-OOB-write-for-split-http-headers.patch rename to 0242-net-http-Fix-OOB-write-for-split-http-headers.patch diff --git a/0246-net-http-Error-out-on-headers-with-LF-without-CR.patch b/0243-net-http-Error-out-on-headers-with-LF-without-CR.patch similarity index 100% rename from 0246-net-http-Error-out-on-headers-with-LF-without-CR.patch rename to 0243-net-http-Error-out-on-headers-with-LF-without-CR.patch diff --git a/0247-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch b/0244-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch similarity index 100% rename from 0247-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch rename to 0244-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch diff --git a/0248-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch b/0245-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch similarity index 100% rename from 0248-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch rename to 0245-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch diff --git a/0249-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch b/0246-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch similarity index 100% rename from 0249-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch rename to 0246-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch diff --git a/0250-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch b/0247-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch similarity index 100% rename from 0250-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch rename to 0247-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch diff --git a/0251-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch b/0248-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch similarity index 100% rename from 0251-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch rename to 0248-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch diff --git a/0252-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch b/0249-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch similarity index 100% rename from 0252-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch rename to 0249-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch diff --git a/0253-misc-Make-grub_min-and-grub_max-more-resilient.patch b/0250-misc-Make-grub_min-and-grub_max-more-resilient.patch similarity index 100% rename from 0253-misc-Make-grub_min-and-grub_max-more-resilient.patch rename to 0250-misc-Make-grub_min-and-grub_max-more-resilient.patch diff --git a/0254-ReiserFS-switch-to-using-grub_min-grub_max.patch b/0251-ReiserFS-switch-to-using-grub_min-grub_max.patch similarity index 100% rename from 0254-ReiserFS-switch-to-using-grub_min-grub_max.patch rename to 0251-ReiserFS-switch-to-using-grub_min-grub_max.patch diff --git a/0255-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch b/0252-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch similarity index 100% rename from 0255-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch rename to 0252-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch diff --git a/0256-modules-make-.module_license-read-only.patch b/0253-modules-make-.module_license-read-only.patch similarity index 100% rename from 0256-modules-make-.module_license-read-only.patch rename to 0253-modules-make-.module_license-read-only.patch diff --git a/0257-modules-strip-.llvm_addrsig-sections-and-similar.patch b/0254-modules-strip-.llvm_addrsig-sections-and-similar.patch similarity index 100% rename from 0257-modules-strip-.llvm_addrsig-sections-and-similar.patch rename to 0254-modules-strip-.llvm_addrsig-sections-and-similar.patch diff --git a/0258-modules-Don-t-allocate-space-for-non-allocable-secti.patch b/0255-modules-Don-t-allocate-space-for-non-allocable-secti.patch similarity index 100% rename from 0258-modules-Don-t-allocate-space-for-non-allocable-secti.patch rename to 0255-modules-Don-t-allocate-space-for-non-allocable-secti.patch diff --git a/0259-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 0259-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/0260-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch b/0257-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch similarity index 100% rename from 0260-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch rename to 0257-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch diff --git a/0261-modules-load-module-sections-at-page-aligned-address.patch b/0258-modules-load-module-sections-at-page-aligned-address.patch similarity index 100% rename from 0261-modules-load-module-sections-at-page-aligned-address.patch rename to 0258-modules-load-module-sections-at-page-aligned-address.patch diff --git a/0262-nx-add-memory-attribute-get-set-API.patch b/0259-nx-add-memory-attribute-get-set-API.patch similarity index 100% rename from 0262-nx-add-memory-attribute-get-set-API.patch rename to 0259-nx-add-memory-attribute-get-set-API.patch diff --git a/0263-nx-set-page-permissions-for-loaded-modules.patch b/0260-nx-set-page-permissions-for-loaded-modules.patch similarity index 100% rename from 0263-nx-set-page-permissions-for-loaded-modules.patch rename to 0260-nx-set-page-permissions-for-loaded-modules.patch diff --git a/0264-nx-set-attrs-in-our-kernel-loaders.patch b/0261-nx-set-attrs-in-our-kernel-loaders.patch similarity index 100% rename from 0264-nx-set-attrs-in-our-kernel-loaders.patch rename to 0261-nx-set-attrs-in-our-kernel-loaders.patch diff --git a/0265-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch b/0262-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch similarity index 100% rename from 0265-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch rename to 0262-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch diff --git a/0266-grub-probe-document-the-behavior-of-multiple-v.patch b/0263-grub-probe-document-the-behavior-of-multiple-v.patch similarity index 100% rename from 0266-grub-probe-document-the-behavior-of-multiple-v.patch rename to 0263-grub-probe-document-the-behavior-of-multiple-v.patch diff --git a/0267-grub_fs_probe-dprint-errors-from-filesystems.patch b/0264-grub_fs_probe-dprint-errors-from-filesystems.patch similarity index 100% rename from 0267-grub_fs_probe-dprint-errors-from-filesystems.patch rename to 0264-grub_fs_probe-dprint-errors-from-filesystems.patch diff --git a/0268-fs-fat-don-t-error-when-mtime-is-0.patch b/0265-fs-fat-don-t-error-when-mtime-is-0.patch similarity index 100% rename from 0268-fs-fat-don-t-error-when-mtime-is-0.patch rename to 0265-fs-fat-don-t-error-when-mtime-is-0.patch diff --git a/0269-Make-debug-file-show-which-file-filters-get-run.patch b/0266-Make-debug-file-show-which-file-filters-get-run.patch similarity index 100% rename from 0269-Make-debug-file-show-which-file-filters-get-run.patch rename to 0266-Make-debug-file-show-which-file-filters-get-run.patch diff --git a/0270-efi-use-enumerated-array-positions-for-our-allocatio.patch b/0267-efi-use-enumerated-array-positions-for-our-allocatio.patch similarity index 100% rename from 0270-efi-use-enumerated-array-positions-for-our-allocatio.patch rename to 0267-efi-use-enumerated-array-positions-for-our-allocatio.patch diff --git a/0271-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch b/0268-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch similarity index 100% rename from 0271-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch rename to 0268-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch diff --git a/0272-efi-allocate-the-initrd-within-the-bounds-expressed-.patch b/0269-efi-allocate-the-initrd-within-the-bounds-expressed-.patch similarity index 100% rename from 0272-efi-allocate-the-initrd-within-the-bounds-expressed-.patch rename to 0269-efi-allocate-the-initrd-within-the-bounds-expressed-.patch diff --git a/0273-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch b/0270-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch similarity index 100% rename from 0273-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch rename to 0270-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch diff --git a/0274-BLS-create-etc-kernel-cmdline-during-mkconfig.patch b/0271-BLS-create-etc-kernel-cmdline-during-mkconfig.patch similarity index 100% rename from 0274-BLS-create-etc-kernel-cmdline-during-mkconfig.patch rename to 0271-BLS-create-etc-kernel-cmdline-during-mkconfig.patch diff --git a/0275-squish-don-t-dup-rhgb-quiet-check-mtimes.patch b/0272-squish-don-t-dup-rhgb-quiet-check-mtimes.patch similarity index 100% rename from 0275-squish-don-t-dup-rhgb-quiet-check-mtimes.patch rename to 0272-squish-don-t-dup-rhgb-quiet-check-mtimes.patch diff --git a/0276-squish-give-up-on-rhgb-quiet.patch b/0273-squish-give-up-on-rhgb-quiet.patch similarity index 100% rename from 0276-squish-give-up-on-rhgb-quiet.patch rename to 0273-squish-give-up-on-rhgb-quiet.patch diff --git a/0277-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch b/0274-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch similarity index 100% rename from 0277-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch rename to 0274-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch diff --git a/0278-ieee1275-implement-vec5-for-cas-negotiation.patch b/0275-ieee1275-implement-vec5-for-cas-negotiation.patch similarity index 100% rename from 0278-ieee1275-implement-vec5-for-cas-negotiation.patch rename to 0275-ieee1275-implement-vec5-for-cas-negotiation.patch diff --git a/0279-blscfg-Don-t-root-device-in-emu-builds.patch b/0276-blscfg-Don-t-root-device-in-emu-builds.patch similarity index 100% rename from 0279-blscfg-Don-t-root-device-in-emu-builds.patch rename to 0276-blscfg-Don-t-root-device-in-emu-builds.patch diff --git a/0280-loader-arm64-linux-Remove-magic-number-header-field-.patch b/0277-loader-arm64-linux-Remove-magic-number-header-field-.patch similarity index 100% rename from 0280-loader-arm64-linux-Remove-magic-number-header-field-.patch rename to 0277-loader-arm64-linux-Remove-magic-number-header-field-.patch diff --git a/0281-Correct-BSS-zeroing-on-aarch64.patch b/0278-Correct-BSS-zeroing-on-aarch64.patch similarity index 100% rename from 0281-Correct-BSS-zeroing-on-aarch64.patch rename to 0278-Correct-BSS-zeroing-on-aarch64.patch diff --git a/0282-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch b/0279-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch similarity index 100% rename from 0282-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch rename to 0279-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch diff --git a/0283-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch b/0280-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch similarity index 100% rename from 0283-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch rename to 0280-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch diff --git a/0284-commands-efi-tpm-Refine-the-status-of-log-event.patch b/0281-commands-efi-tpm-Refine-the-status-of-log-event.patch similarity index 100% rename from 0284-commands-efi-tpm-Refine-the-status-of-log-event.patch rename to 0281-commands-efi-tpm-Refine-the-status-of-log-event.patch diff --git a/0285-commands-efi-tpm-Use-grub_strcpy-instead-of-grub_mem.patch b/0282-commands-efi-tpm-Use-grub_strcpy-instead-of-grub_mem.patch similarity index 100% rename from 0285-commands-efi-tpm-Use-grub_strcpy-instead-of-grub_mem.patch rename to 0282-commands-efi-tpm-Use-grub_strcpy-instead-of-grub_mem.patch diff --git a/0286-efi-tpm-Add-EFI_CC_MEASUREMENT_PROTOCOL-support.patch b/0283-efi-tpm-Add-EFI_CC_MEASUREMENT_PROTOCOL-support.patch similarity index 100% rename from 0286-efi-tpm-Add-EFI_CC_MEASUREMENT_PROTOCOL-support.patch rename to 0283-efi-tpm-Add-EFI_CC_MEASUREMENT_PROTOCOL-support.patch diff --git a/0287-font-Reject-glyphs-exceeds-font-max_glyph_width-or-f.patch b/0284-font-Reject-glyphs-exceeds-font-max_glyph_width-or-f.patch similarity index 100% rename from 0287-font-Reject-glyphs-exceeds-font-max_glyph_width-or-f.patch rename to 0284-font-Reject-glyphs-exceeds-font-max_glyph_width-or-f.patch diff --git a/0288-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch b/0285-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch similarity index 100% rename from 0288-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch rename to 0285-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch diff --git a/0289-font-Fix-several-integer-overflows-in-grub_font_cons.patch b/0286-font-Fix-several-integer-overflows-in-grub_font_cons.patch similarity index 100% rename from 0289-font-Fix-several-integer-overflows-in-grub_font_cons.patch rename to 0286-font-Fix-several-integer-overflows-in-grub_font_cons.patch diff --git a/0290-font-Remove-grub_font_dup_glyph.patch b/0287-font-Remove-grub_font_dup_glyph.patch similarity index 100% rename from 0290-font-Remove-grub_font_dup_glyph.patch rename to 0287-font-Remove-grub_font_dup_glyph.patch diff --git a/0291-font-Fix-integer-overflow-in-ensure_comb_space.patch b/0288-font-Fix-integer-overflow-in-ensure_comb_space.patch similarity index 100% rename from 0291-font-Fix-integer-overflow-in-ensure_comb_space.patch rename to 0288-font-Fix-integer-overflow-in-ensure_comb_space.patch diff --git a/0292-font-Fix-integer-overflow-in-BMP-index.patch b/0289-font-Fix-integer-overflow-in-BMP-index.patch similarity index 100% rename from 0292-font-Fix-integer-overflow-in-BMP-index.patch rename to 0289-font-Fix-integer-overflow-in-BMP-index.patch diff --git a/0293-font-Fix-integer-underflow-in-binary-search-of-char-.patch b/0290-font-Fix-integer-underflow-in-binary-search-of-char-.patch similarity index 100% rename from 0293-font-Fix-integer-underflow-in-binary-search-of-char-.patch rename to 0290-font-Fix-integer-underflow-in-binary-search-of-char-.patch diff --git a/0294-kern-efi-sb-Enforce-verification-of-font-files.patch b/0291-kern-efi-sb-Enforce-verification-of-font-files.patch similarity index 100% rename from 0294-kern-efi-sb-Enforce-verification-of-font-files.patch rename to 0291-kern-efi-sb-Enforce-verification-of-font-files.patch diff --git a/0295-fbutil-Fix-integer-overflow.patch b/0292-fbutil-Fix-integer-overflow.patch similarity index 100% rename from 0295-fbutil-Fix-integer-overflow.patch rename to 0292-fbutil-Fix-integer-overflow.patch diff --git a/0296-font-Fix-an-integer-underflow-in-blit_comb.patch b/0293-font-Fix-an-integer-underflow-in-blit_comb.patch similarity index 100% rename from 0296-font-Fix-an-integer-underflow-in-blit_comb.patch rename to 0293-font-Fix-an-integer-underflow-in-blit_comb.patch diff --git a/0297-font-Harden-grub_font_blit_glyph-and-grub_font_blit_.patch b/0294-font-Harden-grub_font_blit_glyph-and-grub_font_blit_.patch similarity index 100% rename from 0297-font-Harden-grub_font_blit_glyph-and-grub_font_blit_.patch rename to 0294-font-Harden-grub_font_blit_glyph-and-grub_font_blit_.patch diff --git a/0298-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch b/0295-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch similarity index 100% rename from 0298-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch rename to 0295-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch diff --git a/0299-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch b/0296-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch similarity index 100% rename from 0299-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch rename to 0296-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch diff --git a/0300-font-Try-opening-fonts-from-the-bundled-memdisk.patch b/0297-font-Try-opening-fonts-from-the-bundled-memdisk.patch similarity index 100% rename from 0300-font-Try-opening-fonts-from-the-bundled-memdisk.patch rename to 0297-font-Try-opening-fonts-from-the-bundled-memdisk.patch diff --git a/0298-Correction-in-vector-5-values.patch b/0298-Correction-in-vector-5-values.patch new file mode 100644 index 0000000..9be1f4a --- /dev/null +++ b/0298-Correction-in-vector-5-values.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Avnish Chouhan +Date: Tue, 22 Nov 2022 08:01:47 -0500 +Subject: [PATCH] Correction in vector 5 values + +This patch is to update the vector 5 values which is troubling some +machines to bootup properly. Max out the values of all the properties of +Vector 5 (similar to vector 2) except max cpu property, which were set +as 0 earlier. + +Signed-off-by: Avnish Chouhan +[rharwood: rewrap comit message] +Signed-off-by: Robbie Harwood +--- + grub-core/kern/ieee1275/init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c +index 6a51c9efab..28a3bd4621 100644 +--- a/grub-core/kern/ieee1275/init.c ++++ b/grub-core/kern/ieee1275/init.c +@@ -376,7 +376,7 @@ grub_ieee1275_ibm_cas (void) + .vec4 = 0x0001, // set required minimum capacity % to the lowest value + .vec5_size = 1 + sizeof(struct option_vector5) - 2, + .vec5 = { +- 0, 0, 0, 0, 0, 0, 0, 0, 256 ++ -1, -1, -1, -1, -1, -1, -1, -1, 256 + } + }; + diff --git a/0301-mm-Clarify-grub_real_malloc.patch b/0299-mm-Clarify-grub_real_malloc.patch similarity index 100% rename from 0301-mm-Clarify-grub_real_malloc.patch rename to 0299-mm-Clarify-grub_real_malloc.patch diff --git a/0302-mm-grub_real_malloc-Make-small-allocs-comment-match-.patch b/0300-mm-grub_real_malloc-Make-small-allocs-comment-match-.patch similarity index 100% rename from 0302-mm-grub_real_malloc-Make-small-allocs-comment-match-.patch rename to 0300-mm-grub_real_malloc-Make-small-allocs-comment-match-.patch diff --git a/0303-mm-Document-grub_free.patch b/0301-mm-Document-grub_free.patch similarity index 100% rename from 0303-mm-Document-grub_free.patch rename to 0301-mm-Document-grub_free.patch diff --git a/0304-mm-Document-grub_mm_init_region.patch b/0302-mm-Document-grub_mm_init_region.patch similarity index 100% rename from 0304-mm-Document-grub_mm_init_region.patch rename to 0302-mm-Document-grub_mm_init_region.patch diff --git a/0305-mm-Document-GRUB-internal-memory-management-structur.patch b/0303-mm-Document-GRUB-internal-memory-management-structur.patch similarity index 100% rename from 0305-mm-Document-GRUB-internal-memory-management-structur.patch rename to 0303-mm-Document-GRUB-internal-memory-management-structur.patch diff --git a/0306-mm-Assert-that-we-preserve-header-vs-region-alignmen.patch b/0304-mm-Assert-that-we-preserve-header-vs-region-alignmen.patch similarity index 100% rename from 0306-mm-Assert-that-we-preserve-header-vs-region-alignmen.patch rename to 0304-mm-Assert-that-we-preserve-header-vs-region-alignmen.patch diff --git a/0307-mm-When-adding-a-region-merge-with-region-after-as-w.patch b/0305-mm-When-adding-a-region-merge-with-region-after-as-w.patch similarity index 100% rename from 0307-mm-When-adding-a-region-merge-with-region-after-as-w.patch rename to 0305-mm-When-adding-a-region-merge-with-region-after-as-w.patch diff --git a/0308-mm-Debug-support-for-region-operations.patch b/0306-mm-Debug-support-for-region-operations.patch similarity index 100% rename from 0308-mm-Debug-support-for-region-operations.patch rename to 0306-mm-Debug-support-for-region-operations.patch diff --git a/0309-mm-Drop-unused-unloading-of-modules-on-OOM.patch b/0307-mm-Drop-unused-unloading-of-modules-on-OOM.patch similarity index 100% rename from 0309-mm-Drop-unused-unloading-of-modules-on-OOM.patch rename to 0307-mm-Drop-unused-unloading-of-modules-on-OOM.patch diff --git a/0310-mm-Allow-dynamically-requesting-additional-memory-re.patch b/0308-mm-Allow-dynamically-requesting-additional-memory-re.patch similarity index 100% rename from 0310-mm-Allow-dynamically-requesting-additional-memory-re.patch rename to 0308-mm-Allow-dynamically-requesting-additional-memory-re.patch diff --git a/0311-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch b/0309-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch similarity index 100% rename from 0311-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch rename to 0309-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch diff --git a/0312-kern-efi-mm-Extract-function-to-add-memory-regions.patch b/0310-kern-efi-mm-Extract-function-to-add-memory-regions.patch similarity index 100% rename from 0312-kern-efi-mm-Extract-function-to-add-memory-regions.patch rename to 0310-kern-efi-mm-Extract-function-to-add-memory-regions.patch diff --git a/0313-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch b/0311-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch similarity index 100% rename from 0313-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch rename to 0311-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch diff --git a/0314-kern-efi-mm-Implement-runtime-addition-of-pages.patch b/0312-kern-efi-mm-Implement-runtime-addition-of-pages.patch similarity index 100% rename from 0314-kern-efi-mm-Implement-runtime-addition-of-pages.patch rename to 0312-kern-efi-mm-Implement-runtime-addition-of-pages.patch diff --git a/0315-efi-Increase-default-memory-allocation-to-32-MiB.patch b/0313-efi-Increase-default-memory-allocation-to-32-MiB.patch similarity index 100% rename from 0315-efi-Increase-default-memory-allocation-to-32-MiB.patch rename to 0313-efi-Increase-default-memory-allocation-to-32-MiB.patch diff --git a/0316-mm-Try-invalidate-disk-caches-last-when-out-of-memor.patch b/0314-mm-Try-invalidate-disk-caches-last-when-out-of-memor.patch similarity index 100% rename from 0316-mm-Try-invalidate-disk-caches-last-when-out-of-memor.patch rename to 0314-mm-Try-invalidate-disk-caches-last-when-out-of-memor.patch diff --git a/0317-ppc64le-signed-boot-media-changes.patch b/0315-ppc64le-signed-boot-media-changes.patch similarity index 100% rename from 0317-ppc64le-signed-boot-media-changes.patch rename to 0315-ppc64le-signed-boot-media-changes.patch diff --git a/0318-core-Fix-several-implicit-function-declarations.patch b/0316-core-Fix-several-implicit-function-declarations.patch similarity index 100% rename from 0318-core-Fix-several-implicit-function-declarations.patch rename to 0316-core-Fix-several-implicit-function-declarations.patch diff --git a/0060-Add-linux-and-initrd-commands-for-grub-emu.patch b/0317-loader-Add-support-for-grub-emu-to-kexec-Linux-menu-.patch similarity index 51% rename from 0060-Add-linux-and-initrd-commands-for-grub-emu.patch rename to 0317-loader-Add-support-for-grub-emu-to-kexec-Linux-menu-.patch index 419fde3..61fe876 100644 --- a/0060-Add-linux-and-initrd-commands-for-grub-emu.patch +++ b/0317-loader-Add-support-for-grub-emu-to-kexec-Linux-menu-.patch @@ -1,46 +1,70 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Raymund Will -Date: Tue, 6 Feb 2018 09:09:00 +0100 -Subject: [PATCH] Add linux and initrd commands for grub-emu +Date: Mon, 24 Oct 2022 14:33:50 -0400 +Subject: [PATCH] loader: Add support for grub-emu to kexec Linux menu entries -When using grub-emu, the linux and initrd commands are used as arguments -to the kexec command line tool, to allow booting the selected menu entry. +The GRUB emulator is used as a debugging utility but it could also be +used as a user-space bootloader if there is support to boot an operating +system. + +The Linux kernel is already able to (re)boot another kernel via the +kexec boot mechanism. So the grub-emu tool could rely on this feature +and have linux and initrd commands that are used to pass a kernel, +initramfs image and command line parameters to kexec for booting +a selected menu entry. + +By default the systemctl kexec option is used so systemd can shutdown +all of the running services before doing a reboot using kexec. But if +this is not present, it can fall back to executing the kexec user-space +tool directly. The ability to force a kexec-reboot when systemctl kexec +fails must only be used in controlled environments to avoid possible +filesystem corruption and data loss. Signed-off-by: Raymund Will +Signed-off-by: John Jolly +Signed-off-by: Javier Martinez Canillas Signed-off-by: Robbie Harwood +Reviewed-by: Daniel Kiper +(cherry picked from commit e364307f6acc2f631b4c1fefda0791b9ce1f205f) +[rharwood: conflicts around makefile and grub_exit return code] --- - grub-core/Makefile.core.def | 1 - + grub-core/Makefile.core.def | 3 - grub-core/kern/emu/main.c | 4 + grub-core/kern/emu/misc.c | 18 ++++- - grub-core/loader/emu/linux.c | 172 +++++++++++++++++++++++++++++++++++++++++++ + grub-core/loader/emu/linux.c | 178 +++++++++++++++++++++++++++++++++++++++++++ include/grub/emu/exec.h | 4 +- include/grub/emu/hostfile.h | 3 +- include/grub/emu/misc.h | 3 + + docs/grub.texi | 30 ++++++-- grub-core/Makefile.am | 1 + - 8 files changed, 202 insertions(+), 4 deletions(-) + 9 files changed, 230 insertions(+), 14 deletions(-) create mode 100644 grub-core/loader/emu/linux.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 058c88ac3a..5354f9613d 100644 +index e038c5e6fd..02ea718652 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def -@@ -1826,7 +1826,6 @@ module = { - +@@ -1871,11 +1871,8 @@ module = { + riscv32 = loader/riscv/linux.c; + riscv64 = loader/riscv/linux.c; + emu = loader/emu/linux.c; +- common = loader/linux.c; common = lib/cmdline.c; - enable = noemu; - +- efi = loader/efi/linux.c; }; + diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c -index 55ea5a11cc..846fe9715e 100644 +index 12277c34d2..68e2b283bb 100644 --- a/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c @@ -107,6 +107,7 @@ static struct argp_option options[] = { N_("use GRUB files in the directory DIR [default=%s]"), 0}, {"verbose", 'v', 0, 0, N_("print verbose messages."), 0}, {"hold", 'H', N_("SECS"), OPTION_ARG_OPTIONAL, N_("wait until a debugger will attach"), 0}, -+ {"kexec", 'X', 0, 0, N_("try the untryable."), 0}, ++ {"kexec", 'X', 0, 0, N_("use kexec to boot Linux kernels via systemctl (pass twice to enable dangerous fallback to non-systemctl)."), 0}, { 0, 0, 0, 0, 0, 0 } }; @@ -49,13 +73,13 @@ index 55ea5a11cc..846fe9715e 100644 verbosity++; break; + case 'X': -+ grub_util_set_kexecute(); ++ grub_util_set_kexecute (); + break; case ARGP_KEY_ARG: { diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c -index 0ff13bcaf8..eeea092752 100644 +index d278c2921f..02d27c3440 100644 --- a/grub-core/kern/emu/misc.c +++ b/grub-core/kern/emu/misc.c @@ -39,6 +39,7 @@ @@ -80,7 +104,7 @@ index 0ff13bcaf8..eeea092752 100644 grub_exit (int rc) { +#if defined (GRUB_KERNEL) -+ grub_reboot(); ++ grub_reboot (); +#endif exit (rc < 0 ? 1 : rc); } @@ -91,25 +115,25 @@ index 0ff13bcaf8..eeea092752 100644 } + +void -+grub_util_set_kexecute(void) ++grub_util_set_kexecute (void) +{ + kexecute++; +} + +int -+grub_util_get_kexecute(void) ++grub_util_get_kexecute (void) +{ + return kexecute; +} diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c new file mode 100644 -index 0000000000..fda9e00d24 +index 0000000000..0cf378a376 --- /dev/null +++ b/grub-core/loader/emu/linux.c -@@ -0,0 +1,172 @@ +@@ -0,0 +1,178 @@ +/* + * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc. ++ * Copyright (C) 2022 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -147,49 +171,55 @@ index 0000000000..fda9e00d24 +{ + grub_err_t rc = GRUB_ERR_NONE; + char *initrd_param; -+ const char *kexec[] = { "kexec", "-l", kernel_path, boot_cmdline, NULL, NULL }; -+ const char *systemctl[] = { "systemctl", "kexec", NULL }; -+ int kexecute = grub_util_get_kexecute(); ++ const char *kexec[] = {"kexec", "-la", kernel_path, boot_cmdline, NULL, NULL}; ++ const char *systemctl[] = {"systemctl", "kexec", NULL}; ++ int kexecute = grub_util_get_kexecute (); + -+ if (initrd_path) { -+ initrd_param = grub_xasprintf("--initrd=%s", initrd_path); -+ kexec[3] = initrd_param; -+ kexec[4] = boot_cmdline; -+ } else { -+ initrd_param = grub_xasprintf("%s", ""); -+ } ++ if (initrd_path) ++ { ++ initrd_param = grub_xasprintf ("--initrd=%s", initrd_path); ++ kexec[3] = initrd_param; ++ kexec[4] = boot_cmdline; ++ } ++ else ++ initrd_param = grub_xasprintf ("%s", ""); + -+ grub_printf("%serforming 'kexec -l %s %s %s'\n", -+ (kexecute) ? "P" : "Not p", -+ kernel_path, initrd_param, boot_cmdline); ++ grub_dprintf ("linux", "%serforming 'kexec -la %s %s %s'\n", ++ (kexecute) ? "P" : "Not p", ++ kernel_path, initrd_param, boot_cmdline); + + if (kexecute) -+ rc = grub_util_exec(kexec); ++ rc = grub_util_exec (kexec); + -+ grub_free(initrd_param); ++ grub_free (initrd_param); ++ ++ if (rc != GRUB_ERR_NONE) ++ { ++ grub_error (rc, N_("error trying to perform kexec load operation")); ++ grub_sleep (3); ++ return rc; ++ } + -+ if (rc != GRUB_ERR_NONE) { -+ grub_error (rc, N_("Error trying to perform kexec load operation.")); -+ grub_sleep (3); -+ return rc; -+ } + if (kexecute < 1) -+ grub_fatal (N_("Use '"PACKAGE"-emu --kexec' to force a system restart.")); ++ grub_fatal (N_("use '"PACKAGE"-emu --kexec' to force a system restart")); + -+ grub_printf("Performing 'systemctl kexec' (%s) ", ++ grub_dprintf ("linux", "Performing 'systemctl kexec' (%s) ", + (kexecute==1) ? "do-or-die" : "just-in-case"); + rc = grub_util_exec (systemctl); + + if (kexecute == 1) -+ grub_fatal (N_("Error trying to perform 'systemctl kexec'")); ++ grub_fatal (N_("error trying to perform 'systemctl kexec': %d"), rc); + -+ /* need to check read-only root before resetting hard!? */ -+ grub_printf("Performing 'kexec -e'"); -+ kexec[1] = "-e"; ++ /* ++ * WARNING: forcible reset should only be used in read-only environments. ++ * grub-emu cannot check for these - users beware. ++ */ ++ grub_dprintf ("linux", "Performing 'kexec -ex'"); ++ kexec[1] = "-ex"; + kexec[2] = NULL; -+ rc = grub_util_exec(kexec); -+ if ( rc != GRUB_ERR_NONE ) -+ grub_fatal (N_("Error trying to directly perform 'kexec -e'.")); ++ rc = grub_util_exec (kexec); ++ if (rc != GRUB_ERR_NONE) ++ grub_fatal (N_("error trying to directly perform 'kexec -ex': %d"), rc); + + return rc; +} @@ -197,46 +227,46 @@ index 0000000000..fda9e00d24 +static grub_err_t +grub_linux_unload (void) +{ ++ /* Unloading: we're no longer in use. */ + grub_dl_unref (my_mod); -+ if ( boot_cmdline != NULL ) -+ grub_free (boot_cmdline); ++ grub_free (boot_cmdline); + boot_cmdline = NULL; + return GRUB_ERR_NONE; +} + +static grub_err_t -+grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), int argc, char *argv[]) ++grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), int argc, ++ char *argv[]) +{ + int i; + char *tempstr; + ++ /* Mark ourselves as in-use. */ + grub_dl_ref (my_mod); + + if (argc == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); + -+ if ( !grub_util_is_regular(argv[0]) ) -+ return grub_error(GRUB_ERR_FILE_NOT_FOUND, N_("Cannot find kernel file %s"), argv[0]); ++ if (!grub_util_is_regular (argv[0])) ++ return grub_error (GRUB_ERR_FILE_NOT_FOUND, ++ N_("cannot find kernel file %s"), argv[0]); + -+ if ( kernel_path != NULL ) -+ grub_free(kernel_path); ++ grub_free (kernel_path); ++ kernel_path = grub_xasprintf ("%s", argv[0]); + -+ kernel_path = grub_xasprintf("%s", argv[0]); ++ grub_free (boot_cmdline); ++ boot_cmdline = NULL; + -+ if ( boot_cmdline != NULL ) { -+ grub_free(boot_cmdline); -+ boot_cmdline = NULL; -+ } -+ -+ if ( argc > 1 ) -+ { -+ boot_cmdline = grub_xasprintf("--command-line=%s", argv[1]); -+ for ( i = 2; i < argc; i++ ) { -+ tempstr = grub_xasprintf("%s %s", boot_cmdline, argv[i]); -+ grub_free(boot_cmdline); -+ boot_cmdline = tempstr; ++ if (argc > 1) ++ { ++ boot_cmdline = grub_xasprintf ("--command-line=%s", argv[1]); ++ for (i = 2; i < argc; i++) ++ { ++ tempstr = grub_xasprintf ("%s %s", boot_cmdline, argv[i]); ++ grub_free (boot_cmdline); ++ boot_cmdline = tempstr; ++ } + } -+ } + + grub_loader_set (grub_linux_boot, grub_linux_unload, 0); + @@ -244,19 +274,20 @@ index 0000000000..fda9e00d24 +} + +static grub_err_t -+grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), int argc, char *argv[]) ++grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), int argc, ++ char *argv[]) +{ + if (argc == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); + -+ if ( !grub_util_is_regular(argv[0]) ) -+ return grub_error(GRUB_ERR_FILE_NOT_FOUND, N_("Cannot find initrd file %s"), argv[0]); ++ if (!grub_util_is_regular (argv[0])) ++ return grub_error (GRUB_ERR_FILE_NOT_FOUND, ++ N_("Cannot find initrd file %s"), argv[0]); + -+ if ( initrd_path != NULL ) -+ grub_free(initrd_path); -+ -+ initrd_path = grub_xasprintf("%s", argv[0]); ++ grub_free (initrd_path); ++ initrd_path = grub_xasprintf ("%s", argv[0]); + ++ /* We are done - mark ourselves as on longer in use. */ + grub_dl_unref (my_mod); + + return GRUB_ERR_NONE; @@ -264,17 +295,16 @@ index 0000000000..fda9e00d24 + +static grub_command_t cmd_linux, cmd_initrd; + -+GRUB_MOD_INIT(linux) ++GRUB_MOD_INIT (linux) +{ -+ cmd_linux = grub_register_command ("linux", grub_cmd_linux, 0, N_("Load Linux.")); -+ cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd, 0, N_("Load initrd.")); ++ cmd_linux = grub_register_command ("linux", grub_cmd_linux, 0, ++ N_("Load Linux.")); ++ cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd, 0, ++ N_("Load initrd.")); + my_mod = mod; -+ kernel_path = NULL; -+ initrd_path = NULL; -+ boot_cmdline = NULL; +} + -+GRUB_MOD_FINI(linux) ++GRUB_MOD_FINI (linux) +{ + grub_unregister_command (cmd_linux); + grub_unregister_command (cmd_initrd); @@ -336,11 +366,62 @@ index ff9c48a649..01056954b9 100644 grub_uint64_t EXPORT_FUNC (grub_util_get_cpu_time_ms) (void); #ifdef HAVE_DEVICE_MAPPER +diff --git a/docs/grub.texi b/docs/grub.texi +index c433240f34..825278a7f3 100644 +--- a/docs/grub.texi ++++ b/docs/grub.texi +@@ -923,17 +923,17 @@ magic. + @node General boot methods + @section How to boot operating systems + +-GRUB has two distinct boot methods. One of the two is to load an +-operating system directly, and the other is to chain-load another boot +-loader which then will load an operating system actually. Generally +-speaking, the former is more desirable, because you don't need to +-install or maintain other boot loaders and GRUB is flexible enough to +-load an operating system from an arbitrary disk/partition. However, +-the latter is sometimes required, since GRUB doesn't support all the +-existing operating systems natively. ++GRUB has three distinct boot methods: loading an operating system ++directly, using kexec from userspace, and chainloading another ++bootloader. Generally speaking, the first two are more desirable ++because you don't need to install or maintain other boot loaders and ++GRUB is flexible enough to load an operating system from an arbitrary ++disk/partition. However, chainloading is sometimes required, as GRUB ++doesn't support all existing operating systems natively. + + @menu + * Loading an operating system directly:: ++* Kexec:: + * Chain-loading:: + @end menu + +@@ -959,6 +959,20 @@ use more complicated instructions. @xref{DOS/Windows}, for more + information. + + ++@node Kexec ++@subsection Kexec with grub2-emu ++ ++GRUB can be run in userspace by invoking the grub2-emu tool. It will ++read all configuration scripts as if booting directly (see @xref{Loading ++an operating system directly}). With the @code{--kexec} flag, and ++kexec(8) support from the operating system, the @command{linux} command ++will directly boot the target image. For systems that lack working ++systemctl(1) support for kexec, passing the @code{--kexec} flag twice ++will fallback to invoking kexec(8) directly; note however that this ++fallback may be unsafe outside read-only environments, as it does not ++invoke shutdown machinery. ++ ++ + @node Chain-loading + @subsection Chain-loading an OS + diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index ee88e44e97..80e7a83edf 100644 +index c2e8a82bce..dd49939aaa 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am -@@ -307,6 +307,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/net.h +@@ -309,6 +309,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/net.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/hostdisk.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/hostfile.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h diff --git a/0319-Enable-shared-processor-mode-in-vector-5.patch b/0319-Enable-shared-processor-mode-in-vector-5.patch deleted file mode 100644 index ec540a7..0000000 --- a/0319-Enable-shared-processor-mode-in-vector-5.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Avnish Chouhan -Date: Tue, 24 Jan 2023 08:01:47 -0500 -Subject: [PATCH] Enable shared processor mode in vector 5 - -This patch is to update the vector 5 which is troubling some -machines to bootup properly in shared processor mode. - -Signed-off-by: Avnish Chouhan ---- - grub-core/kern/ieee1275/init.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index 6a51c9efab..7c8b6facec 100644 ---- a/grub-core/kern/ieee1275/init.c -+++ b/grub-core/kern/ieee1275/init.c -@@ -376,7 +376,7 @@ grub_ieee1275_ibm_cas (void) - .vec4 = 0x0001, // set required minimum capacity % to the lowest value - .vec5_size = 1 + sizeof(struct option_vector5) - 2, - .vec5 = { -- 0, 0, 0, 0, 0, 0, 0, 0, 256 -+ 0, 192, 0, 128, 0, 0, 0, 0, 256 - } - }; - diff --git a/grub.patches b/grub.patches index 8f3e180..ae57994 100644 --- a/grub.patches +++ b/grub.patches @@ -57,263 +57,261 @@ Patch0056: 0056-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch Patch0057: 0057-align-struct-efi_variable-better.patch Patch0058: 0058-Add-BLS-support-to-grub-mkconfig.patch Patch0059: 0059-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch -Patch0060: 0060-Add-linux-and-initrd-commands-for-grub-emu.patch -Patch0061: 0061-Add-grub2-switch-to-blscfg.patch -Patch0062: 0062-make-better-backtraces.patch -Patch0063: 0063-normal-don-t-draw-our-startup-message-if-debug-is-se.patch -Patch0064: 0064-Work-around-some-minor-include-path-weirdnesses.patch -Patch0065: 0065-Make-it-possible-to-enabled-build-id-sha1.patch -Patch0066: 0066-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch -Patch0067: 0067-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch -Patch0068: 0068-Fixup-for-newer-compiler.patch -Patch0069: 0069-Don-t-attempt-to-export-the-start-and-_start-symbols.patch -Patch0070: 0070-Fixup-for-newer-compiler.patch -Patch0071: 0071-Add-support-for-non-Ethernet-network-cards.patch -Patch0072: 0072-net-read-bracketed-ipv6-addrs-and-port-numbers.patch -Patch0073: 0073-bootp-New-net_bootp6-command.patch -Patch0074: 0074-efinet-UEFI-IPv6-PXE-support.patch -Patch0075: 0075-grub.texi-Add-net_bootp6-doument.patch -Patch0076: 0076-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch -Patch0077: 0077-efinet-Setting-network-from-UEFI-device-path.patch -Patch0078: 0078-efinet-Setting-DNS-server-from-UEFI-protocol.patch -Patch0079: 0079-Support-UEFI-networking-protocols.patch -Patch0080: 0080-AUDIT-0-http-boot-tracker-bug.patch -Patch0081: 0081-grub-editenv-Add-incr-command-to-increment-integer-v.patch -Patch0082: 0082-Add-auto-hide-menu-support.patch -Patch0083: 0083-Add-grub-set-bootflag-utility.patch -Patch0084: 0084-docs-Add-grub-boot-indeterminate.service-example.patch -Patch0085: 0085-gentpl-add-disable-support.patch -Patch0086: 0086-gentpl-add-pc-firmware-type.patch -Patch0087: 0087-efinet-also-use-the-firmware-acceleration-for-http.patch -Patch0088: 0088-efi-http-Make-root_url-reflect-the-protocol-hostname.patch -Patch0089: 0089-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch -Patch0090: 0090-module-verifier-make-it-possible-to-run-checkers-on-.patch -Patch0091: 0091-Rework-how-the-fdt-command-builds.patch -Patch0092: 0092-Disable-non-wordsize-allocations-on-arm.patch -Patch0093: 0093-Prepend-prefix-when-HTTP-path-is-relative.patch -Patch0094: 0094-Make-grub_error-more-verbose.patch -Patch0095: 0095-Make-reset-an-alias-for-the-reboot-command.patch -Patch0096: 0096-Add-a-version-command.patch -Patch0097: 0097-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch -Patch0098: 0098-arm-arm64-loader-Better-memory-allocation-and-error-.patch -Patch0099: 0099-Try-to-pick-better-locations-for-kernel-and-initrd.patch -Patch0100: 0100-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch -Patch0101: 0101-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch -Patch0102: 0102-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch -Patch0103: 0103-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch -Patch0104: 0104-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch -Patch0105: 0105-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch -Patch0106: 0106-Fix-getroot.c-s-trampolines.patch -Patch0107: 0107-Do-not-allow-stack-trampolines-anywhere.patch -Patch0108: 0108-Reimplement-boot_counter.patch -Patch0109: 0109-Fix-menu-entry-selection-based-on-ID-and-title.patch -Patch0110: 0110-Make-the-menu-entry-users-option-argument-to-be-opti.patch -Patch0111: 0111-Add-efi-export-env-and-efi-load-env-commands.patch -Patch0112: 0112-Make-it-possible-to-subtract-conditions-from-debug.patch -Patch0113: 0113-Export-all-variables-from-the-initial-context-when-c.patch -Patch0114: 0114-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch -Patch0115: 0115-Fix-systemctl-kexec-exit-status-check.patch -Patch0116: 0116-Print-grub-emu-linux-loader-messages-as-debug.patch -Patch0117: 0117-Don-t-assume-that-boot-commands-will-only-return-on-.patch -Patch0118: 0118-grub-set-bootflag-Update-comment-about-running-as-ro.patch -Patch0119: 0119-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch -Patch0120: 0120-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch -Patch0121: 0121-Add-start-symbol-for-RISC-V.patch -Patch0122: 0122-bootstrap.conf-Force-autogen.sh-to-use-python3.patch -Patch0123: 0123-efi-http-Export-fw-http-_path-variables-to-make-them.patch -Patch0124: 0124-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch -Patch0125: 0125-efi-net-Allow-to-specify-a-port-number-in-addresses.patch -Patch0126: 0126-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch -Patch0127: 0127-efi-net-Print-a-debug-message-if-parsing-the-address.patch -Patch0128: 0128-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch -Patch0129: 0129-efi-Set-image-base-address-before-jumping-to-the-PE-.patch -Patch0130: 0130-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch -Patch0131: 0131-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch -Patch0132: 0132-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch -Patch0133: 0133-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch -Patch0134: 0134-efi-dhcp-fix-some-allocation-error-checking.patch -Patch0135: 0135-efi-http-fix-some-allocation-error-checking.patch -Patch0136: 0136-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch -Patch0137: 0137-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch -Patch0138: 0138-linuxefi-fail-kernel-validation-without-shim-protoco.patch -Patch0139: 0139-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch -Patch0140: 0140-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch -Patch0141: 0141-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch -Patch0142: 0142-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch -Patch0143: 0143-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch -Patch0144: 0144-Add-systemd-integration-scripts-to-make-systemctl-re.patch -Patch0145: 0145-systemd-integration.sh-Also-set-old-menu_show_once-g.patch -Patch0146: 0146-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch -Patch0147: 0147-grub-install-disable-support-for-EFI-platforms.patch -Patch0148: 0148-New-with-debug-timestamps-configure-flag-to-prepend-.patch -Patch0149: 0149-Added-debug-statements-to-grub_disk_open-and-grub_di.patch -Patch0150: 0150-Introduce-function-grub_debug_is_enabled-void-return.patch -Patch0151: 0151-Don-t-clear-screen-when-debugging-is-enabled.patch -Patch0152: 0152-kern-file-Fix-error-handling-in-grub_file_open.patch -Patch0153: 0153-grub_file_-instrumentation-new-file-debug-tag.patch -Patch0154: 0154-ieee1275-Avoiding-many-unecessary-open-close.patch -Patch0155: 0155-ieee1275-powerpc-implements-fibre-channel-discovery-.patch -Patch0156: 0156-ieee1275-powerpc-enables-device-mapper-discovery.patch -Patch0157: 0157-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch -Patch0158: 0158-Add-suport-for-signing-grub-with-an-appended-signatu.patch -Patch0159: 0159-docs-grub-Document-signing-grub-under-UEFI.patch -Patch0160: 0160-docs-grub-Document-signing-grub-with-an-appended-sig.patch -Patch0161: 0161-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch -Patch0162: 0162-pgp-factor-out-rsa_pad.patch -Patch0163: 0163-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch -Patch0164: 0164-posix_wrap-tweaks-in-preparation-for-libtasn1.patch -Patch0165: 0165-libtasn1-import-libtasn1-4.16.0.patch -Patch0166: 0166-libtasn1-disable-code-not-needed-in-grub.patch -Patch0167: 0167-libtasn1-changes-for-grub-compatibility.patch -Patch0168: 0168-libtasn1-compile-into-asn1-module.patch -Patch0169: 0169-test_asn1-test-module-for-libtasn1.patch -Patch0170: 0170-grub-install-support-embedding-x509-certificates.patch -Patch0171: 0171-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch -Patch0172: 0172-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch -Patch0173: 0173-appended-signatures-support-verifying-appended-signa.patch -Patch0174: 0174-appended-signatures-verification-tests.patch -Patch0175: 0175-appended-signatures-documentation.patch -Patch0176: 0176-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch -Patch0177: 0177-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch -Patch0178: 0178-ieee1275-claim-more-memory.patch -Patch0179: 0179-ieee1275-request-memory-with-ibm-client-architecture.patch -Patch0180: 0180-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch -Patch0181: 0181-ieee1275-ofdisk-retry-on-open-failure.patch -Patch0182: 0182-Allow-chainloading-EFI-apps-from-loop-mounts.patch -Patch0183: 0183-efinet-Add-DHCP-proxy-support.patch -Patch0184: 0184-fs-ext2-Ignore-checksum-seed-incompat-feature.patch -Patch0185: 0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch -Patch0186: 0186-Suppress-gettext-error-message.patch -Patch0187: 0187-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch -Patch0188: 0188-templates-Check-for-EFI-at-runtime-instead-of-config.patch -Patch0189: 0189-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch -Patch0190: 0190-arm64-Fix-EFI-loader-kernel-image-allocation.patch -Patch0191: 0191-normal-main-Discover-the-device-to-read-the-config-f.patch -Patch0192: 0192-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch -Patch0193: 0193-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch -Patch0194: 0194-Print-module-name-on-license-check-failure.patch -Patch0195: 0195-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch -Patch0196: 0196-grub-mkconfig-restore-umask-for-grub.cfg.patch -Patch0197: 0197-fs-btrfs-Use-full-btrfs-bootloader-area.patch -Patch0198: 0198-Add-Fedora-location-of-DejaVu-SANS-font.patch -Patch0199: 0199-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch -Patch0200: 0200-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch -Patch0201: 0201-EFI-console-Do-not-set-colorstate-until-the-first-te.patch -Patch0202: 0202-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch -Patch0203: 0203-Use-visual-indentation-in-config.h.in.patch -Patch0204: 0204-Where-present-ensure-config-util.h-precedes-config.h.patch -Patch0205: 0205-Drop-gnulib-fix-base64.patch.patch -Patch0206: 0206-Drop-gnulib-no-abort.patch.patch -Patch0207: 0207-Update-gnulib-version-and-drop-most-gnulib-patches.patch -Patch0208: 0208-commands-search-Fix-bug-stopping-iteration-when-no-f.patch -Patch0209: 0209-search-new-efidisk-only-option-on-EFI-systems.patch -Patch0210: 0210-efi-new-connectefi-command.patch -Patch0211: 0211-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch -Patch0212: 0212-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch -Patch0213: 0213-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch -Patch0214: 0214-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch -Patch0215: 0215-powerpc-do-CAS-in-a-more-compatible-way.patch -Patch0216: 0216-powerpc-prefix-detection-support-device-names-with-c.patch -Patch0217: 0217-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch -Patch0218: 0218-make-ofdisk_retries-optional.patch -Patch0219: 0219-loader-efi-chainloader-grub_load_and_start_image-doe.patch -Patch0220: 0220-loader-efi-chainloader-simplify-the-loader-state.patch -Patch0221: 0221-commands-boot-Add-API-to-pass-context-to-loader.patch -Patch0222: 0222-loader-efi-chainloader-Use-grub_loader_set_ex.patch -Patch0223: 0223-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch -Patch0224: 0224-loader-i386-efi-linux-Use-grub_loader_set_ex.patch -Patch0225: 0225-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch -Patch0226: 0226-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch -Patch0227: 0227-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch -Patch0228: 0228-video-readers-png-Abort-sooner-if-a-read-operation-f.patch -Patch0229: 0229-video-readers-png-Refuse-to-handle-multiple-image-he.patch -Patch0230: 0230-video-readers-png-Drop-greyscale-support-to-fix-heap.patch -Patch0231: 0231-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch -Patch0232: 0232-video-readers-png-Sanity-check-some-huffman-codes.patch -Patch0233: 0233-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch -Patch0234: 0234-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch -Patch0235: 0235-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch -Patch0236: 0236-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch -Patch0237: 0237-normal-charset-Fix-array-out-of-bounds-formatting-un.patch -Patch0238: 0238-net-netbuff-Block-overly-large-netbuff-allocs.patch -Patch0239: 0239-net-ip-Do-IP-fragment-maths-safely.patch -Patch0240: 0240-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch -Patch0241: 0241-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch -Patch0242: 0242-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch -Patch0243: 0243-net-tftp-Avoid-a-trivial-UAF.patch -Patch0244: 0244-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch -Patch0245: 0245-net-http-Fix-OOB-write-for-split-http-headers.patch -Patch0246: 0246-net-http-Error-out-on-headers-with-LF-without-CR.patch -Patch0247: 0247-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch -Patch0248: 0248-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch -Patch0249: 0249-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch -Patch0250: 0250-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch -Patch0251: 0251-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch -Patch0252: 0252-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch -Patch0253: 0253-misc-Make-grub_min-and-grub_max-more-resilient.patch -Patch0254: 0254-ReiserFS-switch-to-using-grub_min-grub_max.patch -Patch0255: 0255-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch -Patch0256: 0256-modules-make-.module_license-read-only.patch -Patch0257: 0257-modules-strip-.llvm_addrsig-sections-and-similar.patch -Patch0258: 0258-modules-Don-t-allocate-space-for-non-allocable-secti.patch -Patch0259: 0259-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch -Patch0260: 0260-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch -Patch0261: 0261-modules-load-module-sections-at-page-aligned-address.patch -Patch0262: 0262-nx-add-memory-attribute-get-set-API.patch -Patch0263: 0263-nx-set-page-permissions-for-loaded-modules.patch -Patch0264: 0264-nx-set-attrs-in-our-kernel-loaders.patch -Patch0265: 0265-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch -Patch0266: 0266-grub-probe-document-the-behavior-of-multiple-v.patch -Patch0267: 0267-grub_fs_probe-dprint-errors-from-filesystems.patch -Patch0268: 0268-fs-fat-don-t-error-when-mtime-is-0.patch -Patch0269: 0269-Make-debug-file-show-which-file-filters-get-run.patch -Patch0270: 0270-efi-use-enumerated-array-positions-for-our-allocatio.patch -Patch0271: 0271-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch -Patch0272: 0272-efi-allocate-the-initrd-within-the-bounds-expressed-.patch -Patch0273: 0273-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch -Patch0274: 0274-BLS-create-etc-kernel-cmdline-during-mkconfig.patch -Patch0275: 0275-squish-don-t-dup-rhgb-quiet-check-mtimes.patch -Patch0276: 0276-squish-give-up-on-rhgb-quiet.patch -Patch0277: 0277-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch -Patch0278: 0278-ieee1275-implement-vec5-for-cas-negotiation.patch -Patch0279: 0279-blscfg-Don-t-root-device-in-emu-builds.patch -Patch0280: 0280-loader-arm64-linux-Remove-magic-number-header-field-.patch -Patch0281: 0281-Correct-BSS-zeroing-on-aarch64.patch -Patch0282: 0282-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch -Patch0283: 0283-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch -Patch0284: 0284-commands-efi-tpm-Refine-the-status-of-log-event.patch -Patch0285: 0285-commands-efi-tpm-Use-grub_strcpy-instead-of-grub_mem.patch -Patch0286: 0286-efi-tpm-Add-EFI_CC_MEASUREMENT_PROTOCOL-support.patch -Patch0287: 0287-font-Reject-glyphs-exceeds-font-max_glyph_width-or-f.patch -Patch0288: 0288-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch -Patch0289: 0289-font-Fix-several-integer-overflows-in-grub_font_cons.patch -Patch0290: 0290-font-Remove-grub_font_dup_glyph.patch -Patch0291: 0291-font-Fix-integer-overflow-in-ensure_comb_space.patch -Patch0292: 0292-font-Fix-integer-overflow-in-BMP-index.patch -Patch0293: 0293-font-Fix-integer-underflow-in-binary-search-of-char-.patch -Patch0294: 0294-kern-efi-sb-Enforce-verification-of-font-files.patch -Patch0295: 0295-fbutil-Fix-integer-overflow.patch -Patch0296: 0296-font-Fix-an-integer-underflow-in-blit_comb.patch -Patch0297: 0297-font-Harden-grub_font_blit_glyph-and-grub_font_blit_.patch -Patch0298: 0298-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch -Patch0299: 0299-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch -Patch0300: 0300-font-Try-opening-fonts-from-the-bundled-memdisk.patch -Patch0301: 0301-mm-Clarify-grub_real_malloc.patch -Patch0302: 0302-mm-grub_real_malloc-Make-small-allocs-comment-match-.patch -Patch0303: 0303-mm-Document-grub_free.patch -Patch0304: 0304-mm-Document-grub_mm_init_region.patch -Patch0305: 0305-mm-Document-GRUB-internal-memory-management-structur.patch -Patch0306: 0306-mm-Assert-that-we-preserve-header-vs-region-alignmen.patch -Patch0307: 0307-mm-When-adding-a-region-merge-with-region-after-as-w.patch -Patch0308: 0308-mm-Debug-support-for-region-operations.patch -Patch0309: 0309-mm-Drop-unused-unloading-of-modules-on-OOM.patch -Patch0310: 0310-mm-Allow-dynamically-requesting-additional-memory-re.patch -Patch0311: 0311-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch -Patch0312: 0312-kern-efi-mm-Extract-function-to-add-memory-regions.patch -Patch0313: 0313-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch -Patch0314: 0314-kern-efi-mm-Implement-runtime-addition-of-pages.patch -Patch0315: 0315-efi-Increase-default-memory-allocation-to-32-MiB.patch -Patch0316: 0316-mm-Try-invalidate-disk-caches-last-when-out-of-memor.patch -Patch0317: 0317-ppc64le-signed-boot-media-changes.patch -Patch0318: 0318-core-Fix-several-implicit-function-declarations.patch -Patch0319: 0319-Enable-shared-processor-mode-in-vector-5.patch +Patch0060: 0060-Add-grub2-switch-to-blscfg.patch +Patch0061: 0061-make-better-backtraces.patch +Patch0062: 0062-normal-don-t-draw-our-startup-message-if-debug-is-se.patch +Patch0063: 0063-Work-around-some-minor-include-path-weirdnesses.patch +Patch0064: 0064-Make-it-possible-to-enabled-build-id-sha1.patch +Patch0065: 0065-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch +Patch0066: 0066-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch +Patch0067: 0067-Fixup-for-newer-compiler.patch +Patch0068: 0068-Don-t-attempt-to-export-the-start-and-_start-symbols.patch +Patch0069: 0069-Fixup-for-newer-compiler.patch +Patch0070: 0070-Add-support-for-non-Ethernet-network-cards.patch +Patch0071: 0071-net-read-bracketed-ipv6-addrs-and-port-numbers.patch +Patch0072: 0072-bootp-New-net_bootp6-command.patch +Patch0073: 0073-efinet-UEFI-IPv6-PXE-support.patch +Patch0074: 0074-grub.texi-Add-net_bootp6-doument.patch +Patch0075: 0075-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch +Patch0076: 0076-efinet-Setting-network-from-UEFI-device-path.patch +Patch0077: 0077-efinet-Setting-DNS-server-from-UEFI-protocol.patch +Patch0078: 0078-Support-UEFI-networking-protocols.patch +Patch0079: 0079-AUDIT-0-http-boot-tracker-bug.patch +Patch0080: 0080-grub-editenv-Add-incr-command-to-increment-integer-v.patch +Patch0081: 0081-Add-auto-hide-menu-support.patch +Patch0082: 0082-Add-grub-set-bootflag-utility.patch +Patch0083: 0083-docs-Add-grub-boot-indeterminate.service-example.patch +Patch0084: 0084-gentpl-add-disable-support.patch +Patch0085: 0085-gentpl-add-pc-firmware-type.patch +Patch0086: 0086-efinet-also-use-the-firmware-acceleration-for-http.patch +Patch0087: 0087-efi-http-Make-root_url-reflect-the-protocol-hostname.patch +Patch0088: 0088-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch +Patch0089: 0089-module-verifier-make-it-possible-to-run-checkers-on-.patch +Patch0090: 0090-Rework-how-the-fdt-command-builds.patch +Patch0091: 0091-Disable-non-wordsize-allocations-on-arm.patch +Patch0092: 0092-Prepend-prefix-when-HTTP-path-is-relative.patch +Patch0093: 0093-Make-grub_error-more-verbose.patch +Patch0094: 0094-Make-reset-an-alias-for-the-reboot-command.patch +Patch0095: 0095-Add-a-version-command.patch +Patch0096: 0096-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch +Patch0097: 0097-arm-arm64-loader-Better-memory-allocation-and-error-.patch +Patch0098: 0098-Try-to-pick-better-locations-for-kernel-and-initrd.patch +Patch0099: 0099-Attempt-to-fix-up-all-the-places-Wsign-compare-error.patch +Patch0100: 0100-Don-t-use-Wno-sign-compare-Wno-conversion-Wno-error-.patch +Patch0101: 0101-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch +Patch0102: 0102-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch +Patch0103: 0103-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch +Patch0104: 0104-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch +Patch0105: 0105-Fix-getroot.c-s-trampolines.patch +Patch0106: 0106-Do-not-allow-stack-trampolines-anywhere.patch +Patch0107: 0107-Reimplement-boot_counter.patch +Patch0108: 0108-Fix-menu-entry-selection-based-on-ID-and-title.patch +Patch0109: 0109-Make-the-menu-entry-users-option-argument-to-be-opti.patch +Patch0110: 0110-Add-efi-export-env-and-efi-load-env-commands.patch +Patch0111: 0111-Make-it-possible-to-subtract-conditions-from-debug.patch +Patch0112: 0112-Export-all-variables-from-the-initial-context-when-c.patch +Patch0113: 0113-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch +Patch0114: 0114-Don-t-assume-that-boot-commands-will-only-return-on-.patch +Patch0115: 0115-grub-set-bootflag-Update-comment-about-running-as-ro.patch +Patch0116: 0116-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch +Patch0117: 0117-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch +Patch0118: 0118-Add-start-symbol-for-RISC-V.patch +Patch0119: 0119-bootstrap.conf-Force-autogen.sh-to-use-python3.patch +Patch0120: 0120-efi-http-Export-fw-http-_path-variables-to-make-them.patch +Patch0121: 0121-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch +Patch0122: 0122-efi-net-Allow-to-specify-a-port-number-in-addresses.patch +Patch0123: 0123-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch +Patch0124: 0124-efi-net-Print-a-debug-message-if-parsing-the-address.patch +Patch0125: 0125-kern-term-Also-accept-F8-as-a-user-interrupt-key.patch +Patch0126: 0126-efi-Set-image-base-address-before-jumping-to-the-PE-.patch +Patch0127: 0127-tpm-Don-t-propagate-TPM-measurement-errors-to-the-ve.patch +Patch0128: 0128-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch +Patch0129: 0129-http-Prepend-prefix-when-the-HTTP-path-is-relative-a.patch +Patch0130: 0130-Fix-a-missing-return-in-efi-export-env-and-efi-load-.patch +Patch0131: 0131-efi-dhcp-fix-some-allocation-error-checking.patch +Patch0132: 0132-efi-http-fix-some-allocation-error-checking.patch +Patch0133: 0133-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch +Patch0134: 0134-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch +Patch0135: 0135-linuxefi-fail-kernel-validation-without-shim-protoco.patch +Patch0136: 0136-Fix-const-char-pointers-in-grub-core-net-bootp.c.patch +Patch0137: 0137-Fix-const-char-pointers-in-grub-core-net-efi-ip4_con.patch +Patch0138: 0138-Fix-const-char-pointers-in-grub-core-net-efi-ip6_con.patch +Patch0139: 0139-Fix-const-char-pointers-in-grub-core-net-efi-net.c.patch +Patch0140: 0140-Fix-const-char-pointers-in-grub-core-net-efi-pxe.c.patch +Patch0141: 0141-Add-systemd-integration-scripts-to-make-systemctl-re.patch +Patch0142: 0142-systemd-integration.sh-Also-set-old-menu_show_once-g.patch +Patch0143: 0143-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch +Patch0144: 0144-grub-install-disable-support-for-EFI-platforms.patch +Patch0145: 0145-New-with-debug-timestamps-configure-flag-to-prepend-.patch +Patch0146: 0146-Added-debug-statements-to-grub_disk_open-and-grub_di.patch +Patch0147: 0147-Introduce-function-grub_debug_is_enabled-void-return.patch +Patch0148: 0148-Don-t-clear-screen-when-debugging-is-enabled.patch +Patch0149: 0149-kern-file-Fix-error-handling-in-grub_file_open.patch +Patch0150: 0150-grub_file_-instrumentation-new-file-debug-tag.patch +Patch0151: 0151-ieee1275-Avoiding-many-unecessary-open-close.patch +Patch0152: 0152-ieee1275-powerpc-implements-fibre-channel-discovery-.patch +Patch0153: 0153-ieee1275-powerpc-enables-device-mapper-discovery.patch +Patch0154: 0154-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch +Patch0155: 0155-Add-suport-for-signing-grub-with-an-appended-signatu.patch +Patch0156: 0156-docs-grub-Document-signing-grub-under-UEFI.patch +Patch0157: 0157-docs-grub-Document-signing-grub-with-an-appended-sig.patch +Patch0158: 0158-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch +Patch0159: 0159-pgp-factor-out-rsa_pad.patch +Patch0160: 0160-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch +Patch0161: 0161-posix_wrap-tweaks-in-preparation-for-libtasn1.patch +Patch0162: 0162-libtasn1-import-libtasn1-4.16.0.patch +Patch0163: 0163-libtasn1-disable-code-not-needed-in-grub.patch +Patch0164: 0164-libtasn1-changes-for-grub-compatibility.patch +Patch0165: 0165-libtasn1-compile-into-asn1-module.patch +Patch0166: 0166-test_asn1-test-module-for-libtasn1.patch +Patch0167: 0167-grub-install-support-embedding-x509-certificates.patch +Patch0168: 0168-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch +Patch0169: 0169-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch +Patch0170: 0170-appended-signatures-support-verifying-appended-signa.patch +Patch0171: 0171-appended-signatures-verification-tests.patch +Patch0172: 0172-appended-signatures-documentation.patch +Patch0173: 0173-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch +Patch0174: 0174-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch +Patch0175: 0175-ieee1275-claim-more-memory.patch +Patch0176: 0176-ieee1275-request-memory-with-ibm-client-architecture.patch +Patch0177: 0177-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch +Patch0178: 0178-ieee1275-ofdisk-retry-on-open-failure.patch +Patch0179: 0179-Allow-chainloading-EFI-apps-from-loop-mounts.patch +Patch0180: 0180-efinet-Add-DHCP-proxy-support.patch +Patch0181: 0181-fs-ext2-Ignore-checksum-seed-incompat-feature.patch +Patch0182: 0182-Don-t-update-the-cmdline-when-generating-legacy-menu.patch +Patch0183: 0183-Suppress-gettext-error-message.patch +Patch0184: 0184-grub-set-password-Always-use-boot-grub2-user.cfg-as-.patch +Patch0185: 0185-templates-Check-for-EFI-at-runtime-instead-of-config.patch +Patch0186: 0186-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch +Patch0187: 0187-arm64-Fix-EFI-loader-kernel-image-allocation.patch +Patch0188: 0188-normal-main-Discover-the-device-to-read-the-config-f.patch +Patch0189: 0189-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch +Patch0190: 0190-fs-xfs-Fix-unreadable-filesystem-with-v4-superblock.patch +Patch0191: 0191-Print-module-name-on-license-check-failure.patch +Patch0192: 0192-powerpc-ieee1275-load-grub-at-4MB-not-2MB.patch +Patch0193: 0193-grub-mkconfig-restore-umask-for-grub.cfg.patch +Patch0194: 0194-fs-btrfs-Use-full-btrfs-bootloader-area.patch +Patch0195: 0195-Add-Fedora-location-of-DejaVu-SANS-font.patch +Patch0196: 0196-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch +Patch0197: 0197-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch +Patch0198: 0198-EFI-console-Do-not-set-colorstate-until-the-first-te.patch +Patch0199: 0199-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch +Patch0200: 0200-Use-visual-indentation-in-config.h.in.patch +Patch0201: 0201-Where-present-ensure-config-util.h-precedes-config.h.patch +Patch0202: 0202-Drop-gnulib-fix-base64.patch.patch +Patch0203: 0203-Drop-gnulib-no-abort.patch.patch +Patch0204: 0204-Update-gnulib-version-and-drop-most-gnulib-patches.patch +Patch0205: 0205-commands-search-Fix-bug-stopping-iteration-when-no-f.patch +Patch0206: 0206-search-new-efidisk-only-option-on-EFI-systems.patch +Patch0207: 0207-efi-new-connectefi-command.patch +Patch0208: 0208-grub-core-loader-i386-efi-linux.c-do-not-validate-ke.patch +Patch0209: 0209-grub-core-loader-arm64-linux.c-do-not-validate-kerne.patch +Patch0210: 0210-grub-core-loader-efi-chainloader.c-do-not-validate-c.patch +Patch0211: 0211-grub-core-loader-efi-linux.c-drop-now-unused-grub_li.patch +Patch0212: 0212-powerpc-do-CAS-in-a-more-compatible-way.patch +Patch0213: 0213-powerpc-prefix-detection-support-device-names-with-c.patch +Patch0214: 0214-ibmvtpm-Add-support-for-trusted-boot-using-a-vTPM-2..patch +Patch0215: 0215-make-ofdisk_retries-optional.patch +Patch0216: 0216-loader-efi-chainloader-grub_load_and_start_image-doe.patch +Patch0217: 0217-loader-efi-chainloader-simplify-the-loader-state.patch +Patch0218: 0218-commands-boot-Add-API-to-pass-context-to-loader.patch +Patch0219: 0219-loader-efi-chainloader-Use-grub_loader_set_ex.patch +Patch0220: 0220-loader-i386-efi-linux-Avoid-a-use-after-free-in-the-.patch +Patch0221: 0221-loader-i386-efi-linux-Use-grub_loader_set_ex.patch +Patch0222: 0222-loader-i386-efi-linux-Fix-a-memory-leak-in-the-initr.patch +Patch0223: 0223-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch +Patch0224: 0224-kern-file-Do-not-leak-device_name-on-error-in-grub_f.patch +Patch0225: 0225-video-readers-png-Abort-sooner-if-a-read-operation-f.patch +Patch0226: 0226-video-readers-png-Refuse-to-handle-multiple-image-he.patch +Patch0227: 0227-video-readers-png-Drop-greyscale-support-to-fix-heap.patch +Patch0228: 0228-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch +Patch0229: 0229-video-readers-png-Sanity-check-some-huffman-codes.patch +Patch0230: 0230-video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch +Patch0231: 0231-video-readers-jpeg-Do-not-reallocate-a-given-huff-ta.patch +Patch0232: 0232-video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch +Patch0233: 0233-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch +Patch0234: 0234-normal-charset-Fix-array-out-of-bounds-formatting-un.patch +Patch0235: 0235-net-netbuff-Block-overly-large-netbuff-allocs.patch +Patch0236: 0236-net-ip-Do-IP-fragment-maths-safely.patch +Patch0237: 0237-net-dns-Fix-double-free-addresses-on-corrupt-DNS-res.patch +Patch0238: 0238-net-dns-Don-t-read-past-the-end-of-the-string-we-re-.patch +Patch0239: 0239-net-tftp-Prevent-a-UAF-and-double-free-from-a-failed.patch +Patch0240: 0240-net-tftp-Avoid-a-trivial-UAF.patch +Patch0241: 0241-net-http-Do-not-tear-down-socket-if-it-s-already-bee.patch +Patch0242: 0242-net-http-Fix-OOB-write-for-split-http-headers.patch +Patch0243: 0243-net-http-Error-out-on-headers-with-LF-without-CR.patch +Patch0244: 0244-fs-f2fs-Do-not-read-past-the-end-of-nat-journal-entr.patch +Patch0245: 0245-fs-f2fs-Do-not-read-past-the-end-of-nat-bitmap.patch +Patch0246: 0246-fs-f2fs-Do-not-copy-file-names-that-are-too-long.patch +Patch0247: 0247-fs-btrfs-Fix-several-fuzz-issues-with-invalid-dir-it.patch +Patch0248: 0248-fs-btrfs-Fix-more-ASAN-and-SEGV-issues-found-with-fu.patch +Patch0249: 0249-fs-btrfs-Fix-more-fuzz-issues-related-to-chunks.patch +Patch0250: 0250-misc-Make-grub_min-and-grub_max-more-resilient.patch +Patch0251: 0251-ReiserFS-switch-to-using-grub_min-grub_max.patch +Patch0252: 0252-misc-make-grub_boot_time-also-call-grub_dprintf-boot.patch +Patch0253: 0253-modules-make-.module_license-read-only.patch +Patch0254: 0254-modules-strip-.llvm_addrsig-sections-and-similar.patch +Patch0255: 0255-modules-Don-t-allocate-space-for-non-allocable-secti.patch +Patch0256: 0256-pe-add-the-DOS-header-struct-and-fix-some-bad-naming.patch +Patch0257: 0257-EFI-allocate-kernel-in-EFI_RUNTIME_SERVICES_CODE-ins.patch +Patch0258: 0258-modules-load-module-sections-at-page-aligned-address.patch +Patch0259: 0259-nx-add-memory-attribute-get-set-API.patch +Patch0260: 0260-nx-set-page-permissions-for-loaded-modules.patch +Patch0261: 0261-nx-set-attrs-in-our-kernel-loaders.patch +Patch0262: 0262-nx-set-the-nx-compatible-flag-in-EFI-grub-images.patch +Patch0263: 0263-grub-probe-document-the-behavior-of-multiple-v.patch +Patch0264: 0264-grub_fs_probe-dprint-errors-from-filesystems.patch +Patch0265: 0265-fs-fat-don-t-error-when-mtime-is-0.patch +Patch0266: 0266-Make-debug-file-show-which-file-filters-get-run.patch +Patch0267: 0267-efi-use-enumerated-array-positions-for-our-allocatio.patch +Patch0268: 0268-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch +Patch0269: 0269-efi-allocate-the-initrd-within-the-bounds-expressed-.patch +Patch0270: 0270-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch +Patch0271: 0271-BLS-create-etc-kernel-cmdline-during-mkconfig.patch +Patch0272: 0272-squish-don-t-dup-rhgb-quiet-check-mtimes.patch +Patch0273: 0273-squish-give-up-on-rhgb-quiet.patch +Patch0274: 0274-squish-BLS-only-write-etc-kernel-cmdline-if-writable.patch +Patch0275: 0275-ieee1275-implement-vec5-for-cas-negotiation.patch +Patch0276: 0276-blscfg-Don-t-root-device-in-emu-builds.patch +Patch0277: 0277-loader-arm64-linux-Remove-magic-number-header-field-.patch +Patch0278: 0278-Correct-BSS-zeroing-on-aarch64.patch +Patch0279: 0279-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch +Patch0280: 0280-x86-efi-Fix-an-incorrect-array-size-in-kernel-alloca.patch +Patch0281: 0281-commands-efi-tpm-Refine-the-status-of-log-event.patch +Patch0282: 0282-commands-efi-tpm-Use-grub_strcpy-instead-of-grub_mem.patch +Patch0283: 0283-efi-tpm-Add-EFI_CC_MEASUREMENT_PROTOCOL-support.patch +Patch0284: 0284-font-Reject-glyphs-exceeds-font-max_glyph_width-or-f.patch +Patch0285: 0285-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch +Patch0286: 0286-font-Fix-several-integer-overflows-in-grub_font_cons.patch +Patch0287: 0287-font-Remove-grub_font_dup_glyph.patch +Patch0288: 0288-font-Fix-integer-overflow-in-ensure_comb_space.patch +Patch0289: 0289-font-Fix-integer-overflow-in-BMP-index.patch +Patch0290: 0290-font-Fix-integer-underflow-in-binary-search-of-char-.patch +Patch0291: 0291-kern-efi-sb-Enforce-verification-of-font-files.patch +Patch0292: 0292-fbutil-Fix-integer-overflow.patch +Patch0293: 0293-font-Fix-an-integer-underflow-in-blit_comb.patch +Patch0294: 0294-font-Harden-grub_font_blit_glyph-and-grub_font_blit_.patch +Patch0295: 0295-font-Assign-null_font-to-glyphs-in-ascii_font_glyph.patch +Patch0296: 0296-normal-charset-Fix-an-integer-overflow-in-grub_unico.patch +Patch0297: 0297-font-Try-opening-fonts-from-the-bundled-memdisk.patch +Patch0298: 0298-Correction-in-vector-5-values.patch +Patch0299: 0299-mm-Clarify-grub_real_malloc.patch +Patch0300: 0300-mm-grub_real_malloc-Make-small-allocs-comment-match-.patch +Patch0301: 0301-mm-Document-grub_free.patch +Patch0302: 0302-mm-Document-grub_mm_init_region.patch +Patch0303: 0303-mm-Document-GRUB-internal-memory-management-structur.patch +Patch0304: 0304-mm-Assert-that-we-preserve-header-vs-region-alignmen.patch +Patch0305: 0305-mm-When-adding-a-region-merge-with-region-after-as-w.patch +Patch0306: 0306-mm-Debug-support-for-region-operations.patch +Patch0307: 0307-mm-Drop-unused-unloading-of-modules-on-OOM.patch +Patch0308: 0308-mm-Allow-dynamically-requesting-additional-memory-re.patch +Patch0309: 0309-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch +Patch0310: 0310-kern-efi-mm-Extract-function-to-add-memory-regions.patch +Patch0311: 0311-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch +Patch0312: 0312-kern-efi-mm-Implement-runtime-addition-of-pages.patch +Patch0313: 0313-efi-Increase-default-memory-allocation-to-32-MiB.patch +Patch0314: 0314-mm-Try-invalidate-disk-caches-last-when-out-of-memor.patch +Patch0315: 0315-ppc64le-signed-boot-media-changes.patch +Patch0316: 0316-core-Fix-several-implicit-function-declarations.patch +Patch0317: 0317-loader-Add-support-for-grub-emu-to-kexec-Linux-menu-.patch diff --git a/grub2.spec b/grub2.spec index eb3fe3f..d4fa238 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 83%{?dist} +Release: 84%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -544,6 +544,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Mon Feb 06 2023 Robbie Harwood - 2.06-84 +- emu: support newer kexec syscall + * Mon Feb 06 2023 Robbie Harwood - 2.06-83 - ppc64le: cas5, take 3