From b7d540bd4690125d6cf048dfd1006d9010a24ada Mon Sep 17 00:00:00 2001 From: Eduard Abdullin Date: Fri, 19 Jun 2026 09:16:49 +0000 Subject: [PATCH] Debrand for AlmaLinux Build btrfs module Drop backtrace module from riscv64-efi CC image --- grub-cc.macros | 6 ++++++ grub2.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/grub-cc.macros b/grub-cc.macros index a8b18d8..18eabc6 100644 --- a/grub-cc.macros +++ b/grub-cc.macros @@ -27,7 +27,13 @@ %global efi_cc_modules " efi_netfs efifwsetup efinet lsefi lsefimmap connectefi bli " +%ifarch riscv64 +# AlmaLinux: the backtrace module has no riscv64 backend, so backtrace.mod +# is not built for riscv64-efi. Drop it from the CC image module set. +%global cc_modules " chain tpm " +%else %global cc_modules " backtrace chain tpm " +%endif %define define_efi_cc_variant(o) \ diff --git a/grub2.spec b/grub2.spec index 9f94638..3c8f90d 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.12 -Release: 48%{?dist}.alma.1 +Release: 48%{?dist}.alma.2 Summary: Bootloader with support for Linux, Multiboot and more License: GPL-3.0-or-later URL: http://www.gnu.org/software/grub/ @@ -584,9 +584,10 @@ fi %endif %changelog -* Mon Jun 08 2026 Eduard Abdullin - 1:2.12-48.alma.1 +* Fri Jun 19 2026 Eduard Abdullin - 1:2.12-48.alma.2 - Debrand for AlmaLinux - Build btrfs module +- Drop backtrace module from riscv64-efi CC image * Fri Jun 05 2026 Nicolas Frayer - 2.12-48 - Centos: sign grub with 802