From c7c931741222dc5d1fb93839ad463c152e217ef8 Mon Sep 17 00:00:00 2001 From: Qiumiao Zhang Date: Sat, 11 May 2024 07:11:21 +0000 Subject: [PATCH] loongarch64: fix GRUB_EFI_MAX_ALLOCATION_ADDRESS undeclared Signed-off-by: Qiumiao Zhang --- grub.patches | 1 + grub2.spec | 8 ++++++- ...GRUB_EFI_MAX_ALLOCATION_ADDRESS-unde.patch | 23 +++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 loongarch64-fix-GRUB_EFI_MAX_ALLOCATION_ADDRESS-unde.patch diff --git a/grub.patches b/grub.patches index 76867b6..ecb025b 100644 --- a/grub.patches +++ b/grub.patches @@ -228,3 +228,4 @@ 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: Handle-non-continuous-data-blocks-in-directory-exten.patch +Patch231: loongarch64-fix-GRUB_EFI_MAX_ALLOCATION_ADDRESS-unde.patch diff --git a/grub2.spec b/grub2.spec index 91cc878..4a31c73 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.12 -Release: 10 +Release: 11 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 +* Sat May 11 2024 zhangqiumiao - 1:2.12-11 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:loongarch64: fix GRUB_EFI_MAX_ALLOCATION_ADDRESS undeclared + * Sat May 11 2024 xiaozai - 1:2.12-10 - Type:bugfix - CVE:NA diff --git a/loongarch64-fix-GRUB_EFI_MAX_ALLOCATION_ADDRESS-unde.patch b/loongarch64-fix-GRUB_EFI_MAX_ALLOCATION_ADDRESS-unde.patch new file mode 100644 index 0000000..69aa0ab --- /dev/null +++ b/loongarch64-fix-GRUB_EFI_MAX_ALLOCATION_ADDRESS-unde.patch @@ -0,0 +1,23 @@ +From 5e1c62c71d7e8f0a4ae6a71f6da30affb1d25985 Mon Sep 17 00:00:00 2001 +From: Qiumiao Zhang +Date: Sat, 11 May 2024 06:52:47 +0000 +Subject: [PATCH] loongarch64: fix GRUB_EFI_MAX_ALLOCATION_ADDRESS undeclared + +--- + 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.33.0 + -- Gitee