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

diff --git a/lustre.spec.in b/lustre.spec.in
index 50fa9f7..30fdce8 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/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'")
 
 Summary: Lustre File System
 Name: %{lustre_name}
@@ -25,20 +27,18 @@ 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
 Lustre file system, server and network drivers for Linux %{kversion}.
 
-%if ! %{is_client}
 %package source
 Summary: Object-Based Disk storage driver source
 Group: Development/Kernel
 
 %description source
 Lustre sources for further development
-%endif
 
 # Since the RPMs we ship are to be used on both SLES and RHEL, we
 # can't include any dependency information (since the package names
@@ -75,7 +75,6 @@ Conflicts: %{name}-deps-sles
 This package has RPM dependencies appropriate for RHEL, RHL, and FC
 systems.
 
-%if ! %{is_client}
 %package tests
 Summary: Lustre testing framework
 Group: Development/Kernel
@@ -85,10 +84,11 @@ Requires: %{name} = %{version}, %{name}-modules = %{version}
 %description tests
 This package contains a set of test binaries and scripts that are intended
 to be used by the Lustre testing framework.
-%endif
 
 %prep
 %setup -qn lustre-%{version}
+ln lustre/ChangeLog ChangeLog-lustre
+ln lnet/ChangeLog ChangeLog-lnet
 
 %build
 # if RPM_BUILD_NCPUS unset, set it
@@ -119,11 +119,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libsysio.a
 # Remove ldiskfs module(s) - they are packaged by the ldiskfs .spec.
 rm -rf $RPM_BUILD_ROOT/lib/modules/%{kversion}/kernel/fs/lustre-ldiskfs
 
-%if %{is_client}
-# remove the tests that were installed
-rm -rf $RPM_BUILD_ROOT%{_libdir}/lustre/tests \
-       $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests
-%else
 # hack to include the llog_test module in lustre-tests
 llog_base=$RPM_BUILD_DIR/lustre-%{version}/lustre/obdclass/llog_test
 if [ -e ${llog_base}.ko ]; then
@@ -139,7 +134,6 @@ rm -f lustre-source
 ln -s $RPM_BUILD_ROOT/usr/src lustre-source
 make distdir distdir=lustre-source/lustre-%{version}
 chmod -R go-w lustre-source/lustre-%{version}
-%endif
 
 cat >lustre.files <<EOF
 %attr(-, root, root) /sbin/mount.lustre
@@ -201,19 +195,17 @@ popd >/dev/null
 
 %files modules -f lustre-modules.files
 %attr(-, root, root) %doc COPYING
+%attr(-, root, root) %doc ChangeLog-lustre
+%attr(-, root, root) %doc ChangeLog-lnet
 
-%if ! %{is_client}
 %files source
 %attr(-, root, root) /usr/src/lustre-%{version}
-%endif
 
 # uncomment these lines to enable deps packages
 # %files deps-sles
 # %files deps-rhel
 
-%if ! %{is_client}
 %files tests -f lustre-tests.files
-%endif
 
 %post modules
 if [ -f /boot/System.map-%{kversion} ]; then
@@ -251,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
@@ -258,7 +265,6 @@ else
 	depmod -ae %{kversion} || exit 0
 fi
 
-%if ! %{is_client}
 %post tests
 if [ -f /boot/System.map-%{kversion} ]; then
 	depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
@@ -272,7 +278,6 @@ if [ -f /boot/System.map-%{kversion} ]; then
 else
 	depmod -ae %{kversion} || exit 0
 fi
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT