LU-9210 statahead: missing barrier before wake_up

[fs/lustre-release.git] / lustre-dkms.spec.in

diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in
index 36ce678..0527cb9 100644 (file)
--- 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
@@ -31,10 +37,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
 %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
@@ -91,10 +101,6 @@ BUILT_MODULE_LOCATION[\${#BUILT_MODULE_LOCATION[@]}]="lustre/llite/"
 DEST_MODULE_LOCATION[\${#DEST_MODULE_LOCATION[@]}]="/extra/lustre/"
 EOF
 
-sed -i 's/BUILDID[[:print:]]*/BUILDID = %{buildid}/' META
-sed -i 's/PRISTINE[[:print:]]*/PRISTINE = 1/' META
-cp META ldiskfs/META
-
 %install
 if [ "$RPM_BUILD_ROOT" != "/" ]; then
     rm -rf $RPM_BUILD_ROOT
@@ -140,5 +146,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.