%bcond_without ldiskfs
%bcond_with zfs
%bcond_without lustre_tests
+%bcond_without lustre_iokit
+%bcond_without lustre_modules
%if %{without servers}
# --without servers overrides --with {ldiskfs|zfs}
# 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
-
# Set the package name prefix
%if %{undefined lustre_name}
%if %{with servers}
%endif
%endif
+%if %{undefined kmoddir}
+ %if %{defined kernel_module_package_moddir}
+ %global kmoddir %{kernel_module_package_moddir}
+ %else
+ %if %{defined suse_kernel_module_package}
+ %global kmoddir updates
+ %else
+ %global kmoddir extra
+ %endif
+ %endif
+%endif
+
%if %{defined cross_path} && %{defined post_script}
%define rpm_post_base %(echo $(dirname %{cross_path})/%{lustre_name})
%endif
Obsoletes: lustre-lite, lustre-lite-utils, lustre-ldap nfs-utils-lustre
Provides: lustre-lite = %{version}, lustre-lite-utils = %{version}
Requires: %{name}-modules = %{version}
+BuildRequires: libtool
%if %{with servers}
Requires: lustre-osd
%endif
%description
Userspace tools and files for the Lustre file system.
+%if %{with lustre_modules}
%package modules
Summary: Kernel Lustre modules for Linux %{kversion}
%if %{defined cross_requires}
AutoReqProv: no
%else
# 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
-%endif
Group: Development/Kernel
%description modules
implementation of the OSD API for using the ZFS filesystem as the underlying
backing store of a Lustre server.
%endif
+%endif # with lustre_modules
%package source
Summary: Object-Based Disk storage driver source
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
ln lnet/ChangeLog ChangeLog-lnet
%build
-# if RPM_BUILD_NCPUS unset, set it
-if [ -z "$RPM_BUILD_NCPUS" ] ; then
- RPM_BUILD_NCPUS=$(egrep -c "^cpu[0-9]+" /proc/stat 2>/dev/null || echo 0 :)
- if [ $RPM_BUILD_NCPUS -eq 0 ] ; then
- RPM_BUILD_NCPUS=1
- fi
- if [ $RPM_BUILD_NCPUS -gt 8 ] ; then
- RPM_BUILD_NCPUS=8
- fi
-fi
-
-rm -rf $RPM_BUILD_ROOT
# Set an explicit path to our Linux tree, if we can.
cd $RPM_BUILD_DIR/lustre-%{version}
%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"
+CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-tests"
+%else
+CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests"
+%endif
+%if %{without lustre_iokit}
+CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-iokit"
+%endif
+
+%if %{with lustre_modules}
+CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-modules"
%else
-CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests --disable-liblustre-tests"
+CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-modules"
+%endif
+
+%if %{without zfs}
+CONFIGURE_ARGS="$CONFIGURE_ARGS --without-zfs"
%endif
# if %%kdir was given, make sure it's not in the configure arguments
if [ -n "%kobjdir" ]; then
CONFIGURE_ARGS=$(echo $CONFIGURE_ARGS | sed -e 's/"\?--with-linux-obj=[^ ][^ ]* \?//')
fi
+# remove --with-kmp-moddir from configure arguments,
+# it will be set --with-kmp-moddir=%%kmoddir
+CONFIGURE_ARGS=$(echo $CONFIGURE_ARGS | sed -e 's/"\?--with-kmp-moddir=[^ ][^ ]* \?//')
# 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
%eval_configure \
%{?kdir: --with-linux=%kdir} %{?kobjdir: --with-linux-obj=%kobjdir} \
- $CONFIGURE_ARGS
-make -j $RPM_BUILD_NCPUS -s %{?make_args}
+ $CONFIGURE_ARGS --with-kmp-moddir=%{kmoddir}
+make %{?_smp_mflags} -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
-# 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%{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre
-elif [ -e ${llog_base}.o ]; then
- cp ${llog_base}.o $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre
-fi
+:> lustre.files
+%if %{with servers}
# 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
+echo '%{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2' >>lustre.files
+echo '%{_sysconfdir}/ha.d/resource.d/Lustre' >>lustre.files
+
+if [ -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/lustre ]; then
+ echo '%{_sysconfdir}/sysconfig/lustre' >>lustre.files
+ echo '%{_sysconfdir}/init.d/lustre' >>lustre.files
+fi
+%endif
+
+if [ -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/lnet ]; then
+ echo '%{_sysconfdir}/init.d/lnet' >>lustre.files
+fi
# Create the pristine source directory.
cd $RPM_BUILD_DIR/lustre-%{version}
# fc18 needs 'x' permission for library files
find $RPM_BUILD_ROOT -name '*.so' | xargs chmod +x
-cat >lustre.files <<EOF
-%attr(-, root, root) %{?rootdir}/sbin/mount.lustre
-%attr(-, root, root) %{_sbindir}/*
-%attr(-, root, root) %{_bindir}/*
-%attr(-, root, root) %{_libdir}/libptlctl.a
-%attr(-, root, root) %{_libdir}/liblustreapi.a
-%attr(-, root, root) %{_libdir}/liblustreapi.so
-%attr(-, root, root) %{_mandir}/man?/*
-%attr(-, root, root) %{_datadir}/lustre
-%attr(-, root, root) %{_includedir}/lustre
-%attr(-, root, root) %{_includedir}/libcfs
-%attr(-, root, root) %{_libexecdir}/lustre/lc_common
-%attr(-, root, root) %{_sysconfdir}/udev/rules.d/99-lustre.rules
-%attr(-, root, root) %{_sysconfdir}/init.d/lnet
-%attr(-, root, root) %{_sysconfdir}/init.d/lustre
-%attr(-, root, root) %config(noreplace) %{_sysconfdir}/ldev.conf
-%attr(-, root, root) %{_sysconfdir}/sysconfig/lustre
-%attr(-, root, root) %{_libexecdir}/lustre/haconfig
-%attr(-, root, root) %{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2
-%attr(-, root, root) %{_sysconfdir}/ha.d/resource.d/Lustre
-EOF
-
-if [ -f $RPM_BUILD_ROOT%{_libdir}/libcfsutil.a ] ; then
- echo '%attr(-, root, root) %{_libdir}/libcfsutil.a' >>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
-fi
-
if [ -f $RPM_BUILD_ROOT%{_libdir}/libiam.a ] ; then
- echo '%attr(-, root, root) %{_libdir}/libiam.a' >>lustre.files
+ echo '%{_libdir}/libiam.a' >>lustre.files
fi
if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then
- echo '%attr(-, root, root) %{_libdir}/lustre/snmp' >>lustre.files
- echo '%attr(-, root, root) %{_datadir}/lustre/snmp/mibs' >>lustre.files
+ echo '%{_libdir}/lustre/snmp' >>lustre.files
+ echo '%{_datadir}/lustre/snmp/mibs' >>lustre.files
fi
-# Have universal lustre headers
-if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/lustre/lustre_idl.h ] ; then
- echo '%attr(-, root, root) %{_includedir}/linux/lustre_user.h' >>lustre.files
-else
- 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) %{_includedir}/linux/lustre_types.h' >>lustre.files
-fi
+find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@/ -name \*.la -delete
%if %{with lustre_tests}
-echo '%attr(-, root, root) %{_libdir}/lustre/tests/*' >lustre-tests.files
-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
+echo '%{_libdir}/lustre/tests/*' >>lustre-tests.files
+echo '%{_bindir}/mcreate' >>lustre-tests.files
+echo '%{_bindir}/munlink' >>lustre-tests.files
+%if %{with lustre_modules}
+echo '%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/llog_test.ko' >>lustre-tests.files
+%endif
%endif
%if %{defined cross_path}
%endif
%else
# mark modules executable for find-debuginfo.sh
-find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates -name "*.ko" -type f | \
+find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} -name "*.ko" -type f | \
xargs --no-run-if-empty chmod u+x
%endif
%files -f lustre.files
-
+%defattr(-,root,root)
+%{?rootdir}/sbin/mount.lustre
+%{_sbindir}/*
+%{_bindir}/lfs
+%{_bindir}/lfs_migrate
+%{_bindir}/llbackup
+%{_bindir}/llobdstat
+%{_bindir}/llstat
+%{_bindir}/lustre_req_history
+%{_bindir}/plot-llstat
+%{_bindir}/req_layout
+%{_libdir}/libptlctl.a
+%{_libdir}/libcfsutil.a
+%{_libdir}/liblustreapi.a
+%{_libdir}/liblustreapi.so
+%{_mandir}/man?/*
+%{_datadir}/lustre
+%{_includedir}/lustre
+%{_includedir}/libcfs
+%{_includedir}/linux/lustre_user.h
+%{_libexecdir}/lustre/lc_common
+%{_libexecdir}/lustre/haconfig
+%{_sysconfdir}/udev/rules.d/99-lustre.rules
+%config(noreplace) %{_sysconfdir}/ldev.conf
+
+%if %{with lustre_modules}
%files modules
-%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/*
+%defattr(-,root,root)
+%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/*
%if %{with lustre_tests}
-%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.ko
+%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/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
+%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/ldiskfs.ko
+%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_ldiskfs.ko
%endif
%if %{with zfs}
-%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_zfs.ko
+%exclude %{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/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
+%doc COPYING
+%doc ChangeLog-lustre
+%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
+%defattr(-,root,root)
+%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/ldiskfs.ko
+%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_ldiskfs.ko
+%{_libdir}/@PACKAGE@/mount_osd_ldiskfs.so
%if %{defined rpm_post_base}
%attr(0555, root, root) %{rpm_post_base}-osd-ldiskfs.sh
%endif
%if %{with zfs}
%files osd-zfs
-%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_zfs.ko
+%defattr(-,root,root)
+%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_zfs.ko
+%{_libdir}/@PACKAGE@/mount_osd_zfs.so
%if %{defined rpm_post_base}
%attr(0555, root, root) %{rpm_post_base}-osd-zfs.sh
%endif
%endif
+%endif # with lustre_modules
%files source
-%attr(-, root, root) %{_prefix}/src/lustre-%{version}
+%defattr(-,root,root)
+%{_prefix}/src/lustre-%{version}
# uncomment these lines to enable deps packages
# %files deps-sles
%if %{with lustre_tests}
%files tests -f lustre-tests.files
+%defattr(-,root,root)
+%endif
+
+%if %{with lustre_iokit}
+%files -n lustre-iokit
+%defattr(-, root, root)
+%{_bindir}/iokit-config
+%{_bindir}/iokit-gather-stats
+%{_bindir}/iokit-libecho
+%{_bindir}/iokit-lstats
+%{_bindir}/iokit-parse-ior
+%{_bindir}/iokit-plot-obdfilter
+%{_bindir}/iokit-plot-ost
+%{_bindir}/iokit-plot-sgpdd
+%{_bindir}/ior-survey
+%{_bindir}/mds-survey
+%{_bindir}/obdfilter-survey
+%{_bindir}/ost-survey
+%{_bindir}/sgpdd-survey
+%doc lustre-iokit/ior-survey/README.ior-survey
+%doc lustre-iokit/mds-survey/README.mds-survey
+%doc lustre-iokit/obdfilter-survey/README.obdfilter-survey
+%doc lustre-iokit/ost-survey/README.ost-survey
+%doc lustre-iokit/sgpdd-survey/README.sgpdd-survey
+%doc lustre-iokit/stats-collect/README.iokit-lstats
%endif
%if %{defined rpm_post_base}
fi
%endif
+%if %{with lustre_modules}
%post modules
%if %{defined rpm_post_base}
if [ -x %{rpm_post_base}-modules.sh ]; then
rm /var/run/%{name}-osd-zfs
%endif
%endif
+%endif # with lustre_modules
%if %{with lustre_tests}
-%post tests
%if %{defined rpm_post_base}
+%post tests
if [ -x %{rpm_post_base}-tests.sh ]; then
%{rpm_post_base}-tests.sh %{cross_path} create
fi
%{rpm_post_base}-tests.sh %{cross_path} remove
fi
%else
+%if %{with lustre_modules}
+%post tests
if [ -f /boot/System.map-%{kversion} ]; then
depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
else
fi
%endif
%endif
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
git://git.whamcloud.com / fs / lustre-release.git / blobdiff