packages/grub2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!483 [sync] PR-481: revert sohpgo's modify-efi_max_usable-addr.patch

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @zhangqiumiao 
Signed-off-by: @zhangqiumiao
This commit is contained in:
openeuler-ci-bot 2024-12-19 08:16:53 +00:00 committed by Gitee
commit 7366940d8e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
grub.patches
View File

@ -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 Patch229: 0003-Revert-templates-Disable-the-os-prober-by-default.patch
Patch230: Handle-non-continuous-data-blocks-in-directory-exten.patch Patch230: Handle-non-continuous-data-blocks-in-directory-exten.patch
Patch231: loongarch64-fix-GRUB_EFI_MAX_ALLOCATION_ADDRESS-unde.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 Patch233: LoongArch-Add-back-compatibility-for-linux-kernel.patch
Patch234: Fix-that-patch-28dcf48482-introduced-old-code.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 Patch235: backport-CVE-2021-46848-lib-libtasn1-Fix-ETYPE_OK-off-by-one-array.patch

5
grub2.spec
View File

@ -19,7 +19,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.12 Version: 2.12
Release: 28 Release: 29
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -461,6 +461,9 @@ fi
%{_datadir}/man/man* %{_datadir}/man/man*
%changelog %changelog
* Fri Dec 13 2024 Ouuleilei <wangliu@iscas.ac.cn> - 1:2.12-29
- revert sohpgo's modify-efi_max_usable-addr.patch
* Thu Dec 12 2024 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.12-28 * Thu Dec 12 2024 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.12-28
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA

26
modify-efi_max_usable-addr.patch
View File

@ -1,26 +0,0 @@
From 7ab0dc548f8221a9c336a1682df9f729b975c7ff Mon Sep 17 00:00:00 2001
From: "jingyu.li01" <jingyu.li01@sophgo.com>
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 <jingyu.li01@sophgo.com>
---
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 <grub/efi/memory.h>
-#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 */