From d4778ad25799ac83edd4ac784aa5314fac9f8b23 Mon Sep 17 00:00:00 2001 From: Nathaniel Clark Date: Mon, 13 Feb 2017 09:55:49 -0500 Subject: [PATCH] LU-8934 spec: Use correct provides in lustre-dkms Provide kmod-lustre instead of lustre-kmod so that the lustre rpm requires matches up correctly. This also adds some support for suse which names thier kmod packages differently. Test-Parameters: trivial Signed-off-by: Nathaniel Clark Change-Id: Ifd3484ade6a90d4492852c7b61db629b934d5a03 Reviewed-on: https://review.whamcloud.com/25417 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- lustre-dkms.spec.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in index 9c30502..8b8aa2f 100644 --- a/lustre-dkms.spec.in +++ b/lustre-dkms.spec.in @@ -7,6 +7,12 @@ %define module @PACKAGE@-client %endif +%if %{_vendor}=="redhat" || %{_vendor}=="fedora" + %global requires_kmod_name kmod-%{module} +%else #for Suse + %global requires_kmod_name %{module}-kmp +%endif + %define buildid 1 Name: %{module}-dkms @@ -34,7 +40,7 @@ Requires: %{module}-osd-zfs-mount %endif Requires: gcc, make, perl Requires: kernel-devel -Provides: %{module}-kmod = %{version} +Provides: %{requires_kmod_name} = %{version} Provides: %{module}-modules = %{version} %if %{with servers} # Only zfs Lustre DKMS Server is supported -- 1.8.3.1