From 970304d45d5176e5a9442dc872a176670ceb42c7 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Tue, 1 Apr 2025 16:02:20 +0200 Subject: [PATCH] Finish adding riscv64 The %kernel_arches macro has been extended to include the architecture in commit 0f81ee97a59e but on RHEL the value gets overwritten at package build time. Make sure we do the right thing there too. Resolves: RHEL-85853 Thanks: Zhengyu He Signed-off-by: Andrea Bolognani --- kernel-srpm-macros.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel-srpm-macros.spec b/kernel-srpm-macros.spec index 2829050..6fab8fa 100644 --- a/kernel-srpm-macros.spec +++ b/kernel-srpm-macros.spec @@ -1,7 +1,7 @@ Name: kernel-srpm-macros Version: 1.0 # when bumping version and resetting release, don't forget to bump version of kernel-rpm-macros as well -Release: 25%{?dist} +Release: 26%{?dist} Summary: RPM macros that list arches the full kernel is built on # This package only exist in Fedora repositories # The license is the standard (MIT) specified in @@ -94,7 +94,7 @@ cp -p %{sources} . mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d install -p -m 0644 -t %{buildroot}/%{_rpmconfigdir}/macros.d macros.kernel-srpm %if 0%{?rhel} >= 8 - sed -i 's/^%%kernel_arches.*/%%kernel_arches x86_64 s390x ppc64le aarch64/' \ + sed -i 's/^%%kernel_arches.*/%%kernel_arches x86_64 s390x ppc64le aarch64 riscv64/' \ %{buildroot}/%{_rpmconfigdir}/macros.d/macros.kernel-srpm %endif @@ -136,6 +136,10 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr %{rrcdir}/rpmsort %changelog +* Tue Apr 01 2025 Andrea Bolognani - 1.0-26 +- Finish adding riscv64 (thanks Zhengyu He) + Resolves: RHEL-85853 + * Tue Oct 29 2024 Troy Dawson - 1.0-25 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018