X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre.spec.in;h=868e8f8c0ce2bcb5474028fa73aa7dbb604b75b9;hb=b98c2e2a463f4a9a5d548a9f20c9027f067a9709;hp=5ebb38fd724872a4c477c2a54511de1314caf81b;hpb=b472fbe1c95ce64721be3f465bdfe81e49c178fd;p=fs%2Flustre-release.git

diff --git a/lustre.spec.in b/lustre.spec.in
index 5ebb38f..868e8f8 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -5,6 +5,8 @@
 %{!?lustre_name: %define lustre_name lustre}
 
 %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/.x86_64$//' -e 's/.i586$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'")
 
 Summary: Lustre File System
 Name: %{lustre_name}
@@ -25,7 +27,7 @@ Userspace tools and files for the Lustre file system.
 
 %package modules
 Summary: Kernel Lustre modules for Linux %{kversion}
-Requires: modutils >= 2.4.10, kernel = %{kversion}
+Requires: modutils >= 2.4.10, kernel = %{krequires}
 Group: Development/Kernel
 
 %description modules
@@ -85,6 +87,8 @@ to be used by the Lustre testing framework.
 
 %prep
 %setup -qn lustre-%{version}
+ln lustre/ChangeLog ChangeLog-lustre
+ln lnet/ChangeLog ChangeLog-lnet
 
 %build
 # if RPM_BUILD_NCPUS unset, set it
@@ -102,10 +106,10 @@ 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 @ac_configure_args@ %{?configure_flags:configure_flags}
 make -j $RPM_BUILD_NCPUS -s
 
 %install
@@ -144,7 +148,7 @@ cat >lustre.files <<EOF
 
 %attr(-, root, root) %{_mandir}/man?/*
 
-%attr(-, root, root) %{_libdir}/lustre/lc_common
+%attr(-, root, root) %{_libexecdir}/lustre/lc_common
 EOF
 
 if [ -f $RPM_BUILD_ROOT%{_libdir}/libcfsutil.a ] ; then
@@ -184,13 +188,15 @@ if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests ] ; then
 fi
 
 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 "!/($modules_excludes)/ {print \"%attr(-, root, root) /\"\$0}" >>$RPM_BUILD_DIR/lustre-%{version}/lustre-modules.files
 popd >/dev/null
 
 %files -f lustre.files
 
 %files modules -f lustre-modules.files
 %attr(-, root, root) %doc COPYING
+%attr(-, root, root) %doc ChangeLog-lustre
+%attr(-, root, root) %doc ChangeLog-lnet
 
 %files source
 %attr(-, root, root) /usr/src/lustre-%{version}
@@ -237,6 +243,21 @@ do
 	fi
 done
 
+# If the kernel was built to reject unsupported modules (e.g. not a Lustre
+# kernel), and this hasn't been overridden in /etc/modprobe.d yet, then
+# print a warning so that users are aware of this issue.
+if sysctl kernel.unsupported >/dev/null 2>&1 &&
+   [ "$(sysctl -n kernel.unsupported 2>/dev/null)" = "0" ] &&
+    ! modprobe -c | grep -q "^allow_unsupported_modules[ \t]1" ; then
+     echo "
+     warning: the Lustre modules are not supported by Novell. To use Lustre
+              on this system, you should put
+
+     allow_unsupported_modules 1
+
+     into /etc/modprobe.d/unsupported_modules"
+fi
+
 %postun modules
 if [ -f /boot/System.map-%{kversion} ]; then
 	depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0