diff --git a/grub.patches b/grub.patches index 7f5385f00cad595259f0d041bfb6e968c830b023..b7c08b1c1b2f7c3c191fddd89ef208890343f902 100644 --- a/grub.patches +++ b/grub.patches @@ -229,7 +229,6 @@ Patch228: 0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch Patch229: 0003-Revert-templates-Disable-the-os-prober-by-default.patch Patch230: Handle-non-continuous-data-blocks-in-directory-exten.patch Patch231: loongarch64-fix-GRUB_EFI_MAX_ALLOCATION_ADDRESS-unde.patch -Patch232: modify-efi_max_usable-addr.patch Patch233: LoongArch-Add-back-compatibility-for-linux-kernel.patch Patch234: Fix-that-patch-28dcf48482-introduced-old-code.patch Patch235: backport-CVE-2021-46848-lib-libtasn1-Fix-ETYPE_OK-off-by-one-array.patch diff --git a/grub2.spec b/grub2.spec index 2282b7d79a78ad8319f2f4c49addff5b1f39818f..2bf9696c172d03fc9b8fbb2c5a0ab43e8633b80b 100644 --- a/grub2.spec +++ b/grub2.spec @@ -19,7 +19,7 @@ Name: grub2 Epoch: 1 Version: 2.12 -Release: 28 +Release: 29 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -461,6 +461,9 @@ fi %{_datadir}/man/man* %changelog +* Fri Dec 13 2024 Ouuleilei - 1:2.12-29 +- revert sohpgo's modify-efi_max_usable-addr.patch + * Thu Dec 12 2024 zhangqiumiao - 1:2.12-28 - Type:bugfix - CVE:NA diff --git a/modify-efi_max_usable-addr.patch b/modify-efi_max_usable-addr.patch deleted file mode 100644 index 4b0c31d57d58ffeba8ee2254e8c0e0fedf304a93..0000000000000000000000000000000000000000 --- a/modify-efi_max_usable-addr.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7ab0dc548f8221a9c336a1682df9f729b975c7ff Mon Sep 17 00:00:00 2001 -From: "jingyu.li01" -Date: Tue, 2 Jan 2024 10:09:53 +0800 -Subject: [PATCH] include/grub/riscv64: modify efi_max_usable addr - -This is a temporary solution for relocation overflow on a segmented memory -layout. - -Signed-off-by: jingyu.li01 ---- - include/grub/riscv64/efi/memory.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/grub/riscv64/efi/memory.h b/include/grub/riscv64/efi/memory.h -index c6cb32417..eb6f1bb83 100644 ---- a/include/grub/riscv64/efi/memory.h -+++ b/include/grub/riscv64/efi/memory.h -@@ -1,7 +1,7 @@ - #ifndef GRUB_MEMORY_CPU_HEADER - #include - --#define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffffffffULL -+#define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffffULL - #define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS - - #endif /* ! GRUB_MEMORY_CPU_HEADER */