From 483e31e1cc8f234baac77c1a0ac83afdef953074 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Mon, 12 Dec 2022 16:36:07 +1100 Subject: [PATCH] LU-16382 spec: add dependency on kernel-%1 The SUSE OBS rpmlint tool wants all kmps to depend on the base kernel. As RH uses didn't package naming to SUSE, these dependencies must be conditional. Test-Parameters: trivial Signed-off-by: Mr NeilBrown Change-Id: I4f8525dd2ba35b824bcfbd4097505bdfe7b11e0f Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49371 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Shaun Tancheff Reviewed-by: jsimmons Reviewed-by: xinliang Reviewed-by: Oleg Drokin --- lustre.spec.in | 9 +++++---- rpm/kmp-lustre-osd-ldiskfs.preamble | 3 +++ rpm/kmp-lustre-osd-zfs.preamble | 3 +++ rpm/kmp-lustre-tests.preamble | 4 ++++ rpm/kmp-lustre.preamble | 3 +++ 5 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 rpm/kmp-lustre-tests.preamble diff --git a/lustre.spec.in b/lustre.spec.in index 3109e71..870b0e7 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -206,9 +206,10 @@ 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 -Source8: find-provides -Source9: find-provides.ksyms +Source7: kmp-lustre-tests.preamble +Source8: kmp-lustre-tests.files +Source9: find-provides +Source10: find-provides.ksyms URL: https://wiki.whamcloud.com/ BuildRoot: %{_tmppath}/lustre-%{version}-root %if %{with lustre_modules} @@ -418,7 +419,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 diff --git a/rpm/kmp-lustre-osd-ldiskfs.preamble b/rpm/kmp-lustre-osd-ldiskfs.preamble index cdd8a12..135ea61 100644 --- a/rpm/kmp-lustre-osd-ldiskfs.preamble +++ b/rpm/kmp-lustre-osd-ldiskfs.preamble @@ -1,4 +1,7 @@ License: GPL-2.0-only +%if 0%{?suse_version} > 1 +Requires: kernel-%1 +%endif Requires: %{requires_kmod_name} = %{requires_kmod_version} Requires: ldiskfsprogs >= 1.44.3.wc1 Requires: %{name}-osd-ldiskfs-mount = %{version} diff --git a/rpm/kmp-lustre-osd-zfs.preamble b/rpm/kmp-lustre-osd-zfs.preamble index 339ed9b..b6581b9 100644 --- a/rpm/kmp-lustre-osd-zfs.preamble +++ b/rpm/kmp-lustre-osd-zfs.preamble @@ -1,5 +1,8 @@ Summary: Lustre osd-zfs feature support License: GPL-2.0-only +%if 0%{?suse_version} > 1 +Requires: kernel-%1 +%endif Requires: %{name}-osd-zfs-mount = %{version} Provides: %{name}-osd = %{version} Obsoletes: %{name}-osd-zfs < %{version} diff --git a/rpm/kmp-lustre-tests.preamble b/rpm/kmp-lustre-tests.preamble new file mode 100644 index 0000000..ba488f1 --- /dev/null +++ b/rpm/kmp-lustre-tests.preamble @@ -0,0 +1,4 @@ +License: GPL-2.0-only +%if 0%{?suse_version} > 1 +Requires: kernel-%1 +%endif diff --git a/rpm/kmp-lustre.preamble b/rpm/kmp-lustre.preamble index 9224573..edb68f0 100644 --- a/rpm/kmp-lustre.preamble +++ b/rpm/kmp-lustre.preamble @@ -1,2 +1,5 @@ +%if 0%{?suse_version} > 1 +Requires: kernel-%1 +%endif Obsoletes: %{name}-modules < %{version} License: GPL-2.0-only -- 1.8.3.1