fix latest_kernel macro

(cherry picked from commit ac2686fb6aaacf0ec3622aaad93529b5be7f0282)
This commit is contained in:
yangmingtaip 2022-12-07 17:22:02 +08:00 committed by openeuler-sync-bot
parent 268673a133
commit 6c6e6f69f9
2 changed files with 5 additions and 2 deletions

View File

@ -442,7 +442,7 @@ index d46aa04..78c2a57 100644
+ %define kmodtool %{-s*}%{!-s:/usr/lib/rpm/__vendor/kmodtool} \
+ %define kmp_version %{-v*}%{!-v:%{version}} \
+ %define kmp_release %{-r*}%{!-r:%{release}} \
+ %define latest_kernel %(rpm -q --qf '%{VERSION}-%{RELEASE}\\\\n' `rpm -q kernel-devel | head -n 1` | head -n 1) \
+ %define latest_kernel %(rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}\\\\n' `rpm -q kernel-devel | head -n 1` | head -n 1) \
+ %{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \
+ %global kverrel %(%kmodtool verrel %{?kernel_version} 2>/dev/null) \
+ flavors="default" \

View File

@ -3,7 +3,7 @@
Name: %{vendor}-rpm-config
Version: 30
Release: 29
Release: 30
License: GPL+
Summary: specific rpm configuration files
URL: https://gitee.com/openeuler/openEuler-rpm-config
@ -127,6 +127,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir
%{rpmvdir}/find-requires.ksyms
%changelog
* Wed Dec 7 2022 yangmingtai <yangmingtai@huawei.com> - 30-30
- fix latest_kernel macro
* Wed Dec 7 2022 Yang Yanchao <yangyanchao6@huawei.com> - 30-29
- backport kmp feature