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

LoongArch: Force initrd load address 64KiB alignment

Browse Source 
Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
(cherry picked from commit 49bab1d9ae8b2a13648c414a8cc31b113873e17c)
This commit is contained in:
mengyingkun 2023-03-18 11:59:07 +08:00 committed by openeuler-sync-bot
parent 4c3592e7c5
commit be5296dfe0
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
grub.patches
View File

@ -310,3 +310,6 @@ Patch0305: loongarch-Add-support-for-v4.0-interface.patch
Patch0306: loongarch-Add-support-for-new-EFI-screen-info-GUID.patch Patch0306: loongarch-Add-support-for-new-EFI-screen-info-GUID.patch
%endif %endif
Patch0307: 0202-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch Patch0307: 0202-rpm-sort-add-prereqs-for-declaration-of-strchrnul.patch
%ifarch loongarch64
Patch0308: loongarch-Force-initrd-load-address-64KiB-alignment.patch
%endif

8
grub2.spec
View File

@ -14,7 +14,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 25 Release: 26
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/
@ -439,6 +439,12 @@ fi
%{_datadir}/man/man* %{_datadir}/man/man*
%changelog %changelog
* Sat Mar 18 2023 mengyingkun <mengyingkun@loongson.cn> - 1:2.06-26
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:loongarch: Force initrd load address 64KiB alignment
* Sat Mar 11 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.06-25 * Sat Mar 11 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.06-25
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA

26
loongarch-Force-initrd-load-address-64KiB-alignment.patch Normal file
View File

@ -0,0 +1,26 @@
From 1107e231094bf2e6cde9daea3bb22b1fccb92bc5 Mon Sep 17 00:00:00 2001
From: mengyingkun <mengyingkun@loongson.cn>
Date: Sat, 18 Mar 2023 09:33:41 +0800
Subject: [PATCH] loongarch: Force initrd load address 64KiB alignment
Signed-off-by: mengyingkun <mengyingkun@loongson.cn>
---
grub-core/loader/loongarch64/linux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/loader/loongarch64/linux.c b/grub-core/loader/loongarch64/linux.c
index 03b7940..5f1d845 100644
--- a/grub-core/loader/loongarch64/linux.c
+++ b/grub-core/loader/loongarch64/linux.c
@@ -329,7 +329,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
initrd_size = grub_get_initrd_size (&initrd_ctx);
grub_dprintf ("linux", "Loading initrd\n");
- initrd_mem = grub_linux_loongarch_alloc_initrd_mem_align (initrd_size, 0x1000, &err);
+ initrd_mem = grub_linux_loongarch_alloc_initrd_mem_align (initrd_size, 0x10000, &err);
if (err)
goto fail;
--
2.33.0