From 3e377eeeb12123405a233ad4ae7b3018a15f051e Mon Sep 17 00:00:00 2001 From: yangmingtaip Date: Wed, 7 Dec 2022 17:22:02 +0800 Subject: [PATCH] fix latest_kernel macro --- backport-kmp-feature.patch | 2 +- openEuler-rpm-config.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/backport-kmp-feature.patch b/backport-kmp-feature.patch index 0fce883..1f4625c 100644 --- a/backport-kmp-feature.patch +++ b/backport-kmp-feature.patch @@ -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" \ diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index e98e1af..d79539a 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 31 +Release: 32 License: GPL+ Summary: specific rpm configuration files 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 %changelog +* Wed Dec 7 2022 yangmingtai - 30-32 +- fix latest_kernel macro + * Wed Dec 7 2022 Yang Yanchao - 30-31 - backport kmp feature