Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-15825 ldlm: remove linefeed from LDLM_DEBUG
[fs/lustre-release.git]
/
lustre-dkms.spec.in
diff --git
a/lustre-dkms.spec.in
b/lustre-dkms.spec.in
index
e93c851
..
755a3b5
100644
(file)
--- a/
lustre-dkms.spec.in
+++ b/
lustre-dkms.spec.in
@@
-2,6
+2,10
@@
%bcond_without zfs
%bcond_with ldiskfs
%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}
# Set the package name prefix
%if %{with servers}
%if %{with zfs}
@@
-24,12
+28,13
@@
%define lustre_name @PACKAGE@-client
%endif
%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}
%global kmod_name kmod-%{lustre_name}
%define mkconf_options %{nil}
-%else #for Suse / Ubuntu
+#for Suse / Ubuntu
+%else
%global kmod_name %{lustre_name}-kmp
%global kmod_name %{lustre_name}-kmp
- %define mkconf_options
"-k updates"
+ %define mkconf_options
-k updates
%endif
%define buildid 1
%endif
%define buildid 1
@@
-59,6
+64,8
@@
Requires: dkms >= 2.2.0.3-28.git.7c3e7c5
# for lnetctl
Requires: libyaml-devel
Requires: zlib-devel
# 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
%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
+73,6
@@
Requires: zlib-devel
Obsoletes: @PACKAGE@-client < %{version}
%if %{with zfs}
Requires: zfs-dkms >= 0.6.5
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
Conflicts: @PACKAGE@-ldiskfs-dkms
Conflicts: @PACKAGE@-client-dkms
# lustre-zfs-dkms replicates the functionality old lustre-dkms package
@@
-76,7
+82,6
@@
Obsoletes: @PACKAGE@-dkms
%if %{with ldiskfs}
Requires: patch
Requires: %{ext4_source_rpm}
%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"
Conflicts: @PACKAGE@-zfs-dkms
Conflicts: @PACKAGE@-client-dkms
%if "%{module}" != "@PACKAGE@-all"
@@
-94,9
+99,13
@@
Provides: @PACKAGE@-modules = %{version}
%if %{with servers}
%if %{with zfs}
Provides: @PACKAGE@-osd-zfs = %{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}
%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
%endif
Provides: @PACKAGE@-osd
%else