X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=c644ff3bf539c61a3b4b578094aafb253d026d74;hp=44362c82fe0e6538b8ece31651249763fb1da207;hb=1cc5fa26070fc9afef954b1b627001a981f7dc34;hpb=c44ca36d60296c9420b08bd502565aff67bcad62 diff --git a/lustre.spec.in b/lustre.spec.in index 44362c8..c644ff3 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -1,7 +1,22 @@ # lustre.spec %{!?version: %define version @VERSION@} -%{!?kversion: %define kversion @LINUXRELEASE@} -%{!?release: %define release @RELEASE@} +%{!?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} @@ -26,17 +41,21 @@ #%%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/.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} Version: %{version} -Release: %{release} +Release: %{fullrelease} License: GPL Group: Utilities/System Source: lustre-%{version}.tar.gz -URL: http://www.sun.com/software/products/lustre/index.xml +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} @@ -48,7 +67,14 @@ 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 +%if ! %{is_client} +Requires: lustre-backend-fs +%endif Group: Development/Kernel %description modules @@ -106,6 +132,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 @@ -130,13 +159,29 @@ cd $RPM_BUILD_DIR/lustre-%{version} # override %optflags so that the vendor's overzealous flags don't create # build failures %define optflags -g -O2 -Werror -CONFIGURE_ARGS="" +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 -%configure %{?configure_args:%configure_args} $CONFIGURE_ARGS + +# 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 @@ -144,14 +189,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. @@ -211,7 +256,7 @@ 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 +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 @@ -219,7 +264,8 @@ fi %endif pushd $RPM_BUILD_ROOT >/dev/null -find lib/modules/%{kversion}/kernel -type f | awk "!/(ZZZZZZZZZZ$modules_excludes)/ {print \"%attr(-, root, root) /\"\$0}" >>$RPM_BUILD_DIR/lustre-%{version}/lustre-modules.files +> $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 @@ -246,35 +292,18 @@ if [ -f /boot/System.map-%{kversion} ]; then else depmod -ae %{kversion} || exit 0 fi -cat </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 +# "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 # 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 @@ -291,6 +320,9 @@ if sysctl kernel.unsupported >/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 @@ -298,6 +330,19 @@ 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