From 73aac551cfd7c7eefca4c0d448cd0e7937a8ca4f Mon Sep 17 00:00:00 2001 From: liqiang1118 Date: Mon, 26 Sep 2022 10:13:24 +0800 Subject: [PATCH] update --- add-kernel_version-macro.patch | 24 ++++++++++++++++++++++++ openEuler-rpm-config.spec | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 add-kernel_version-macro.patch diff --git a/add-kernel_version-macro.patch b/add-kernel_version-macro.patch new file mode 100644 index 0000000..5444028 --- /dev/null +++ b/add-kernel_version-macro.patch @@ -0,0 +1,24 @@ +From 289488cb684df15219ef3015dfda8d97db3b4473 Mon Sep 17 00:00:00 2001 +From: liqiang1118 +Date: Mon, 26 Sep 2022 10:47:16 +0800 +Subject: [PATCH] add kernel_version macro + +--- + macros.kmp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/macros.kmp b/macros.kmp +index be66e64..5983d84 100644 +--- a/macros.kmp ++++ b/macros.kmp +@@ -18,4 +18,7 @@ kernel_module_package_release 1 + %global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \ + python3 %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} %{-f*}%{!-f:%filelist} \ + )} ++%kernel_version %{expand:%( \ ++ echo `uname -r` ++)} + +-- +2.23.0 + diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index ea71e8a..5bd4dcc 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 27 +Release: 28 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -20,6 +20,7 @@ Patch6: add-brp-scripts-to-delete-rpath.patch Patch7: add-common-script.patch Patch8: Fix-python3_version-macros-for-Python-3.10.patch Patch9: Give-a-warning-when-using-kabi-outside-our-stablelis.patch +Patch10: add-kernel_version-macro.patch Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} @@ -123,6 +124,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/%{_vendor} common.lua %{rpmvdir}/find-requires.ksyms %changelog +* Mon Sep 26 2022 liqiang - 30-28 +- fix macros.kmp + * Thu Sep 8 2022 yangmingtai - 30-27 - add find-requires and find-requires.ksyms -- Gitee