[rpms/grub2] f45: Only build CC variant for aarch64 and x86_64

[rpms/grub2] f45: Only build CC variant for aarch64 and x86_64

[Andrea Bolognani]

            A new commit has been pushed.

            Repo   : rpms/grub2
            Branch : f45
            Commit : ec1e80390ba7ca935a6d07e2d830e6d89a29de2a
            Author : Andrea Bolognani <abologna@redhat.com>
            Date   : 2026-08-17T17:52:41+02:00
            Stats  : +21/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/grub2/c/ec1e80390ba7ca935a6d07e2d830e6d89a29de2a?branch=f45

            Log:
            Only build CC variant for aarch64 and x86_64

Currently we attempt to build it on riscv64 too, but that
fails with

  grub-mkimage: error: cannot open `grub-core/backtrace.mod':
  No such file or directory.

Trying to get CC running on riscv64 is premature anyway.
Explicitly limit the CC build to aarch64 and x86_64.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>

---
diff --git a/grub.macros b/grub.macros
index e6d8c0e..5cbda3a 100644
--- a/grub.macros
+++ b/grub.macros
@@ -95,6 +95,7 @@
 
 %global with_efi_arch 0
 %global with_alt_efi_arch 0
+%global with_efi_cc 0
 %global with_legacy_arch 0
 %global with_emu_arch 1
 %global with_xen_arch 0
@@ -129,6 +130,7 @@
 
 %global efi_only aarch64 %{arm} riscv64
 %global efi_arch x86_64 ia64 %{efi_only}
+%global efi_cc aarch64 x86_64
 %ifarch %{efi_arch}
 %global with_efi_arch 1
 %else
@@ -139,10 +141,17 @@
 %else
 %global with_efi_only 0
 %endif
+%ifarch %{efi_cc}
+%global with_efi_cc 1
+%else
+%global with_efi_cc 0
+%endif
 %{!?with_efi_arch:%global without_efi_arch 0}
 %{?with_efi_arch:%global without_efi_arch 1}
 %{!?with_efi_only:%global without_efi_only 0}
 %{?with_efi_only:%global without_efi_only 1}
+%{!?with_efi_cc:%global without_efi_cc 0}
+%{?with_efi_cc:%global without_efi_cc 1}
 
 %ifarch %{efi_arch}
 %global efi_modules " efi_netfs efifwsetup efinet lsefi lsefimmap connectefi bli "

diff --git a/grub2.spec b/grub2.spec
index 203033f..2a7e5c2 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.12
-Release:	75%{?dist}
+Release:	76%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPL-3.0-or-later
 URL:		http://www.gnu.org/software/grub/
@@ -159,8 +159,10 @@ This subpackage provides tools for support of all platforms.
 
 %if 0%{with_efi_arch}
 %{expand:%define_efi_variant %%{package_arch} -o}
+%if 0%{with_efi_cc}
 %{expand:%define_efi_cc_variant %%{package_arch} -o}
 %endif
+%endif
 %if 0%{with_alt_efi_arch}
 %{expand:%define_efi_variant %%{alt_package_arch}}
 %endif
@@ -247,8 +249,10 @@ git commit -m "After making subdirs"
 %build
 %if 0%{with_efi_arch}
 %{expand:%do_primary_efi_build %%{grubefiarch} %%{grubefiname} %%{grubeficdname} %%{_target_platform} %%{efi_target_cflags} %%{efi_host_cflags}}
+%if 0%{with_efi_cc}
 %{expand:%do_primary_efi_cc_build %%{grubefiarch} %%{grubeficcname} %%{grubeficccdname} %%{_target_platform} %%{efi_target_cflags} %%{efi_host_cflags}}
 %endif
+%endif
 %if 0%{with_alt_efi_arch}
 %{expand:%do_alt_efi_build %%{grubaltefiarch} %%{grubaltefiname} %%{grubalteficdname} %%{_alt_target_platform} %%{alt_efi_target_cflags} %%{alt_efi_host_cflags}}
 %endif
@@ -283,8 +287,10 @@ rm -fr $RPM_BUILD_ROOT
 %do_common_install
 %if 0%{with_efi_arch}
 %{expand:%do_efi_install %%{grubefiarch} %%{grubefiname} %%{grubeficdname}}
+%if 0%{with_efi_cc}
 %{expand:%do_efi_cc_install %%{grubefiarch} %%{grubeficcname} %%{grubeficccdname}}
 %endif
+%endif
 %if 0%{with_alt_efi_arch}
 %{expand:%do_alt_efi_install %%{grubaltefiarch} %%{grubaltefiname} %%{grubalteficdname}}
 %endif
@@ -668,8 +674,10 @@ fi
 
 %if 0%{with_efi_arch}
 %{expand:%define_efi_variant_files %%{package_arch} %%{grubefiname} %%{grubeficdname} %%{grubefiarch} %%{target_cpu_name} %%{grub_target_name}}
+%if 0%{with_efi_cc}
 %{expand:%define_efi_cc_variant_files %%{package_arch} %%{grubeficcname} %%{grubeficccdname} %%{grubefiarch} %%{target_cpu_name} %%{grub_target_name}}
 %endif
+%endif
 %if 0%{with_alt_efi_arch}
 %{expand:%define_efi_variant_files %%{alt_package_arch} %%{grubaltefiname} %%{grubalteficdname} %%{grubaltefiarch} %%{alt_target_cpu_name} %%{alt_grub_target_name}}
 %endif
@@ -694,6 +702,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 17 2026 Andrea Bolognani <abologna@redhat.com> - 2.12-76
+- Only build CC variant for aarch64 and x86_64
+
 * Thu Aug 13 2026 Josue Hernandez <josherna@redhat.com> - 2.12-75
 - Fix systemd timer,service permissions
 - Resolves: #2512037