X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=5c00be78a969736c72ce9c5e80c4baeb254874ae;hp=7c9f3e5e8280dff62a4711346e4aaeba1111a114;hb=31197e43bca94d9fbb4ca2090b556d93c6c18542;hpb=4699065ae24652439b77e28074d5ab4f7d866a7f diff --git a/lustre.spec.in b/lustre.spec.in index 7c9f3e5..5c00be7 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -1,38 +1,155 @@ # lustre.spec -%{!?version: %define version @VERSION@} -%{!?kversion: %define kversion @LINUXRELEASE@} -%{!?release: %define release @RELEASE@} -%{!?lustre_name: %define lustre_name lustre} -%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$//'") +# Declare rpmbuild --with/--without parameters +%bcond_without servers +%bcond_without ldiskfs +%bcond_with zfs +%bcond_without lustre_tests +%bcond_without lustre_iokit + +%if %{without servers} + # --without servers overrides --with {ldiskfs|zfs} + # so undefine the internal variables set by bcond_* + %undefine with_ldiskfs + %undefine with_zfs +%endif + +%{!?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: %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: %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: %global downstream_release "@DOWNSTREAM_RELEASE@"} + +%define buildid %(if [ -n "@BUILDID@" ]; then echo "_@BUILDID@"; fi) + +%{!?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} + +# 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 + +# 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$//'") + +# Set the package name prefix +%if %{undefined lustre_name} + %if %{with servers} + %global lustre_name lustre + %else + %global lustre_name lustre-client + %endif +%endif + +%if %{defined cross_path} && %{defined post_script} +%define rpm_post_base %(echo $(dirname %{cross_path})/%{lustre_name}) +%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} Requires: %{name}-modules = %{version} +%if %{with servers} +Requires: lustre-osd +%endif +%if %{defined cross_requires} +Requires: %{cross_requires} +AutoReqProv: no +%else # GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10 +%if %{_vendor}=="redhat" || %{_vendor}=="fedora" +#suse don't support selinux +BuildRequires: libselinux-devel +Requires: libselinux +%endif +%endif %description 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} +%if %{defined cross_requires} +Requires: %{cross_requires} +AutoReqProv: no +%else +# for SLES11, we need nothing here +%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 Group: Development/Kernel %description modules Lustre file system, server and network drivers for Linux %{kversion}. +%if %{with ldiskfs} +%package osd-ldiskfs +Summary: osd-ldiskfs contains both ldiskfs and its osd interface in Lustre. +Requires: lustre-modules = %{version} +Requires: modutils >= 2.4.10 +Requires: ldiskfsprogs >= 1.42.7.wc1 +Provides: lustre-osd +Obsoletes: lustre-ldiskfs +Group: Development/Kernel + +%description osd-ldiskfs +The Lustre Object Storage Device (OSD) API is the interface to access and +modify data that is supposed to be stored persistently. This API is the interface +to code that bridges individual file systems. This specific package provides an +implementation of the OSD API for using the Ldiskfs filesystem as the underlying +backing store of a Lustre server. +%endif + +%if %{with zfs} +%package osd-zfs +Summary: osd-zfs is the mandatory glue for ZFS support in Lustre. +Requires: lustre-modules = %{version}, zfs-kmod +Provides: lustre-osd +Group: Development/Kernel + +%description osd-zfs +The Lustre Object Storage Device (OSD) API is the interface to access and +modify data that is supposed to be stored persistently. This API is the interface +to code that bridges individual file systems. This specific package provides an +implementation of the OSD API for using the ZFS filesystem as the underlying +backing store of a Lustre server. +%endif + %package source Summary: Object-Based Disk storage driver source Group: Development/Kernel @@ -79,12 +196,51 @@ systems. Summary: Lustre testing framework Group: Development/Kernel Provides: %{name}-tests = %{version} -Requires: %{name} = %{version}, %{name}-modules = %{version} +Requires: %{name} = %{version}, %{name}-modules = %{version}, lustre-iokit %description tests This package contains a set of test binaries and scripts that are intended to be used by the Lustre testing framework. +%if %{with lustre_iokit} +%package -n lustre-iokit +Summary: The Lustre IO-Kit is a collection of benchmark tools for a cluster with the Lustre file system. +Group: Applications/System +Requires: python > 2.2, sg3_utils + +%description -n lustre-iokit +This package includes five tools: +sgpdd-survey: +A test of the 'bare metal' performance, bypassing as much of the kernel as we can. Uses the sgp_dd utility. + +obdfilter-survey +This survey can be run in 3 modes to test disk I/O including the filesystem, +network I/O, and disk I/O via the network. The script does sequential I/O +with varying numbers of threads and objects (files) by using lctl::test_brw +to drive the echo_client connected to local or remote obdfilter instances, +or remote obdecho instances. + +ost-survey +This survey tests the client-to-disk performance of individual OSTs, and +ranks then for comparison. + +stats-collect +This script will collect IO stats on a defined set of nodes. + +ior-survey: +A script to run the IOR benchmark. The latest version can be downloaded from +http://www.llnl.gov/asci/purple/benchmarks/limited/ior/ + +mds-survey: +This survey tests the local metadata performance using the echo_client to drive +the MDD layer to perform operations. It is run with multiple threads (to +simulate MDT service threads) locally on the MDS node, and does not need Lustre +clients in order to run +%endif + +%if 0%{?suse_version} +%debug_package +%endif %prep %setup -qn lustre-%{version} ln lustre/ChangeLog ChangeLog-lustre @@ -106,49 +262,96 @@ 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} -make -j $RPM_BUILD_NCPUS -s +# 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 %{with lustre_tests} +CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-tests --enable-liblustre-tests" +%else +CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests --disable-liblustre-tests" +%endif +%if %{without lustre_iokit} +CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-iokit" +%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 +# also remove (build|host|target) options because they will be specified +# inside $CONFIGURE_ARGS +%define eval_configure %(echo '%configure' | sed -e 's#\./configure#eval ./configure#' -e 's/--\\(build\\|host\\|target\\)=[^ ][^ ]* //g') + +%eval_configure \ + %{?kdir: --with-linux=%kdir} %{?kobjdir: --with-linux-obj=%kobjdir} \ + $CONFIGURE_ARGS +make -j $RPM_BUILD_NCPUS -s %{?make_args} %install 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 # 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%{?rootdir}/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%{?rootdir}/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%{_sysconfdir}/ha.d/resource.d/Lustre + # Create the pristine source directory. cd $RPM_BUILD_DIR/lustre-%{version} -mkdir -p $RPM_BUILD_ROOT/usr/src +mkdir -p $RPM_BUILD_ROOT%{_prefix}/src rm -f lustre-source -ln -s $RPM_BUILD_ROOT/usr/src lustre-source +ln -s $RPM_BUILD_ROOT%{_prefix}/src lustre-source make distdir distdir=lustre-source/lustre-%{version} chmod -R go-w lustre-source/lustre-%{version} +# fc18 needs 'x' permission for library files +find $RPM_BUILD_ROOT -name '*.so' | xargs chmod +x 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 @@ -169,79 +372,245 @@ if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then echo '%attr(-, root, root) %{_datadir}/lustre/snmp/mibs' >>lustre.files fi -# Have universal lustre headers +# 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_user.h' >>lustre.files + echo '%attr(-, root, root) %{_includedir}/linux/lustre_user.h' >>lustre.files else - echo '%attr(-, root, root) /usr/include/linux/lustre_idl.h' >>lustre.files + echo '%attr(-, root, root) %{_includedir}/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 + echo '%attr(-, root, root) %{_includedir}/linux/lustre_types.h' >>lustre.files fi +%if %{with 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) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.*' >>lustre-tests.files if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests ] ; then echo '%attr(-, root, root) %{_libdir}/lustre/liblustre/tests/*' >>lustre-tests.files fi - -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 -popd >/dev/null +%endif + +%if %{defined cross_path} +%if %{defined rpm_post_base} +POST_SCRIPT=$RPM_BUILD_DIR/lustre-%{version}/%{post_script} +if [ -f $POST_SCRIPT ]; then + cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}.sh + echo '%attr(0555, root, root) %{rpm_post_base}.sh' >>lustre.files + cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-modules.sh +%if %{with ldiskfs} + cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-ldiskfs.sh +%endif +%if %{with zfs} + cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-zfs.sh +%endif +%if %{with lustre_tests} + cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-tests.sh + echo '%attr(0555, root, root) %{rpm_post_base}-tests.sh' >>lustre-tests.files +%endif +fi +%endif +%else +# mark modules executable for find-debuginfo.sh +find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates -name "*.ko" -type f | \ + xargs --no-run-if-empty chmod u+x +%endif %files -f lustre.files -%files modules -f lustre-modules.files +%files modules +%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/* +%if %{with lustre_tests} +%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.ko +%endif +%if %{with ldiskfs} +%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/ldiskfs.ko +%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko +%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko +%endif +%if %{with zfs} +%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_zfs.ko +%endif +%if %{defined rpm_post_base} +%attr(0555, root, root) %{rpm_post_base}-modules.sh +%endif %attr(-, root, root) %doc COPYING %attr(-, root, root) %doc ChangeLog-lustre %attr(-, root, root) %doc ChangeLog-lnet +%if %{with ldiskfs} +%files osd-ldiskfs +%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/ldiskfs.ko +%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko +%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko +%if %{defined rpm_post_base} +%attr(0555, root, root) %{rpm_post_base}-osd-ldiskfs.sh +%endif +%endif + +%if %{with zfs} +%files osd-zfs +%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_zfs.ko +%if %{defined rpm_post_base} +%attr(0555, root, root) %{rpm_post_base}-osd-zfs.sh +%endif +%endif + %files source -%attr(-, root, root) /usr/src/lustre-%{version} +%attr(-, root, root) %{_prefix}/src/lustre-%{version} # uncomment these lines to enable deps packages # %files deps-sles # %files deps-rhel +%if %{with lustre_tests} %files tests -f lustre-tests.files +%endif + +%if %{with lustre_iokit} +%files -n lustre-iokit +%attr(-, root, root) %{_bindir}/ior-survey +%attr(-, root, root) %{_bindir}/parse-ior +%attr(-, root, root) %{_bindir}/libecho +%attr(-, root, root) %{_bindir}/obdfilter-survey +%attr(-, root, root) %{_bindir}/plot-obdfilter +%attr(-, root, root) %{_bindir}/plot-ost +%attr(-, root, root) %{_bindir}/ost-survey +%attr(-, root, root) %{_bindir}/sgpdd-survey +%attr(-, root, root) %{_bindir}/plot-sgpdd +%attr(-, root, root) %{_bindir}/lstats.sh +%attr(-, root, root) %{_bindir}/gather_stats_everywhere.sh +%attr(-, root, root) %{_bindir}/config.sh +%attr(-, root, root) %{_bindir}/mds-survey +%doc lustre-iokit/obdfilter-survey/README.obdfilter-survey +%doc lustre-iokit/ior-survey/README.ior-survey +%doc lustre-iokit/ost-survey/README.ost-survey +%doc lustre-iokit/mds-survey/README.mds-survey +%doc lustre-iokit/sgpdd-survey/README.sgpdd-survey +%doc lustre-iokit/stats-collect/README.lstats.sh +%endif + +%if %{defined rpm_post_base} +%post +if [ -x %{rpm_post_base}.sh ]; then + %{rpm_post_base}.sh %{cross_path} create +fi + +%preun +if [ -x %{rpm_post_base}.sh ]; then + %{rpm_post_base}.sh %{cross_path} remove +fi +%endif %post modules +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-modules.sh ]; then + %{rpm_post_base}-modules.sh %{cross_path} create +fi +%else if [ -f /boot/System.map-%{kversion} ]; then depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 else depmod -ae %{kversion} || exit 0 fi -cat </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 +%endif + +%if %{with ldiskfs} +%post osd-ldiskfs +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-osd-ldiskfs.sh ]; then + %{rpm_post_base}-osd-ldiskfs.sh %{cross_path} create +fi +%else +if [ -f /boot/System.map-%{kversion} ]; then + depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 +else + depmod -ae %{kversion} || exit 0 +fi + +OSD_LDISKFS_RPM_NAME=$(rpm -q %{name}-osd-ldiskfs | grep "%{version}-%{release}") +# "weak modules" support +# Suse +if [ -x /usr/lib/module-init-tools/weak-modules ]; then + rpm -ql $OSD_LDISKFS_RPM_NAME | grep '\.ko$' | + /usr/lib/module-init-tools/weak-modules --add-modules +fi +# RedHat +if [ -x /sbin/weak-modules ]; then + rpm -ql $OSD_LDISKFS_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 +%endif +%endif + +%if %{with zfs} +%post osd-zfs +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-osd-zfs.sh ]; then + %{rpm_post_base}-osd-zfs.sh %{cross_path} create +fi +%else +if [ -f /boot/System.map-%{kversion} ]; then + depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 +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 +OSD_ZFS_RPM_NAME=$(rpm -q %{name}-osd-zfs | grep "%{version}-%{release}") +# "weak modules" support +# Suse +if [ -x /usr/lib/module-init-tools/weak-modules ]; then + rpm -ql $OSD_ZFS_RPM_NAME | grep '\.ko$' | + /usr/lib/module-init-tools/weak-modules --add-modules +fi +# RedHat +if [ -x /sbin/weak-modules ]; then + rpm -ql $OSD_ZFS_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 @@ -257,7 +626,44 @@ if sysctl kernel.unsupported >/dev/null 2>&1 && into /etc/modprobe.d/unsupported_modules" fi +%endif +%endif +%preun modules +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-modules.sh ]; then + %{rpm_post_base}-modules.sh %{cross_path} remove +fi +%else +MODULES_RPM_NAME=$(rpm -q %{name}-modules | grep "%{version}-%{release}") +rpm -ql $MODULES_RPM_NAME | grep '\.ko$' > /var/run/%{name}-modules || true +%endif + +%if %{with ldiskfs} +%preun osd-ldiskfs +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-osd-ldiskfs.sh ]; then + %{rpm_post_base}-osd-ldiskfs.sh %{cross_path} remove +fi +%else +OSD_LDISKFS_RPM_NAME=$(rpm -q %{name}-osd-ldiskfs | grep "%{version}-%{release}") +rpm -ql $OSD_LDISKFS_RPM_NAME | grep '\.ko$' > /var/run/%{name}-osd-ldiskfs || true +%endif +%endif + +%if %{with zfs} +%preun osd-zfs +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-osd-zfs.sh ]; then + %{rpm_post_base}-osd-zfs.sh %{cross_path} remove +fi +%else +OSD_ZFS_RPM_NAME=$(rpm -q %{name}-osd-zfs | grep "%{version}-%{release}") +rpm -ql $OSD_ZFS_RPM_NAME | grep '\.ko$' > /var/run/%{name}-osd-zfs || true +%endif +%endif + +%if %{undefined cross_path} %postun modules if [ -f /boot/System.map-%{kversion} ]; then depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 @@ -265,7 +671,76 @@ 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 %{with ldiskfs} +%postun osd-ldiskfs +if [ -f /boot/System.map-%{kversion} ]; then + depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 +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}-osd-ldiskfs | + /usr/lib/module-init-tools/weak-modules --remove-modules +fi +# RedHat +if [ -x /sbin/weak-modules ]; then + cat /var/run/%{name}-osd-ldiskfs | + /sbin/weak-modules --remove-modules +fi +rm /var/run/%{name}-osd-ldiskfs +%endif + +%if %{with zfs} +%postun osd-zfs +if [ -f /boot/System.map-%{kversion} ]; then + depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 +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}-osd-zfs | + /usr/lib/module-init-tools/weak-modules --remove-modules +fi +# RedHat +if [ -x /sbin/weak-modules ]; then + cat /var/run/%{name}-osd-zfs | + /sbin/weak-modules --remove-modules +fi +rm /var/run/%{name}-osd-zfs +%endif +%endif + +%if %{with lustre_tests} %post tests +%if %{defined rpm_post_base} +if [ -x %{rpm_post_base}-tests.sh ]; then + %{rpm_post_base}-tests.sh %{cross_path} create +fi + +%preun tests +if [ -x %{rpm_post_base}-tests.sh ]; then + %{rpm_post_base}-tests.sh %{cross_path} remove +fi +%else if [ -f /boot/System.map-%{kversion} ]; then depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 else @@ -278,6 +753,8 @@ if [ -f /boot/System.map-%{kversion} ]; then else depmod -ae %{kversion} || exit 0 fi +%endif +%endif %clean rm -rf $RPM_BUILD_ROOT