X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=cd914af2208f4d5e376fd45686aa14a2150dccb6;hp=39886fdec59d7e5084426328c390793838699eba;hb=e5bcb49589257672c9146a0531140f18db6b6432;hpb=de2309f2e3b3118eee89a2a9342c1074da00aba1 diff --git a/lustre.spec.in b/lustre.spec.in index 39886fd..cd914af 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -1,18 +1,68 @@ # lustre.spec -%define version @VERSION@ -%define kversion @LINUXRELEASE@ +%{!?version: %define version @VERSION@} +%{!?kver: %define kver ""} +%{!?kdir: %define kdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else if [ -n "%kver" ]; then kversion="%kver"; else kversion="$(uname -r)"; fi; echo "/lib/modules/$kversion/source"; fi)} + +%{!?kobjdir: %define kobjdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux-obj=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else if [ -n "%kver" ]; then kversion="%kver"; else kversion="$(uname -r)"; fi; if [ "%kdir" = "/lib/modules/$kversion/source" ]; then echo "/lib/modules/$kversion/build"; else echo "%kdir"; fi; fi)} + +# as an alternative to this implementation we could simply "make -C $kdir kernelversion" +%{!?kversion: %define kversion %(if test -s %kobjdir/include/linux/utsrelease.h ; then LINUXRELEASEHEADER=utsrelease.h; else LINUXRELEASEHEADER=version.h; fi; sed -ne '/^#define UTS_RELEASE/s/.*"\\(.*\\)"$/\\1/p' %kobjdir/include/linux/$LINUXRELEASEHEADER)} + +%{!?downstream_release: %define downstream_release "@DOWNSTREAM_RELEASE@"} + +%define buildid %(if [ -n "@BUILDID@" ]; then echo "_@BUILDID@"; fi) + +%{!?myrelease: %define myrelease %(if [ -n "%downstream_release" ]; then echo -n "%{downstream_release}_"; fi; echo %kversion | tr '-' '_')} + +# always append the buildid, even when the caller defines %release +%define fullrelease %{myrelease}%{buildid} + +%{!?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 (or the .arch) on the end +# of %kversion +%define krequires %(bash -c "echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -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: %{lustre_name} Version: %{version} -Release: @RELEASE@ +Release: %{fullrelease} License: GPL Group: Utilities/System Source: lustre-%{version}.tar.gz -URL: http://clusterfs.com/ +URL: http://wiki.whamcloud.com/ BuildRoot: %{_tmppath}/lustre-%{version}-root Obsoletes: lustre-lite, lustre-lite-utils, lustre-ldap nfs-utils-lustre Provides: lustre-lite = %{version}, lustre-lite-utils = %{version} +Requires: %{name}-modules = %{version} # GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10 %description @@ -20,7 +70,20 @@ Userspace tools and files for the Lustre file system. %package modules Summary: Kernel Lustre modules for Linux %{kversion} -Requires: modutils >= 2.4.10 +# for SLES11, we need nothing here +# for SLES10, we need (where %{flavor} is, i.e. smp): +%if %sles10 +Requires: kernel-%{flavor} +%else +%if %{_vendor}=="redhat" || %{_vendor}=="fedora" +# for RHEL we need to require the specific kernel still since weak-modules +# support on RH is, well, weak, to be punny about it +Requires: kernel = %{krequires} +%endif +%endif +%if ! %{is_client} +Requires: lustre-backend-fs +%endif Group: Development/Kernel %description modules @@ -51,8 +114,8 @@ Lustre sources for further development Summary: Lustre dependencies meta-package for SLES Group: Utilities/System Provides: lustre-deps = %{version} -Requires: lustre = %{version}, sles-release -Conflicts: lustre-deps-rhel +Requires: %{name} = %{version}, sles-release +Conflicts: %{name}-deps-rhel %description deps-sles This package has RPM dependencies appropriate for SLES systems. @@ -61,8 +124,8 @@ This package has RPM dependencies appropriate for SLES systems. Summary: Lustre dependencies meta-package for RHEL Group: Utilities/System Provides: lustre-deps = %{version} -Requires: lustre = %{version}, redhat-release -Conflicts: lustre-deps-sles +Requires: %{name} = %{version}, redhat-release +Conflicts: %{name}-deps-sles %description deps-rhel This package has RPM dependencies appropriate for RHEL, RHL, and FC @@ -71,15 +134,20 @@ systems. %package tests Summary: Lustre testing framework Group: Development/Kernel -Provides: lustre-tests = %{version} -Requires: lustre = %{version} +Provides: %{name}-tests = %{version} +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. +%if 0%{?suse_version} +%debug_package +%endif %prep %setup -qn lustre-%{version} +ln lustre/ChangeLog ChangeLog-lustre +ln lnet/ChangeLog ChangeLog-lnet %build # if RPM_BUILD_NCPUS unset, set it @@ -97,10 +165,32 @@ 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="%{?configure_args} --with-release=%release" +%if %{build_lustre_tests} +CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-tests --enable-liblustre-tests" +%else +CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests --disable-liblustre-tests" +%endif + +# if %%kdir was given, make sure it's not in the configure arguments +if [ -n "%kdir" ]; then + CONFIGURE_ARGS=$(echo $CONFIGURE_ARGS | sed -e 's/"\?--with-linux=[^ ][^ ]* \?//') +fi +# ditto for %%kobjdir +if [ -n "%kobjdir" ]; then + CONFIGURE_ARGS=$(echo $CONFIGURE_ARGS | sed -e 's/"\?--with-linux-obj=[^ ][^ ]* \?//') +fi + +# we need to eval "configure" because $CONFIGURE_ARGS could have a quoted +# string in it which we don't want word splitted by the shell +%define eval_configure %(echo '%configure' | sed -e 's#\./configure#eval ./configure#') + +%eval_configure \ + %{?kdir: --with-linux=%kdir} %{?kobjdir: --with-linux-obj=%kobjdir} \ + $CONFIGURE_ARGS make -j $RPM_BUILD_NCPUS -s %install @@ -108,7 +198,15 @@ 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}/updates/kernel/fs/lustre +elif [ -e ${llog_base}.o ]; then + cp ${llog_base}.o $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates/kernel/fs/lustre +fi # Create the pristine source directory. cd $RPM_BUILD_DIR/lustre-%{version} @@ -116,23 +214,31 @@ mkdir -p $RPM_BUILD_ROOT/usr/src 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} cat >lustre.files <>lustre.files +fi + if [ -f $RPM_BUILD_ROOT%{_libdir}/liblustre.so ] ; then echo '%attr(-, root, root) %{_libdir}/liblustre.a' >>lustre.files echo '%attr(-, root, root) %{_libdir}/liblustre.so' >>lustre.files @@ -149,18 +255,35 @@ fi # Have universal lustre headers if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/lustre/lustre_idl.h ] ; then - echo '%attr(-, root, root) /usr/include/linux/lustre_types.h' >>lustre.files echo '%attr(-, root, root) /usr/include/linux/lustre_user.h' >>lustre.files else echo '%attr(-, root, root) /usr/include/linux/lustre_idl.h' >>lustre.files fi +if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/linux/lustre_types.h ] ; then + 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}/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 +> $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 -%files modules +%files modules -f lustre-modules.files %attr(-, root, root) %doc COPYING -%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre -%attr(-, root, root) /lib/modules/%{kversion}/kernel/net/lustre +%attr(-, root, root) %doc ChangeLog-lustre +%attr(-, root, root) %doc ChangeLog-lnet %files source %attr(-, root, root) /usr/src/lustre-%{version} @@ -169,8 +292,9 @@ fi # %files deps-sles # %files deps-rhel -%files tests -%attr(-, root, root) %{_libdir}/lustre/tests/* +%if %{build_lustre_tests} +%files tests -f lustre-tests.files +%endif %post modules if [ -f /boot/System.map-%{kversion} ]; then @@ -179,28 +303,37 @@ else depmod -ae %{kversion} || exit 0 fi -# for update from < v1.4.6 - -for f in /etc/modules.conf /etc/modprobe.conf /etc/modprobe.conf.local ; -do - if [ -f $f ]; then - if grep 'lustre llite' $f >/dev/null 2>/dev/null ; then - [ ! -f $f.rpmsave ] && cp $f $f.rpmsave - TMPFILE=`mktemp $f.XXXXXX` && \ - rm -f $TMPFILE && touch $TMPFILE && \ - grep -v 'lustre llite' $f >> $TMPFILE && \ - mv $TMPFILE $f - fi - if egrep "^[^#]*(add below|install) ptlrpc" $f ; then - [ ! -f $f.rpmsave ] && cp $f $f.rpmsave - TMPFILE=`mktemp $f.XXXXXX` && \ - rm -f $TMPFILE && touch $TMPFILE && \ - sed -e "s/^[^#]*\(add below\|install\) ptlrpc.*/#&/" $f >> $TMPFILE && \ - mv $TMPFILE $f - fi - fi -done +MODULES_RPM_NAME=$(rpm -q %{name}-modules | grep "%{version}-%{release}") +# "weak modules" support +# Suse +if [ -x /usr/lib/module-init-tools/weak-modules ]; then + rpm -ql $MODULES_RPM_NAME | grep '\.ko$' | + /usr/lib/module-init-tools/weak-modules --add-modules +fi +# RedHat +if [ -x /sbin/weak-modules ]; then + rpm -ql $MODULES_RPM_NAME | grep '\.ko$' | + /sbin/weak-modules --add-modules +fi + +# 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 + +%preun modules +MODULES_RPM_NAME=$(rpm -q %{name}-modules | grep "%{version}-%{release}") +rpm -ql $MODULES_RPM_NAME | grep '\.ko$' > /var/run/%{name}-modules || true %postun modules if [ -f /boot/System.map-%{kversion} ]; then @@ -209,5 +342,34 @@ 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 | + /usr/lib/module-init-tools/weak-modules --remove-modules +fi +# RedHat +if [ -x /sbin/weak-modules ]; then + cat /var/run/%{name}-modules | + /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 +else + depmod -ae %{kversion} || exit 0 +fi + +%postun tests +if [ -f /boot/System.map-%{kversion} ]; then + depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 +else + depmod -ae %{kversion} || exit 0 +fi +%endif + %clean rm -rf $RPM_BUILD_ROOT