diff --git a/grub.patches b/grub.patches index 97ff02778c2342aeeb4db466846eb243f0d55cac..190dd7904722e2779e394fad6ce582b1b2104f91 100644 --- a/grub.patches +++ b/grub.patches @@ -227,3 +227,4 @@ Patch226: 0038-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch Patch227: 0084-grub-editenv-Add-incr-command-to-increment-integer-v.patch Patch228: 0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch Patch229: 0003-Revert-templates-Disable-the-os-prober-by-default.patch +Patch230: loongarch64-undefine-GRUB_EFI_MAX_ALLOCATION_ADDRESS.patch diff --git a/grub2.spec b/grub2.spec index 96d5b6e6dcc93d503af47093ca61a46d33fb65a9..439ab8551317d71e81ce0d11f82677f6f994ee42 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.12 -Release: 9 +Release: 10 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -447,6 +447,12 @@ fi %{_datadir}/man/man* %changelog +* Mon May 12 2024 zhangxianting - 1:2.12-10 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:'GRUB_EFI_MAX_ALLOCATION_ADDRESS' undeclared at loongarch64 + * Tue May 7 2024 zhangqiumiao - 1:2.12-9 - Type:bugfix - CVE:NA diff --git a/loongarch64-undefine-GRUB_EFI_MAX_ALLOCATION_ADDRESS.patch b/loongarch64-undefine-GRUB_EFI_MAX_ALLOCATION_ADDRESS.patch new file mode 100644 index 0000000000000000000000000000000000000000..9047a2e3ab3135f0bc7806b9a7ac807cc84d7264 --- /dev/null +++ b/loongarch64-undefine-GRUB_EFI_MAX_ALLOCATION_ADDRESS.patch @@ -0,0 +1,29 @@ +From dc2dd5a0a62cb9144df16a552ab779818d9aaf3c Mon Sep 17 00:00:00 2001 +From: openEuler Buildteam +Date: Sat, 11 May 2024 14:23:57 +0800 +Subject: [PATCH] loongarch64 undefine GRUB_EFI_MAX_ALLOCATION_ADDRESS + ../../grub-core/kern/efi/mm.c: In function 'filter_memory_map': + ../../grub-core/kern/efi/mm.c:484:38: error: 'GRUB_EFI_MAX_ALLOCATION_ADDRESS' undeclared (first use in this function); did you mean 'GRUB_EFI_MAX_ALLOCATION_TYPE'? + 484 | && desc->physical_start <= GRUB_EFI_MAX_ALLOCATION_ADDRESS + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | GRUB_EFI_MAX_ALLOCATION_TYPE + ../../grub-core/kern/efi/mm.c:484:38: note: each undeclared identifier is reported only once for each function it appears in + +--- + include/grub/loongarch64/efi/memory.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/grub/loongarch64/efi/memory.h b/include/grub/loongarch64/efi/memory.h +index d460267..792258b 100644 +--- a/include/grub/loongarch64/efi/memory.h ++++ b/include/grub/loongarch64/efi/memory.h +@@ -20,5 +20,6 @@ + #include + + #define GRUB_EFI_MAX_USABLE_ADDRESS 0xfffffffffffULL ++#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS + + #endif /* ! GRUB_MEMORY_CPU_HEADER */ +-- +2.43.0 +