custom/rpm-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!111 fix latest_kernel macro

Browse Source 
From: @yangmingtaip 
Reviewed-by: @overweight 
Signed-off-by: @overweight
This commit is contained in:
openeuler-ci-bot 2022-12-10 02:34:28 +00:00 committed by Gitee
commit 68d825e06b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backport-kmp-feature.patch
View File

@ -442,7 +442,7 @@ index d46aa04..78c2a57 100644
+ %define kmodtool %{-s*}%{!-s:/usr/lib/rpm/__vendor/kmodtool} \ + %define kmodtool %{-s*}%{!-s:/usr/lib/rpm/__vendor/kmodtool} \
+ %define kmp_version %{-v*}%{!-v:%{version}} \ + %define kmp_version %{-v*}%{!-v:%{version}} \
+ %define kmp_release %{-r*}%{!-r:%{release}} \ + %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}}} \ + %{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \
+ %global kverrel %(%kmodtool verrel %{?kernel_version} 2>/dev/null) \ + %global kverrel %(%kmodtool verrel %{?kernel_version} 2>/dev/null) \
+ flavors="default" \ + flavors="default" \

5
openEuler-rpm-config.spec
View File

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