X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre.spec.in;h=487a08d15f9c287629f80d4a3560e14db2187c8c;hb=a89a63d22879014d1ac09a86d43b4e27940ac555;hp=48f5b17287bc42c9a4747ecd968bbd4d124d1f45;hpb=ad82976ca7747d004f9dea55e2d2b27460842914;p=fs%2Flustre-release.git

diff --git a/lustre.spec.in b/lustre.spec.in
index 48f5b17..487a08d 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -6,6 +6,7 @@
 %bcond_with zfs
 %bcond_without lustre_tests
 %bcond_without lustre_iokit
+%bcond_without lustre_modules
 
 %if %{without servers}
     # --without servers overrides --with {ldiskfs|zfs}
@@ -111,6 +112,7 @@ Requires: libselinux
 %description
 Userspace tools and files for the Lustre file system.
 
+%if %{with lustre_modules}
 %package modules
 Summary: Kernel Lustre modules for Linux %{kversion}
 %if %{defined cross_requires}
@@ -161,6 +163,7 @@ to code that bridges individual file systems. This specific package provides an
 implementation of the OSD API for using the ZFS filesystem as the underlying
 backing store of a Lustre server.
 %endif
+%endif # with lustre_modules
 
 %package source
 Summary: Object-Based Disk storage driver source
@@ -275,6 +278,12 @@ CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests --disable-liblustre-tests"
 CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-iokit"
 %endif
 
+%if %{with lustre_modules}
+CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-modules"
+%else
+CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-modules"
+%endif
+
 # if %%kdir was given, make sure it's not in the configure arguments
 if [ -n "%kdir" ]; then
 	CONFIGURE_ARGS=$(echo $CONFIGURE_ARGS | sed -e 's/"\?--with-linux=[^ ][^ ]* \?//')
@@ -318,38 +327,7 @@ chmod -R go-w lustre-source/lustre-%{version}
 # fc18 needs 'x' permission for library files
 find $RPM_BUILD_ROOT -name '*.so' | xargs chmod +x
 
-cat >lustre.files <<EOF
-%{?rootdir}/sbin/mount.lustre
-%{_sbindir}/*
-%{_bindir}/lfs
-%{_bindir}/lfs_migrate
-%{_bindir}/llbackup
-%{_bindir}/llobdstat
-%{_bindir}/llstat
-%{_bindir}/lustre_req_history
-%{_bindir}/plot-llstat
-%{_bindir}/req_layout
-%{_libdir}/libptlctl.a
-%{_libdir}/liblustreapi.a
-%{_libdir}/liblustreapi.so
-%{_mandir}/man?/*
-%{_datadir}/lustre
-%{_includedir}/lustre
-%{_includedir}/libcfs
-%{_libexecdir}/lustre/lc_common
-%{_sysconfdir}/udev/rules.d/99-lustre.rules
-%{_sysconfdir}/init.d/lnet
-%{_sysconfdir}/init.d/lustre
-%config(noreplace) %{_sysconfdir}/ldev.conf
-%{_sysconfdir}/sysconfig/lustre
-%{_libexecdir}/lustre/haconfig
-%{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2
-%{_sysconfdir}/ha.d/resource.d/Lustre
-EOF
-
-if [ -f $RPM_BUILD_ROOT%{_libdir}/libcfsutil.a ] ; then
-  echo '%{_libdir}/libcfsutil.a' >>lustre.files
-fi
+:> lustre.files
 
 if [ -f $RPM_BUILD_ROOT%{_libdir}/liblustre.so ] ; then
   echo '%{_libdir}/liblustre.a' >>lustre.files
@@ -365,22 +343,13 @@ if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then
   echo '%{_datadir}/lustre/snmp/mibs' >>lustre.files
 fi
 
-# Have universal lustre headers
-if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/lustre/lustre_idl.h ] ; then
-  echo '%{_includedir}/linux/lustre_user.h' >>lustre.files
-else
-  echo '%{_includedir}/linux/lustre_idl.h' >>lustre.files
-fi
-
-if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/linux/lustre_types.h ] ; then
-  echo '%{_includedir}/linux/lustre_types.h' >>lustre.files
-fi
-
 %if %{with lustre_tests}
-echo '%{_libdir}/lustre/tests/*' >lustre-tests.files
+echo '%{_libdir}/lustre/tests/*' >>lustre-tests.files
 echo '%{_bindir}/mcreate' >>lustre-tests.files
 echo '%{_bindir}/munlink' >>lustre-tests.files
+%if %{with lustre_modules}
 echo '%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/llog_test.ko' >>lustre-tests.files
+%endif
 if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests ] ; then
   echo '%{_libdir}/lustre/liblustre/tests/*' >>lustre-tests.files
 fi
@@ -413,7 +382,36 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} -name "*.ko"
 
 %files -f lustre.files
 %defattr(-,root,root)
+%{?rootdir}/sbin/mount.lustre
+%{_sbindir}/*
+%{_bindir}/lfs
+%{_bindir}/lfs_migrate
+%{_bindir}/llbackup
+%{_bindir}/llobdstat
+%{_bindir}/llstat
+%{_bindir}/lustre_req_history
+%{_bindir}/plot-llstat
+%{_bindir}/req_layout
+%{_libdir}/libptlctl.a
+%{_libdir}/libcfsutil.a
+%{_libdir}/liblustreapi.a
+%{_libdir}/liblustreapi.so
+%{_mandir}/man?/*
+%{_datadir}/lustre
+%{_includedir}/lustre
+%{_includedir}/libcfs
+%{_includedir}/linux/lustre_user.h
+%{_libexecdir}/lustre/lc_common
+%{_sysconfdir}/udev/rules.d/99-lustre.rules
+%{_sysconfdir}/init.d/lnet
+%{_sysconfdir}/init.d/lustre
+%config(noreplace) %{_sysconfdir}/ldev.conf
+%{_sysconfdir}/sysconfig/lustre
+%{_libexecdir}/lustre/haconfig
+%{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2
+%{_sysconfdir}/ha.d/resource.d/Lustre
 
+%if %{with lustre_modules}
 %files modules
 %defattr(-,root,root)
 %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/*
@@ -452,6 +450,7 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} -name "*.ko"
 %attr(0555, root, root) %{rpm_post_base}-osd-zfs.sh
 %endif
 %endif
+%endif # with lustre_modules
 
 %files source
 %defattr(-,root,root)
@@ -502,6 +501,7 @@ if [ -x %{rpm_post_base}.sh ]; then
 fi
 %endif
 
+%if %{with lustre_modules}
 %post modules
 %if %{defined rpm_post_base}
 if [ -x %{rpm_post_base}-modules.sh ]; then
@@ -728,6 +728,7 @@ fi
 rm /var/run/%{name}-osd-zfs
 %endif
 %endif
+%endif # with lustre_modules
 
 %if %{with lustre_tests}
 %post tests