X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre-dkms.spec.in;h=7b0c11592374fedcfda86b24fbf74a36df9b0730;hp=bb00efb92b78fd5466446e7e0dac2eaaea3e912a;hb=e6490ea6cf0b793c0b47f17ac5a5fa3a2a136e0d;hpb=b20c3709806977d0565660ef9ff38015e4fb5ef0

diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in
index bb00efb..7b0c115 100644
--- a/lustre-dkms.spec.in
+++ b/lustre-dkms.spec.in
@@ -1,4 +1,20 @@
-%define module  @PACKAGE@
+%bcond_without servers
+
+# Set the package name prefix
+%if %{with servers}
+    %define module  @PACKAGE@
+%else
+    %define module  @PACKAGE@-client
+%endif
+
+%if %{_vendor}=="redhat" || %{_vendor}=="fedora"
+	%global requires_kmod_name kmod-%{module}
+	%define mkconf_options
+%else	#for Suse / Ubuntu
+	%global requires_kmod_name %{module}-kmp
+	%define mkconf_options "-k updates"
+%endif
+
 %define buildid 1
 %define mkconf  lustre/scripts/dkms.mkconf
 
@@ -11,37 +27,53 @@ Summary:        Kernel module(s) (dkms)
 Group:          System Environment/Kernel
 License:        GPLv2+
 URL:            http://lustre.opensfs.org/
-Source0:        %{module}-%{version}.tar.gz
+Source0:        @PACKAGE@-%{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
+%if %{with servers}
+# Only zfs Lustre DKMS Server is supported
 Requires:       spl-dkms >= 0.6.1
 Requires:       zfs-dkms >= 0.6.1
+Requires:       %{module}-osd-zfs-mount
+# If client package is installed when installing server, remove it since
+# the server package also includes the client.  This can be removed if/when
+# the packages are split into independent client/server/common packages.
+Obsoletes:	@PACKAGE@-client < %{version}
+%endif
 Requires:       gcc, make, perl
-Requires:       python-docutils
 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
+Provides:       %{module}-osd-zfs = %{version}
+Provides:       %{module}-osd
+%endif
 
 %description
 This package contains the dkms Lustre kernel modules.
 
 %prep
-%setup -q -n %{module}-%{version}
+%setup -q -n @PACKAGE@-%{version}
 
 %build
-%{mkconf} -n %{module} -v %{version} -f dkms.conf
-sed -i 's/BUILDID[[:print:]]*/BUILDID = %{buildid}/' META
-sed -i 's/PRISTINE[[:print:]]*/PRISTINE = 1/' META
-cp META ldiskfs/META
+%{mkconf} -n %{module} -v %{version} -f dkms.conf %{mkconf_options}
 
 %install
 if [ "$RPM_BUILD_ROOT" != "/" ]; then
     rm -rf $RPM_BUILD_ROOT
 fi
 mkdir -p $RPM_BUILD_ROOT/usr/src/
-cp -rfp ${RPM_BUILD_DIR}/%{module}-%{version} $RPM_BUILD_ROOT/usr/src/
+cp -rfp ${RPM_BUILD_DIR}/@PACKAGE@-%{version} $RPM_BUILD_ROOT/usr/src/
+%if %{without servers}
+# To have the directory reflect the DKMS RPM name!
+mv $RPM_BUILD_ROOT/usr/src/@PACKAGE@-%{version} $RPM_BUILD_ROOT/usr/src/%{module}-%{version}
+%endif
 
 %clean
 if [ "$RPM_BUILD_ROOT" != "/" ]; then
@@ -71,5 +103,11 @@ dkms remove -m %{module} -v %{version} --all --rpm_safe_upgrade
 exit 0
 
 %changelog
-* Fri Apr  8 2013 Brian Behlendorf <behlendorf1@llnl.gov> - 2.3.63-1
+* Sat Jan 23 2016 Bruno Faccini <bruno.faccini@intel.com>
+ - detect and handle cases where [spl,zfs]-dkms packages are not built
+ - also handle on-target configure issues
+* Wed Oct  7 2015 Bruno Faccini <bruno.faccini@intel.com>
+ - adapted for Lustre Client DKMS creation
+ - allow for on-target reconfig to prevent static deps requires
+* Mon Apr  8 2013 Brian Behlendorf <behlendorf1@llnl.gov> - 2.3.63-1
 - First DKMS packages.