X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=fb757d83fb1c4241fde1e12bc1fda5cf8a6b872f;hp=92284c30b0d01aae482f6bfcc6f4139b58ba752c;hb=26457eac6bebda83893a72a2dac6ecc0b28813ed;hpb=0966ba77cfaa56d5455b1eda35cb2108f35272d8 diff --git a/lustre.spec.in b/lustre.spec.in index 92284c3..fb757d8 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -5,6 +5,8 @@ %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} @@ -55,12 +57,6 @@ # 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} @@ -70,6 +66,18 @@ %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 @@ -89,33 +97,35 @@ 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. +%if %{with lustre_modules} %package modules Summary: Kernel Lustre modules for Linux %{kversion} %if %{defined cross_requires} Requires: %{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 @@ -123,9 +133,12 @@ Lustre file system, server and network drivers for Linux %{kversion}. %if %{with ldiskfs} %package osd-ldiskfs -Summary: osd-ldiskfs is the mandatory glue for LDISKFS support in Lustre. -Requires: lustre-modules = %{version}, lustre-ldiskfs >= 4.1.0 +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 @@ -150,6 +163,7 @@ 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 +%endif # with lustre_modules %package source Summary: Object-Based Disk storage driver source @@ -197,12 +211,48 @@ 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 @@ -212,18 +262,6 @@ ln lustre/ChangeLog ChangeLog-lustre 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} @@ -236,6 +274,15 @@ 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 %{with lustre_modules} +CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-modules" +%else +CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-modules" +%endif # if %%kdir was given, make sure it's not in the configure arguments if [ -n "%kdir" ]; then @@ -245,6 +292,9 @@ fi 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 @@ -254,28 +304,33 @@ fi %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 -# Remove ldiskfs module(s) - they are packaged by the ldiskfs .spec. -rm -rf $RPM_BUILD_ROOT%{?rootdir}/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%{?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} @@ -287,62 +342,29 @@ 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_ROOT%{_libdir}/liblustre.so ] ; then - echo '%attr(-, root, root) %{_libdir}/liblustre.a' >>lustre.files - echo '%attr(-, root, root) %{_libdir}/liblustre.so' >>lustre.files + echo '%{_libdir}/liblustre.a' >>lustre.files + echo '%{_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 -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 + echo '%{_libdir}/lustre/snmp' >>lustre.files + echo '%{_datadir}/lustre/snmp/mibs' >>lustre.files fi %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 +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 if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests ] ; then - echo '%attr(-, root, root) %{_libdir}/lustre/liblustre/tests/*' >>lustre-tests.files + echo '%{_libdir}/lustre/liblustre/tests/*' >>lustre-tests.files fi %endif @@ -367,35 +389,62 @@ fi %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/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/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 %if %{defined rpm_post_base} %attr(0555, root, root) %{rpm_post_base}-osd-ldiskfs.sh %endif @@ -403,14 +452,17 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates -name "*.ko" -ty %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 %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 @@ -418,6 +470,31 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates -name "*.ko" -ty %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}/ior-survey +%{_bindir}/parse-ior +%{_bindir}/libecho +%{_bindir}/obdfilter-survey +%{_bindir}/plot-obdfilter +%{_bindir}/plot-ost +%{_bindir}/ost-survey +%{_bindir}/sgpdd-survey +%{_bindir}/plot-sgpdd +%{_bindir}/lstats.sh +%{_bindir}/gather_stats_everywhere.sh +%{_bindir}/config.sh +%{_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} @@ -432,6 +509,7 @@ if [ -x %{rpm_post_base}.sh ]; then fi %endif +%if %{with lustre_modules} %post modules %if %{defined rpm_post_base} if [ -x %{rpm_post_base}-modules.sh ]; then @@ -658,10 +736,11 @@ fi 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 @@ -671,6 +750,8 @@ if [ -x %{rpm_post_base}-tests.sh ]; then %{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 @@ -685,6 +766,7 @@ else fi %endif %endif +%endif %clean rm -rf $RPM_BUILD_ROOT