From: Bruno Faccini <bruno.faccini@intel.com>
Date: Fri, 5 Sep 2014 15:13:18 +0000 (+0200)
Subject: LU-5465 build: strengthen Lustre DKMS RPM install
X-Git-Tag: 2.7.61~9
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=7d31575a5e2a488c289ce17a2d7a766d8856adf4;hp=64df136d23a197ad1579877dbd063e789ae7b9d1

LU-5465 build: strengthen Lustre DKMS RPM install

This patch adds more control in Lustre DKMS RPM to take care that
its further install+build will not conflict with legacy lustre-osd
and lustre-modules RPMs already installed.

Signed-off-by: Bruno Faccini <bruno.faccini@intel.com>
Change-Id: Ie35e96326811f239d614aea19ae179b73c5961f3
Reviewed-on: http://review.whamcloud.com/11776
Tested-by: Jenkins
Reviewed-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in
index bb00efb..1197438 100644
--- a/lustre-dkms.spec.in
+++ b/lustre-dkms.spec.in
@@ -15,14 +15,22 @@ Source0:        %{module}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+# DKMS >= 2.2.0.3-28.git.7c3e7c5 to fully support inter-modules deps
+# (ie, "BUILD_DEPENDS[#]=<pkg>"), and have latest DKMS fixes integrated
+# for bugs that prevented our module to build/install.
 Requires:       dkms >= 2.2.0.3-28.git.7c3e7c5
 Requires:       spl-dkms >= 0.6.1
 Requires:       zfs-dkms >= 0.6.1
 Requires:       gcc, make, perl
 Requires:       python-docutils
 Requires:       kernel-devel
-Provides:       %{module}-kmod = %{version}
-Provides:       %{module}-modules = %{version}
+Requires:       @PACKAGE@-osd-zfs-mount
+Provides:       @PACKAGE@-kmod = %{version}
+Provides:       @PACKAGE@-modules = %{version}
+Provides:       @PACKAGE@-osd-zfs
+Conflicts:      @PACKAGE@-modules
+Conflicts:      @PACKAGE@-client-modules
+Conflicts:      @PACKAGE@-osd-zfs
 
 %description
 This package contains the dkms Lustre kernel modules.