From 72be62cfea2f899a8a2626ded45c55b2ad53f45d Mon Sep 17 00:00:00 2001 From: Etienne Champetier Date: Thu, 1 Jun 2023 08:28:28 -0400 Subject: [PATCH 1/7] macros.kmp: do not run `rpm -qa` If kernel_version is defined, there is no need to lookup the latest kernel*-devel package version, if it's not defined, we can only look for the relevant packages instead of using `rpm -qa`. Signed-off-by: Etienne Champetier Resolves: #2108441 --- macros.kmp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/macros.kmp b/macros.kmp index 00c0467..70aeac1 100644 --- a/macros.kmp +++ b/macros.kmp @@ -59,8 +59,7 @@ redhat_kmp_has_post_hooks 1 %global kmodtool %{-s*}%{!-s:/usr/lib/rpm/redhat/kmodtool} \ %global kmod_version %{-v*}%{!-v:%{version}} \ %global kmod_release %{-r*}%{!-r:%{release}} \ - %global latest_kernel %({ rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}\\\\n' `rpm -qa | egrep "^kernel(-rt|-aarch64)?-devel" | /usr/lib/rpm/redhat/rpmsort -r | head -n 1`; echo '%%%%{nil}'; } | head -n 1) \ - %{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \ + %{!?kernel_version:%{expand:%%global kernel_version %({ rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}\\n' kernel-rt-devel kernel-aarch64-devel kernel-devel | grep -v 'is not installed' | /usr/lib/rpm/redhat/rpmsort -r | head -n 1; echo '%%%%{nil}'; } | head -n 1)}} \ %global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \ flavors="default" \ if [ -z "%*" ]; then \ From cf850ea1cf3d39524a8c667e358ea5876889d97a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:39:22 +0000 Subject: [PATCH 2/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- kernel-srpm-macros.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel-srpm-macros.spec b/kernel-srpm-macros.spec index a737bdf..6c46fa1 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: 23%{?dist} +Release: 24%{?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 @@ -136,6 +136,9 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr %{rrcdir}/rpmsort %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.0-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Mar 06 2024 David Abdurachmanov - 1.0-23 - Add riscv64 From b3edcbf9d65ee29deeb9b9a9476aa326aeac11d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 08:38:09 +0000 Subject: [PATCH 3/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- kernel-srpm-macros.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel-srpm-macros.spec b/kernel-srpm-macros.spec index 6c46fa1..e5499fc 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: 24%{?dist} +Release: 25%{?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 @@ -136,6 +136,9 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr %{rrcdir}/rpmsort %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.0-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 1.0-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a2453a195264e81b1df7a9765dce5f53f1313cbd Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Tue, 1 Apr 2025 15:44:37 +0200 Subject: [PATCH 4/7] 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. Thanks: Zhengyu He Signed-off-by: Andrea Bolognani --- kernel-srpm-macros.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel-srpm-macros.spec b/kernel-srpm-macros.spec index e5499fc..7a5fc12 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,9 @@ 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) + * Fri Jan 17 2025 Fedora Release Engineering - 1.0-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4b3dba68e87c34b64f2aed75dc001a8b07061d27 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:23:31 +0000 Subject: [PATCH 5/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- kernel-srpm-macros.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel-srpm-macros.spec b/kernel-srpm-macros.spec index 7a5fc12..058c08e 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: 26%{?dist} +Release: 27%{?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 @@ -136,6 +136,9 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr %{rrcdir}/rpmsort %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Apr 01 2025 Andrea Bolognani - 1.0-26 - Finish adding riscv64 (thanks Zhengyu He) From 6e2e136a06c67ae7d31d062163c308ba9445453f Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 12 Aug 2025 03:49:00 +0200 Subject: [PATCH 6/7] macros.kmp: make the "do not run `rpm -qa`" change less intrusive Let's not delete "latest_kernel" macro Signed-off-by: Denys Vlasenko Resolves: #2108441 --- macros.kmp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/macros.kmp b/macros.kmp index 70aeac1..4daab32 100644 --- a/macros.kmp +++ b/macros.kmp @@ -59,7 +59,8 @@ redhat_kmp_has_post_hooks 1 %global kmodtool %{-s*}%{!-s:/usr/lib/rpm/redhat/kmodtool} \ %global kmod_version %{-v*}%{!-v:%{version}} \ %global kmod_release %{-r*}%{!-r:%{release}} \ - %{!?kernel_version:%{expand:%%global kernel_version %({ rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}\\n' kernel-rt-devel kernel-aarch64-devel kernel-devel | grep -v 'is not installed' | /usr/lib/rpm/redhat/rpmsort -r | head -n 1; echo '%%%%{nil}'; } | head -n 1)}} \ + %global latest_kernel %({ rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}\\n' kernel-rt-devel kernel-aarch64-devel kernel-devel | grep -v 'is not installed' | /usr/lib/rpm/redhat/rpmsort -r | head -n 1; echo '%%%%{nil}'; } | head -n 1) \ + %{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \ %global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \ flavors="default" \ if [ -z "%*" ]; then \ From 1af058e32f13f3e5e6da785654c4898b14c16262 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 12 Aug 2025 03:59:11 +0200 Subject: [PATCH 7/7] macros.kmp: restore previous backslash-escaping of newline in "latest_kernel" macro Signed-off-by: Denys Vlasenko Resolves: #2108441 --- macros.kmp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros.kmp b/macros.kmp index 4daab32..fdfc182 100644 --- a/macros.kmp +++ b/macros.kmp @@ -59,7 +59,7 @@ redhat_kmp_has_post_hooks 1 %global kmodtool %{-s*}%{!-s:/usr/lib/rpm/redhat/kmodtool} \ %global kmod_version %{-v*}%{!-v:%{version}} \ %global kmod_release %{-r*}%{!-r:%{release}} \ - %global latest_kernel %({ rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}\\n' kernel-rt-devel kernel-aarch64-devel kernel-devel | grep -v 'is not installed' | /usr/lib/rpm/redhat/rpmsort -r | head -n 1; echo '%%%%{nil}'; } | head -n 1) \ + %global latest_kernel %({ rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}\\\\n' kernel-rt-devel kernel-aarch64-devel kernel-devel | grep -v 'is not installed' | /usr/lib/rpm/redhat/rpmsort -r | head -n 1; echo '%%%%{nil}'; } | head -n 1) \ %{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \ %global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \ flavors="default" \