rpms/kernel-srpm-macros
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

merge into: rpms:f42
Branches Tags
rpms:rawhide
rpms:f43
rpms:main
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f34
rpms:f33
rpms:f32
...
pull from: rpms:rawhide
Branches Tags
rpms:f43
rpms:main
rpms:rawhide
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f34
rpms:f33
rpms:f32
Sign in to create a new pull request.

6 commits
f42 ... rawhide

Author SHA1 Message Date
Denys Vlasenko
1af058e32f macros.kmp: restore previous backslash-escaping of newline in "latest_kernel" macro 
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Resolves: #2108441
 2025-08-12 03:59:11 +02:00
Denys Vlasenko
6e2e136a06 macros.kmp: make the "do not run rpm -qa" change less intrusive 
Let's not delete "latest_kernel" macro

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Resolves: #2108441
 2025-08-12 03:50:35 +02:00
Denys Vlasenko
6b9840e4cb Merge #7 Speedup macros.kmp 2025-08-12 01:41:24 +00:00
Fedora Release Engineering
4b3dba68e8 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 18:23:31 +00:00
Andrea Bolognani
a2453a1952 Finish adding riscv64 
The %kernel_arches macro has been extended to include the
architecture in commit 0f81ee97a5 but on RHEL the value gets
overwritten at package build time. Make sure we do the right
thing there too.

Thanks: Zhengyu He <hezhy472013@gmail.com>
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
 2025-04-01 15:46:54 +02:00
Etienne Champetier
72be62cfea 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 <e.champetier@ateme.com>
Resolves: #2108441
 2023-06-01 09:16:07 -04:00
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kernel-srpm-macros.spec
View file

@ -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: 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
@ -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,12 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr
%{rrcdir}/rpmsort
%changelog
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Apr 01 2025 Andrea Bolognani <abologna@redhat.com> - 1.0-26
- Finish adding riscv64 (thanks Zhengyu He)
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

2
macros.kmp
View file

@ -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" \