X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=7c94d70ca0aa992226dc26706d63f0e869a921bd;hp=59a3352174554ac8b9a8bd5ecfb4e364b7ce0e0c;hb=17fe3c192e101ace75b2f4d7f7e9ff7d8d85480e;hpb=86d26552f91e4b8cfe79a55cae8746aa1c18001e

diff --git a/lustre.spec.in b/lustre.spec.in
index 59a3352..7c94d70 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -8,7 +8,7 @@
 %bcond_without lustre_utils
 %bcond_without lustre_iokit
 %bcond_without lustre_modules
-%bcond_with lnet_dlc
+%bcond_with snmp
 %bcond_without manpages
 %bcond_without shared
 %bcond_without static
@@ -81,11 +81,15 @@
 
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
 	%global requires_kmod_name kmod-%{lustre_name}
-	%global requires_kmod_tests_name kmod-%{lustre_name}-tests
+	%if %{with lustre_tests}
+		%global requires_kmod_tests_name kmod-%{lustre_name}-tests
+	%endif
 	%global requires_kmod_version %{version}
 %else	#for Suse
 	%global requires_kmod_name %{lustre_name}-kmp
-	%global requires_kmod_tests_name %{lustre_name}-tests-kmp
+	%if %{with lustre_tests}
+		%global requires_kmod_tests_name %{lustre_name}-tests-kmp
+	%endif
 	%define krequires %(echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/[-.]ppc64$//' -e 's/\.aarch64$//' -e 's/-default$//')
 	%if 0%{?suse_version} >= 1200
 		%global requires_kmod_version %{version}_k%(echo %{krequires} | sed -r 'y/-/_/; s/^(2\.6\.[0-9]+)_/\\1.0_/;')
@@ -132,7 +136,7 @@ BuildRequires: libtool
 %if %{with servers}
 Requires: lustre-osd
 Requires: lustre-osd-mount
-Obsoletes: lustre-client <= %{version}
+Obsoletes: lustre-client < %{version}
 Provides: lustre-client = %{version}-%{release}
 %endif
 # GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10
@@ -203,11 +207,16 @@ A set of scripts to operate Lustre resources in a High Availablity
 environment for both Pacemaker and rgmanager.
 %endif
 
+%if %{with lustre_tests}
 %package tests
 Summary: Lustre testing framework
 Group: System Environment/Kernel
 Provides: %{name}-tests = %{version}
+%if %{with lustre_iokit}
 Requires: %{name} = %{version}, lustre-iokit
+%else
+Requires: %{name} = %{version}
+%endif
 Requires: %{requires_kmod_name} = %{requires_kmod_version}
 Requires: %{requires_kmod_tests_name} = %{requires_kmod_version}
 Requires: attr, rsync, perl, lsof, /usr/bin/getconf
@@ -219,6 +228,7 @@ to be used by the Lustre testing framework.
 %if %{with lustre_modules}
 %kernel_module_package -n %{name}-tests -f %SOURCE7 default
 %endif
+%endif
 
 %if %{with lustre_iokit}
 %package -n lustre-iokit
@@ -298,7 +308,7 @@ fi
 	%{!?with_ldiskfs:--disable-ldiskfs} \
 	%{!?with_servers:--disable-server} \
 	%{!?with_zfs:--without-zfs} \
-	%{!?with_lnet_dlc:--disable-dlc} \
+	%{!?with_snmp:--disable-snmp} \
 	%{!?with_manpages:--disable-manpages} \
 	%{!?with_systemd:--with-systemdsystemunitdir=no} \
 	%{?with_systemd:--with-systemdsystemunitdir=%{_unitdir}} \
@@ -374,7 +384,6 @@ install -m 0755 contrib/scripts/pacemaker/* $RPM_BUILD_ROOT%{_prefix}/lib/ocf/re
 # fc18 needs 'x' permission for library files
 find $RPM_BUILD_ROOT -name \*.so -type f -exec chmod +x {} \;
 
-%if %{with lnet_dlc}
 rm -f $RPM_BUILD_ROOT%{_libdir}/liblnetconfig.la
 %if %{with static}
 echo '%attr(-, root, root) %{_libdir}/liblnetconfig.a' >>lustre.files
@@ -383,19 +392,21 @@ echo '%attr(-, root, root) %{_libdir}/liblnetconfig.a' >>lustre.files
 echo '%attr(-, root, root) %{_libdir}/liblnetconfig.so' >>lustre.files
 echo '%attr(-, root, root) %{_libdir}/liblnetconfig.so.*' >>lustre.files
 %endif
-%endif
 
 %if %{with ldiskfs}
 echo '%{_libdir}/libiam.a' >>lustre.files
 %endif
 
-if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then
-	echo '%{_libdir}/lustre/snmp' >>lustre.files
-fi
+%if %{with snmp}
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/lustre/snmp
+echo '%{_libdir}/lustre/snmp' >>lustre.files
+%endif
 
 %if %{with lustre_utils}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/lustre
-find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@ -name \*.la -type f -exec rm -f {} \;
+if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre ] ; then
+	find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@ -name \*.la -type f -exec rm -f {} \;
+fi
 %endif
 
 %if %{with lustre_modules}
@@ -415,8 +426,10 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files
 %files -f lustre.files
 %defattr(-,root,root)
 %{_sbindir}/*
+%if %{with lustre_tests}
 %exclude %{_sbindir}/wirecheck
 %exclude %{_sbindir}/wiretest
+%endif
 %if %{with zfs}
 %exclude %{_sbindir}/zfsobj2fid
 %endif
@@ -434,8 +447,6 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files
 %{_bindir}/lfs
 %{_bindir}/lfs_migrate
 /sbin/mount.lustre
-%{_libdir}/libptlctl.a
-%{_libdir}/libcfsutil.a
 %{_libdir}/liblustreapi.a
 %{_libdir}/liblustreapi.so
 %if %{with manpages}
@@ -443,18 +454,19 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files
 %endif
 %{_datadir}/lustre
 %{_includedir}/lustre
+%{_includedir}/linux/lnet
+%{_includedir}/linux/lustre
 %endif
 %{_sysconfdir}/udev/rules.d/99-lustre.rules
 %config(noreplace) %{_sysconfdir}/ldev.conf
-%if %{with lnet_dlc}
 %config(noreplace) %{_sysconfdir}/lnet.conf
-%endif
 %config(noreplace) %{_sysconfdir}/modprobe.d/ko2iblnd.conf
 %if %{with lustre_utils}
 %config(noreplace) %{_sysconfdir}/lnet_routes.conf
 %endif
 %if %{with lustre_modules}
 
+%if %{with shared}
 %if %{with ldiskfs}
 %if %{with lustre_utils}
 %files osd-ldiskfs-mount
@@ -462,7 +474,9 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files
 %{_libdir}/@PACKAGE@/mount_osd_ldiskfs.so
 %endif
 %endif
+%endif
 
+%if %{with shared}
 %if %{with zfs}
 %if %{with lustre_utils}
 %files osd-zfs-mount
@@ -470,6 +484,7 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files
 %{_libdir}/@PACKAGE@/mount_osd_zfs.so
 %endif
 %endif
+%endif
 
 %endif # with lustre_modules