From 8a22e0beb1c896d63a228f1e71e8bb03af3290f3 Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Mon, 17 Nov 2025 10:57:37 +0800 Subject: [PATCH] Enable GRUB EFI build support for sw_64 architecture in grub.macros --- grub.macros | 14 +++++++++++--- grub2.spec | 8 +++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/grub.macros b/grub.macros index 082eb2b..dfd6f5e 100644 --- a/grub.macros +++ b/grub.macros @@ -99,7 +99,7 @@ %endif -%global efi_only aarch64 %{arm} riscv64 loongarch64 +%global efi_only aarch64 %{arm} riscv64 loongarch64 sw_64 %global efi_arch x86_64 ia64 %{efi_only} %ifarch %{efi_arch} %global with_efi_arch 1 @@ -117,13 +117,13 @@ %{?with_efi_only:%global without_efi_only 1} ### fixme -%ifarch aarch64 %{arm} riscv64 loongarch64 +%ifarch aarch64 %{arm} riscv64 loongarch64 sw_64 %global efi_modules " tpm tpcm_kunpeng " %else %global efi_modules " backtrace chain tpm usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard " %endif -%ifarch aarch64 %{arm} riscv64 +%ifarch aarch64 %{arm} riscv64 loongarch64 sw_64 %global legacy_provides -l %endif @@ -200,6 +200,14 @@ %global package_arch efi-loongarch64 %endif +%ifarch sw_64 +%global with_emu_arch 0 +%global efiarch sw64 +%global target_cpu_name sw_64 +%global grub_target_name sw64-efi +%global package_arch efi-sw64 +%endif + %global _target_platform %{target_cpu_name}-%{_vendor}-%{_target_os}%{?_gnu} %global _alt_target_platform %{alt_target_cpu_name}-%{_vendor}-%{_target_os}%{?_gnu} diff --git a/grub2.spec b/grub2.spec index 4c8e019..97a6fb6 100644 --- a/grub2.spec +++ b/grub2.spec @@ -23,7 +23,7 @@ Name: grub2 Epoch: 1 Version: 2.12 -Release: 45 +Release: 46 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -464,6 +464,12 @@ fi %{_datadir}/man/man* %changelog +* Thu Oct 23 2025 yueyuankun - 1:2.12-46 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:SW64: Enable GRUB EFI build support for sw_64 architecture + * Fri Sep 19 2025 yechao-w - 1:2.12-45 - Type:bugfix - CVE:NA -- Gitee