X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=44362c82fe0e6538b8ece31651249763fb1da207;hp=30fdce8ba5f948173c716e41553c826133f5d11e;hb=dfbc98ead8c357255909aafa7f81b3448337dde2;hpb=a22b3d2717c49110fa16476650052071d42f6270

diff --git a/lustre.spec.in b/lustre.spec.in
index 30fdce8..44362c8 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -3,10 +3,31 @@
 %{!?kversion: %define kversion @LINUXRELEASE@}
 %{!?release: %define release @RELEASE@}
 %{!?lustre_name: %define lustre_name lustre}
+%{!?build_lustre_tests: %define build_lustre_tests 1}
+
+# in order to get kernel symset and/or kernel module dependencies into
+# the RPM, in order to support weak-modules, the internal dependency gen-
+# erator needs to be disabled
+# this is done with (reduce the double % down to a single %):
+#
+# %%global _use_internal_dependency_generator 0
+#
+# on SLES10, /usr/lib/rpm/macros already sets this, so no harm in also
+# defining it here (until Suse changes their mind)
+#
+# on RHEL5, however, we do need to explicitly disable the internal dep-
+# endency generator and allow the external one be used
+# but since RedHat's kABI is only a subset of the total kernel ABI, it
+# doesn't include all of the symbols we (or OFED for that matter) need
+# until RedHat includes all of the symbols we need in their symsets we
+# cannot support weak-modules
+# we did e-mail the maintainer of all of this stuff @redhat but got no
+# response from them
+#%%global _use_internal_dependency_generator 0
 
 %define is_client %(bash -c "if [[ %{lustre_name} = *-client ]]; then echo -n '1'; else echo -n '0'; fi")
 # for those uses that don't want the -smp/-bigsmp on the end of %kversion
-%define krequires %(bash -c "echo %{kversion} | sed -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'")
+%define krequires %(bash -c "echo %{kversion} | sed -e 's/.x86_64$//' -e 's/.i586$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'")
 
 Summary: Lustre File System
 Name: %{lustre_name}
@@ -106,10 +127,16 @@ rm -rf $RPM_BUILD_ROOT
 
 # Set an explicit path to our Linux tree, if we can.
 cd $RPM_BUILD_DIR/lustre-%{version}
-./configure @ac_configure_args@ %{?configure_flags:configure_flags} \
-	--sysconfdir=%{_sysconfdir} \
-	--mandir=%{_mandir} \
-	--libdir=%{_libdir}
+# override %optflags so that the vendor's overzealous flags don't create
+# build failures
+%define optflags -g -O2 -Werror
+CONFIGURE_ARGS=""
+%if %{build_lustre_tests}
+CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-tests --enable-liblustre-tests"
+%else
+CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests --disable-liblustre-tests"
+%endif
+%configure %{?configure_args:%configure_args} $CONFIGURE_ARGS
 make -j $RPM_BUILD_NCPUS -s
 
 %install
@@ -148,7 +175,9 @@ cat >lustre.files <<EOF
 
 %attr(-, root, root) %{_mandir}/man?/*
 
-%attr(-, root, root) %{_libdir}/lustre/lc_common
+%attr(-, root, root) %{_libexecdir}/lustre/lc_common
+
+%attr(-, root, root) %{_sysconfdir}/udev/rules.d/99-lustre.rules
 EOF
 
 if [ -f $RPM_BUILD_ROOT%{_libdir}/libcfsutil.a ] ; then
@@ -180,15 +209,17 @@ if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/linux/lustre_types.h ] ;
   echo '%attr(-, root, root) /usr/include/linux/lustre_types.h' >>lustre.files
 fi
 
+%if %{build_lustre_tests}
 echo '%attr(-, root, root) %{_libdir}/lustre/tests/*' >lustre-tests.files
 echo '%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/llog_test.*' >>lustre-tests.files
-modules_excludes="llog_test"
+modules_excludes="|llog_test"
 if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests ] ; then
   echo '%attr(-, root, root) %{_libdir}/lustre/liblustre/tests/*' >>lustre-tests.files
 fi
+%endif
 
 pushd $RPM_BUILD_ROOT >/dev/null
-find lib/modules/%{kversion}/kernel -type f | awk "!/($modules_excludes)/ {print \"/\"\$0}" >>$RPM_BUILD_DIR/lustre-%{version}/lustre-modules.files
+find lib/modules/%{kversion}/kernel -type f | awk "!/(ZZZZZZZZZZ$modules_excludes)/ {print \"%attr(-, root, root) /\"\$0}" >>$RPM_BUILD_DIR/lustre-%{version}/lustre-modules.files
 popd >/dev/null
 
 %files -f lustre.files
@@ -205,7 +236,9 @@ popd >/dev/null
 # %files deps-sles
 # %files deps-rhel
 
+%if %{build_lustre_tests}
 %files tests -f lustre-tests.files
+%endif
 
 %post modules
 if [ -f /boot/System.map-%{kversion} ]; then
@@ -265,6 +298,7 @@ else
 	depmod -ae %{kversion} || exit 0
 fi
 
+%if %{build_lustre_tests}
 %post tests
 if [ -f /boot/System.map-%{kversion} ]; then
 	depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
@@ -278,6 +312,7 @@ if [ -f /boot/System.map-%{kversion} ]; then
 else
 	depmod -ae %{kversion} || exit 0
 fi
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT