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

diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in
index 9c30502..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,47 +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 run of Lustre DKMS module build step.
-PACKAGE_NAME=%{module}
-PACKAGE_VERSION=%{version}
-PACKAGE_CONFIG="/etc/sysconfig/lustre"
-PRE_BUILD="lustre-dkms_pre-build.sh \$module \$module_version \$kernelver \
-	 \$kernel_source_dir \$arch \$source_tree \$dkms_tree"
-POST_BUILD="lustre-dkms_post-build.sh \$module \$module_version \$kernelver \
-	 \$kernel_source_dir \$arch \$source_tree \$dkms_tree"
-EOF
-%if %{with servers}
-cat << EOF >> dkms.conf
-BUILD_DEPENDS[0]="zfs"
-EOF
-%endif
-cat << EOF >> dkms.conf
-AUTOINSTALL="yes"
-REMAKE_INITRD="no"
-MAKE[0]="make"
-# just have to set STRIP[0], it will become the new default.
-STRIP[0]="\$(
-  [[ -r \${PACKAGE_CONFIG} ]] \\
-  && source \${PACKAGE_CONFIG} \\
-  && shopt -q -s extglob \\
-  && [[ \${LUSTRE_DKMS_DISABLE_STRIP,,} == @(y|yes) ]] \\
-  && echo -n no
-)"
-
-# at least one module's set of BUILT_MODULE_NAME[]/BUILT_MODULE_LOCATION[]
-# elements, along with an install path made of either "extra" or "updates"
-# subdir in its DEST_MODULE_LOCATION[] element, are required to fake during
-# dkms.conf validity checks of "dkms [add,build]" steps.
-# Final/full correct BUILT_MODULE_NAME[]/BUILT_MODULE_LOCATION[]/
-# DEST_MODULE_LOCATION[] sets of values for all modules will be fixed during
-# on-target post-configure run of dkms.mkconf as part of build step.
-# it must be for a module shared by both lustre[-client]-dkms packages.
-BUILT_MODULE_NAME[\${#BUILT_MODULE_NAME[@]}]="lustre"
-BUILT_MODULE_LOCATION[\${#BUILT_MODULE_LOCATION[@]}]="lustre/llite/"
-DEST_MODULE_LOCATION[\${#DEST_MODULE_LOCATION[@]}]="/extra/lustre/"
-EOF
+%{mkconf} -n %{module} -v %{version} -f dkms.conf %{mkconf_options}
 
 %install
 if [ "$RPM_BUILD_ROOT" != "/" ]; then
@@ -136,5 +109,5 @@ exit 0
 * 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.