X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=b0c9adfaf7e3e480b09c6d86f10db8484ccc39df;hp=30fdce8ba5f948173c716e41553c826133f5d11e;hb=668679d1767ba2009a19e3d3a2ee213e3bfc26fb;hpb=a22b3d2717c49110fa16476650052071d42f6270 diff --git a/lustre.spec.in b/lustre.spec.in index 30fdce8..b0c9adf 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -3,10 +3,37 @@ %{!?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$//'") + +%define sles10 %(bash -c "if [ "%sles_version" = "10" ]; then echo -n '1'; else echo -n '0'; fi") + +%if %sles10 +%define flavor %(bash -c "echo %{kversion} | sed -e 's/^.*-//'") +%endif Summary: Lustre File System Name: %{lustre_name} @@ -27,7 +54,11 @@ Userspace tools and files for the Lustre file system. %package modules Summary: Kernel Lustre modules for Linux %{kversion} -Requires: modutils >= 2.4.10, kernel = %{krequires} +# for RHEL5 and SLES11, we need nothing here +# for SLES10, we need (where %{flavor} is, i.e. smp): +%if %sles10 +Requires: kernel-%{flavor} +%endif Group: Development/Kernel %description modules @@ -85,6 +116,9 @@ Requires: %{name} = %{version}, %{name}-modules = %{version} This package contains a set of test binaries and scripts that are intended to be used by the Lustre testing framework. +%if 0%{?suse_version} +%debug_package +%endif %prep %setup -qn lustre-%{version} ln lustre/ChangeLog ChangeLog-lustre @@ -106,10 +140,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 @@ -117,14 +157,14 @@ make install DESTDIR=$RPM_BUILD_ROOT # hack to avoid changing the libsysio code for "make install" 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 +rm -rf $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates/kernel/fs/lustre-ldiskfs # 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 - cp ${llog_base}.ko $RPM_BUILD_ROOT/lib/modules/%{kversion}/kernel/fs/lustre + cp ${llog_base}.ko $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates/kernel/fs/lustre elif [ -e ${llog_base}.o ]; then - cp ${llog_base}.o $RPM_BUILD_ROOT/lib/modules/%{kversion}/kernel/fs/lustre + cp ${llog_base}.o $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates/kernel/fs/lustre fi # Create the pristine source directory. @@ -148,7 +188,9 @@ cat >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" +echo '%attr(-, root, root) /lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.*' >>lustre-tests.files +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}/updates -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 +249,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 @@ -213,9 +259,22 @@ if [ -f /boot/System.map-%{kversion} ]; then else depmod -ae %{kversion} || exit 0 fi + +# "weak modules" support +# Suse +if [ -x /usr/lib/module-init-tools/weak-modules ]; then + rpm -ql %{name}-modules-%{version}-%{release} | grep '\.ko$' | + /usr/lib/module-init-tools/weak-modules --add-modules +fi +# RedHat +if [ -x /sbin/weak-modules ]; then + rpm -ql %{name}-modules-%{version}-%{release} | grep '\.ko$' | + /sbin/weak-modules --add-modules +fi + cat </dev/null 2>&1 && into /etc/modprobe.d/unsupported_modules" fi +%preun modules +rpm -ql %{name}-modules-%{version}-%{release} | grep '\.ko$' > /var/run/%{name}-modules + %postun modules if [ -f /boot/System.map-%{kversion} ]; then depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 @@ -265,6 +327,20 @@ else depmod -ae %{kversion} || exit 0 fi +# "weak modules" support +# Suse +if [ -x /usr/lib/module-init-tools/weak-modules ]; then + cat /var/run/%{name}-modules | grep '\.ko$' | + /usr/lib/module-init-tools/weak-modules --remove-modules +fi +# RedHat +if [ -x /sbin/weak-modules ]; then + cat /var/run/%{name}-modules | grep '\.ko$' | + /sbin/weak-modules --remove-modules +fi +rm /var/run/%{name}-modules + +%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 +354,7 @@ if [ -f /boot/System.map-%{kversion} ]; then else depmod -ae %{kversion} || exit 0 fi +%endif %clean rm -rf $RPM_BUILD_ROOT