X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre-dkms.spec.in;h=7b0c11592374fedcfda86b24fbf74a36df9b0730;hb=3f0a7241c434d9556308299eea069628715816c2;hp=788b74a56fea29646294446ec0d17b2da6c63dff;hpb=549c57e77b7f3a4cae5a7381d612a499c2ca3dcc;p=fs%2Flustre-release.git

diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in
index 788b74a..7b0c115 100644
--- a/lustre-dkms.spec.in
+++ b/lustre-dkms.spec.in
@@ -7,7 +7,16 @@
     %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
 
 Name:           %{module}-dkms
 
@@ -31,10 +40,14 @@ Requires:       dkms >= 2.2.0.3-28.git.7c3e7c5
 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:       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
@@ -49,64 +62,7 @@ This package contains the dkms Lustre kernel modules.
 %setup -q -n @PACKAGE@-%{version}
 
 %build
-cat << EOF > dkms.conf
-# Embryonic lustre-dkms dkms.conf to allow for on-target accurate and full
-# version re-create during first dkms add stage.
-PACKAGE_NAME=%{module}
-PACKAGE_VERSION=%{version}
-POST_ADD="lustre-dkms_post-add.sh \$module \$module_version \$kernelver \
-	 \$kernel_source_dir \$arch \$source_tree \$dkms_tree"
-# at least one DEST_MODULE_LOCATION[] element, along with an install
-# path made of either "extra" or "updates" subdir, are required during
-# dkms.conf validity check of "dkms add" step.
-DEST_MODULE_LOCATION[${#DEST_MODULE_LOCATION[@]}]="/extra/lnet/"
-EOF
-
-cat << EOF > lustre-dkms_post-add.sh
-#!/bin/bash
-# \$1 : \$module
-# \$2 : \$module_version
-# \$3 : \$kernelver
-# \$4 : \$kernel_source_dir
-# \$5 : \$arch
-# \$6 : \$source_tree
-# \$7 : \$dkms_tree
-
-if [ \$1 = "lustre-client" ] ; then
-	SERVER="--disable-server"
-else
-	SPL_VERSION=\$(dkms status -m spl -k \$3/\$5 | awk -F', ' '{print \$2; exit 0}' | sed 's/: added\\\$//')
-	ZFS_VERSION=\$(dkms status -m zfs -k \$3/\$5 | awk -F', ' '{print \$2; exit 0}' | sed 's/: added\\\$//')
-
-	SERVER="--enable-server --disable-ldiskfs --with-linux=\$4 --with-linux-obj=\$4 \\
-	       --with-spl=\$6/spl-\${SPL_VERSION} \\
-	       --with-spl-obj=\$7/spl/\${SPL_VERSION}/\$3/\$5 \\
-	       --with-zfs=\$6/zfs-\${ZFS_VERSION} \\
-	       --with-zfs-obj=\$7/zfs/\${ZFS_VERSION}/\$3/\$5"
-fi
-
-rpm -qa | grep krb5-devel >/dev/null
-if [ \$? == 0 ] ; then
-        GSS="--enable-gss"
-else
-        GSS="--disable-gss"
-fi
-
-# run a configure pass to clean "--enable-dist" only effect and also to
-# ensure local/on-target environment to be taken into account
-./configure --enable-modules --disable-iokit --disable-snmp --disable-doc \\
-        --disable-utils --disable-tests --disable-maintainer-mode \\
-        \$GSS \$SERVER \\
-        --disable-manpages --disable-dlc
-# re-create dkms.conf based on this
-lustre/scripts/dkms.mkconf -n \$1 -v \$2 -f ./dkms.conf
-EOF
-
-chmod 755 lustre-dkms_post-add.sh
-
-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
@@ -147,8 +103,11 @@ dkms remove -m %{module} -v %{version} --all --rpm_safe_upgrade
 exit 0
 
 %changelog
+* 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
-* Fri Apr  8 2013 Brian Behlendorf <behlendorf1@llnl.gov> - 2.3.63-1
+* Mon Apr  8 2013 Brian Behlendorf <behlendorf1@llnl.gov> - 2.3.63-1
 - First DKMS packages.