LU-16165 sec: retry mechanism for identity cache

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

diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in
index e93c851..242658f 100644 (file)
--- a/lustre-dkms.spec.in
+++ b/lustre-dkms.spec.in
@@ -2,6 +2,10 @@
 %bcond_without zfs
 %bcond_with ldiskfs
 
+# LUTF Turn off brp-python-precompile script as we don't want the python files
+# to be compiled on installation
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+
 # Set the package name prefix
 %if %{with servers}
     %if %{with zfs}
@@ -24,12 +28,13 @@
     %define lustre_name @PACKAGE@-client
 %endif
 
-%if %{_vendor}=="redhat" || %{_vendor}=="fedora"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "fedora"
        %global kmod_name kmod-%{lustre_name}
        %define mkconf_options %{nil}
-%else  #for Suse / Ubuntu
+#for Suse / Ubuntu
+%else
        %global kmod_name %{lustre_name}-kmp
-       %define mkconf_options "-k updates"
+       %define mkconf_options -k updates
 %endif
 
 %define buildid 1
@@ -56,9 +61,12 @@ BuildArch:      noarch
 # (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:       flex bison libmount-devel libmount
 # for lnetctl
 Requires:      libyaml-devel
 Requires:      zlib-devel
+# for netlink support
+Requires:      libnl3-devel
 %if %{with servers}
 # If client package is installed when installing server, remove it since
 # the server package also includes the client.  This can be removed if/when
@@ -66,7 +74,6 @@ Requires:     zlib-devel
 Obsoletes:     @PACKAGE@-client < %{version}
 %if %{with zfs}
 Requires:       zfs-dkms >= 0.6.5
-Requires:      @PACKAGE@-osd-zfs-mount
 Conflicts:     @PACKAGE@-ldiskfs-dkms
 Conflicts:     @PACKAGE@-client-dkms
 # lustre-zfs-dkms replicates the functionality old lustre-dkms package
@@ -76,7 +83,6 @@ Obsoletes:    @PACKAGE@-dkms
 %if %{with ldiskfs}
 Requires:      patch
 Requires:      %{ext4_source_rpm}
-Requires:      @PACKAGE@-osd-ldiskfs-mount
 Conflicts:     @PACKAGE@-zfs-dkms
 Conflicts:     @PACKAGE@-client-dkms
 %if "%{module}" != "@PACKAGE@-all"
@@ -94,9 +100,13 @@ Provides:   @PACKAGE@-modules = %{version}
 %if %{with servers}
 %if %{with zfs}
 Provides:      @PACKAGE@-osd-zfs = %{version}
+Provides:      kmod-@PACKAGE@-osd-zfs = %{version}
+Provides:      @PACKAGE@-osd-zfs-mount = %{version}
 %endif
 %if %{with ldiskfs}
 Provides:      @PACKAGE@-osd-ldiskfs = %{version}
+Provides:      kmod-@PACKAGE@-osd-ldiskfs = %{version}
+Provides:      @PACKAGE@-osd-ldiskfs-mount = %{version}
 %endif
 Provides:      @PACKAGE@-osd
 %else