From 70ce43502c6ed247c668b6c1b7fde7d468b1db69 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 12 Aug 2025 04:27:16 +0200 Subject: [PATCH] kernel-srpm-macros.spec: bump the release to 14 - macros.kmp: do not run `rpm -qa` Resolves: RHEL-57823 Signed-off-by: Denys Vlasenko --- kernel-srpm-macros.spec | 6 +++++- macros.kmp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel-srpm-macros.spec b/kernel-srpm-macros.spec index 76beedc..22ab176 100644 --- a/kernel-srpm-macros.spec +++ b/kernel-srpm-macros.spec @@ -1,6 +1,6 @@ Name: kernel-srpm-macros Version: 1.0 -Release: 13%{?dist} +Release: 14%{?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 @@ -134,6 +134,10 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr %{rrcdir}/find-provides.d/modalias.prov %changelog +* Mon Aug 12 2025 Denys Vlasenko - 1.0-14 +- macros.kmp: do not run `rpm -qa` +Resolves: RHEL-57823 + * Mon Jun 12 2023 Eugene Syromiatnikov - 1.0-13 - Handle symvers.xz in kabi.attr (#2209253). - Fix indirect __crc_* sumbols parsing in find-provides.ksyms diff --git a/macros.kmp b/macros.kmp index f8034ee..de12c9f 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' `rpm -qa | egrep "^kernel(-rt|-aarch64)?-devel" | /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" \