X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=44f085f20adfa1d6e71160f63339de9f48bb1cd5;hp=51a4f4577a47b505e03c3292e87271fad167412e;hb=9303a33f8e9ad670069549a5935e70cd1d236369;hpb=086ff8c46009479bfdac9f570331a6c93b7d52ac diff --git a/lustre.spec.in b/lustre.spec.in index 51a4f45..44f085f 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -1,24 +1,24 @@ # lustre.spec -%{!?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)} +%{!?version: %global version @VERSION@} +%{!?kver: %global kver ""} +%{!?kdir: %global 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)} +%{!?kobjdir: %global 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)} +%{!?kversion: %global kversion %(if test -s %kobjdir/include/generated/utsrelease.h ; then LINUXRELEASEHEADER=%kobjdir/include/generated/utsrelease.h ; elif test -s %kobjdir/include/linux/utsrelease.h ; then LINUXRELEASEHEADER=%kobjdir/include/linux/utsrelease.h ; else LINUXRELEASEHEADER=%kobjdir/include/linux/version.h; fi; sed -ne '/^#define UTS_RELEASE/s/.*"\\(.*\\)"$/\\1/p' $LINUXRELEASEHEADER)} -%{!?downstream_release: %define downstream_release "@DOWNSTREAM_RELEASE@"} +%{!?downstream_release: %global 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 '-' '_')} +%{!?myrelease: %global 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} +%{!?lustre_name: %global lustre_name lustre} +%{!?build_lustre_tests: %global 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- @@ -41,6 +41,9 @@ #%%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") @@ -55,7 +58,7 @@ 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} @@ -67,10 +70,19 @@ Userspace tools and files for the Lustre file system. %package modules Summary: Kernel Lustre modules for Linux %{kversion} -# for RHEL5 and SLES11, we need nothing here +# 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 @@ -196,6 +208,11 @@ elif [ -e ${llog_base}.o ]; then cp ${llog_base}.o $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates/kernel/fs/lustre fi +# The .ha_v2 extension identifies the heartbeat resource agent as using +# legacy syntax. Install a compatibility symlink to avoid conflicts when +# newer-style agents are added. +ln -s Lustre.ha_v2 $RPM_BUILD_ROOT/etc/ha.d/resource.d/Lustre + # Create the pristine source directory. cd $RPM_BUILD_DIR/lustre-%{version} mkdir -p $RPM_BUILD_ROOT/usr/src @@ -213,13 +230,23 @@ cat >lustre.files <>lustre.files fi -if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/utils/libiam.c ] ; then +if [ -f $RPM_BUILD_ROOT%{_libdir}/libiam.a ] ; then echo '%attr(-, root, root) %{_libdir}/libiam.a' >>lustre.files fi @@ -265,6 +292,10 @@ pushd $RPM_BUILD_ROOT >/dev/null 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 +# mark modules executable for find-debuginfo.sh +find $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates -name "*.ko" -type f | \ + xargs --no-run-if-empty chmod u+x + %files -f lustre.files %files modules -f lustre-modules.files @@ -290,48 +321,19 @@ else depmod -ae %{kversion} || exit 0 fi +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 %{name}-modules-%{version}-%{release} | grep '\.ko$' | + 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 %{name}-modules-%{version}-%{release} | grep '\.ko$' | + rpm -ql $MODULES_RPM_NAME | grep '\.ko$' | /sbin/weak-modules --add-modules 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 - # 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. @@ -348,7 +350,8 @@ if sysctl kernel.unsupported >/dev/null 2>&1 && fi %preun modules -rpm -ql %{name}-modules-%{version}-%{release} | grep '\.ko$' > /var/run/%{name}-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 @@ -360,12 +363,12 @@ fi # "weak modules" support # Suse if [ -x /usr/lib/module-init-tools/weak-modules ]; then - cat /var/run/%{name}-modules | grep '\.ko$' | + 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 | grep '\.ko$' | + cat /var/run/%{name}-modules | /sbin/weak-modules --remove-modules fi rm /var/run/%{name}-modules