From 79165a3770b35aa54f314ed2720d33ebf4f7c76b Mon Sep 17 00:00:00 2001 From: Xinliang Liu Date: Thu, 1 Jun 2023 08:57:14 +0000 Subject: [PATCH] Fix install kmod-lustre-client-tests warning Fix below install warnings, becuase kmod-lustre-client-tests requires kmod-lustre-client. depmod: WARNING: /lib/modules/5.10.0-152.0.0.78.oe2203sp2.aarch64/extra/lustre-client-tests/fs/llog_test.ko needs unknown symbol class_unregister_type depmod: WARNING: /lib/modules/5.10.0-152.0.0.78.oe2203sp2.aarch64/extra/lustre-client-tests/fs/llog_test.ko needs unknown symbol llog_process ... Signed-off-by: Xinliang Liu (cherry picked from commit b4462c118cd174878bbf948b3d53aec298e2a29e) --- kmp-lustre-tests.preamble | 5 +++++ lustre.spec | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 kmp-lustre-tests.preamble diff --git a/kmp-lustre-tests.preamble b/kmp-lustre-tests.preamble new file mode 100644 index 0000000..7de5d66 --- /dev/null +++ b/kmp-lustre-tests.preamble @@ -0,0 +1,5 @@ +License: GPL-2.0-only +Requires: %{requires_kmod_name} = %{requires_kmod_version} +%if 0%{?suse_version} > 1 +Requires: kernel-%1 +%endif diff --git a/lustre.spec b/lustre.spec index bc5d4c3..baed0cf 100644 --- a/lustre.spec +++ b/lustre.spec @@ -179,7 +179,7 @@ Summary: Lustre File System Name: %{lustre_name} Version: 2.15.2 -Release: 2 +Release: 3 License: GPL-2.0-only AND LGPL-2.1-or-later Group: System Environment/Kernel Source: https://github.com/lustre/lustre-release/archive/refs/tags/%{version}.tar.gz @@ -189,7 +189,8 @@ Source3: kmp-lustre-osd-ldiskfs.preamble Source4: kmp-lustre-osd-ldiskfs.files Source5: kmp-lustre-osd-zfs.preamble Source6: kmp-lustre-osd-zfs.files -Source7: kmp-lustre-tests.files +Source7: kmp-lustre-tests.preamble +Source8: kmp-lustre-tests.files URL: https://wiki.whamcloud.com/ BuildRoot: %{_tmppath}/lustre-%{version}-root @@ -403,7 +404,7 @@ This package contains a set of test binaries and scripts that are intended to be used by the Lustre testing framework. %if %{with lustre_modules} -%kernel_module_package -n %{name}-tests -f %SOURCE7 %{_flavor} +%kernel_module_package -n %{name}-tests -p %SOURCE7 -f %SOURCE8 %{_flavor} %endif %endif @@ -872,6 +873,9 @@ rm -rf $RPM_BUILD_ROOT rm -rf %{_tmppath}/kmp %changelog +* Thu Jun 01 2023 Xinliang Liu - 2.15.2-3 +- Fix kmod-lustre-client-tests install warnings + * Fri May 12 2023 Xinliang Liu - 2.15.2-2 - Fix client build requires libmount-devel -- Gitee