X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=62d958a30060155bd6c0a2b8515d58498f1019dd;hp=50fa9f7e6ca2e3cc7aeec4458555b3dbc0c3826c;hb=db94f4f00f1523605d692f4dadb3487deb0fdb4f;hpb=c7496eccfc6a4bc804bd999343a2d289d5e9eeaf diff --git a/lustre.spec.in b/lustre.spec.in index 50fa9f7..62d958a 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -3,8 +3,11 @@ %{!?kversion: %define kversion @LINUXRELEASE@} %{!?release: %define release @RELEASE@} %{!?lustre_name: %define lustre_name lustre} +%{!?build_lustre_tests: %define build_lustre_tests 1} %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,20 +28,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 +76,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 +85,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 @@ -106,10 +107,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 @@ -119,11 +126,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 +141,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 <lustre.files <>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 %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} +%if %{build_lustre_tests} %files tests -f lustre-tests.files %endif @@ -251,6 +254,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 +276,7 @@ else depmod -ae %{kversion} || exit 0 fi -%if ! %{is_client} +%if %{build_lustre_tests} %post tests if [ -f /boot/System.map-%{kversion} ]; then depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0