X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=c6c7b34f754496f04e16f3712988ade25f801000;hp=a1d886ed0f022a944dfef424e732cb7bd3bca848;hb=b45438f9695955f70fa5cd7a2c4c08ec8c8e86ce;hpb=58548b6f5faaab0b2c8f9429e43dd930ce52da54 diff --git a/lustre.spec.in b/lustre.spec.in index a1d886e..c6c7b34 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -1,4 +1,19 @@ # lustre.spec + +# 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)} @@ -17,12 +32,6 @@ # always append the buildid, even when the caller defines %release %define fullrelease %{myrelease}%{buildid} -%{!?lustre_name: %global lustre_name lustre} -%{!?build_lustre_tests: %global build_lustre_tests 1} - -%{!?build_lustre_osd_ldiskfs: %global build_lustre_osd_ldiskfs 0} -%{!?build_lustre_osd_zfs: %global build_lustre_osd_zfs 0} - # 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 @@ -43,20 +52,17 @@ # response from them #%%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") - -%if %sles10 -%define flavor %(bash -c "echo %{kversion} | sed -e 's/^.*-//'") -%endif - -%if %is_client -%define build_lustre_osd_ldiskfs 0 -%define build_lustre_osd_zfs 0 +# 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} @@ -75,10 +81,20 @@ 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 ! %{is_client} +%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. @@ -87,29 +103,28 @@ Userspace tools and files for the Lustre file system. 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 Lustre file system, server and network drivers for Linux %{kversion}. -%if %{build_lustre_osd_ldiskfs} +%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 @@ -120,7 +135,7 @@ implementation of the OSD API for using the Ldiskfs filesystem as the underlying backing store of a Lustre server. %endif -%if %{build_lustre_osd_zfs} +%if %{with zfs} %package osd-zfs Summary: osd-zfs is the mandatory glue for ZFS support in Lustre. Requires: lustre-modules = %{version}, zfs-kmod @@ -181,12 +196,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 @@ -207,19 +258,20 @@ if [ -z "$RPM_BUILD_NCPUS" ] ; then fi fi -rm -rf $RPM_BUILD_ROOT - # Set an explicit path to our Linux tree, if we can. 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} --with-release=%release" -%if %{build_lustre_tests} +%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 @@ -245,16 +297,6 @@ make -j $RPM_BUILD_NCPUS -s %{?make_args} 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 # The .ha_v2 extension identifies the heartbeat resource agent as using # legacy syntax. Install a compatibility symlink to avoid conflicts when @@ -272,61 +314,70 @@ chmod -R go-w lustre-source/lustre-%{version} find $RPM_BUILD_ROOT -name '*.so' | xargs chmod +x cat >lustre.files <>lustre.files + echo '%{_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 + 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 + 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 + echo '%{_includedir}/linux/lustre_user.h' >>lustre.files else - echo '%attr(-, root, root) %{_includedir}/linux/lustre_idl.h' >>lustre.files + echo '%{_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 '%{_includedir}/linux/lustre_types.h' >>lustre.files fi -%if %{build_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 %{with lustre_tests} +echo '%{_libdir}/lustre/tests/*' >lustre-tests.files +echo '%{_bindir}/mcreate' >>lustre-tests.files +echo '%{_bindir}/munlink' >>lustre-tests.files +echo '%{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.ko' >>lustre-tests.files 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 @@ -337,13 +388,13 @@ 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 %{build_lustre_osd_ldiskfs} +%if %{with ldiskfs} cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-ldiskfs.sh %endif -%if %{build_lustre_osd_zfs} +%if %{with zfs} cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-zfs.sh %endif -%if %{build_lustre_tests} +%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 @@ -356,52 +407,82 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates -name "*.ko" -ty %endif %files -f lustre.files +%defattr(-,root,root) %files modules -%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/* -%if %{build_lustre_tests} +%defattr(-,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 %{build_lustre_osd_ldiskfs} -%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko +%if %{with ldiskfs} +%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/ldiskfs.ko %exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko %endif -%if %{build_lustre_osd_zfs} +%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 +%doc COPYING +%doc ChangeLog-lustre +%doc ChangeLog-lnet -%if %{build_lustre_osd_ldiskfs} +%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}/updates/kernel/fs/lustre/ldiskfs.ko +%{?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 %{build_lustre_osd_zfs} +%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}/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) %{_prefix}/src/lustre-%{version} +%defattr(-,root,root) +%{_prefix}/src/lustre-%{version} # uncomment these lines to enable deps packages # %files deps-sles # %files deps-rhel -%if %{build_lustre_tests} +%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} @@ -457,7 +538,7 @@ if sysctl kernel.unsupported >/dev/null 2>&1 && fi %endif -%if %{build_lustre_osd_ldiskfs} +%if %{with ldiskfs} %post osd-ldiskfs %if %{defined rpm_post_base} if [ -x %{rpm_post_base}-osd-ldiskfs.sh ]; then @@ -500,7 +581,7 @@ fi %endif %endif -%if %{build_lustre_osd_zfs} +%if %{with zfs} %post osd-zfs %if %{defined rpm_post_base} if [ -x %{rpm_post_base}-osd-zfs.sh ]; then @@ -553,7 +634,7 @@ MODULES_RPM_NAME=$(rpm -q %{name}-modules | grep "%{version}-%{release}") rpm -ql $MODULES_RPM_NAME | grep '\.ko$' > /var/run/%{name}-modules || true %endif -%if %{build_lustre_osd_ldiskfs} +%if %{with ldiskfs} %preun osd-ldiskfs %if %{defined rpm_post_base} if [ -x %{rpm_post_base}-osd-ldiskfs.sh ]; then @@ -565,7 +646,7 @@ rpm -ql $OSD_LDISKFS_RPM_NAME | grep '\.ko$' > /var/run/%{name}-osd-ldiskfs || t %endif %endif -%if %{build_lustre_osd_zfs} +%if %{with zfs} %preun osd-zfs %if %{defined rpm_post_base} if [ -x %{rpm_post_base}-osd-zfs.sh ]; then @@ -598,7 +679,7 @@ if [ -x /sbin/weak-modules ]; then fi rm /var/run/%{name}-modules -%if %{build_lustre_osd_ldiskfs} +%if %{with ldiskfs} %postun osd-ldiskfs if [ -f /boot/System.map-%{kversion} ]; then depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 @@ -620,7 +701,7 @@ fi rm /var/run/%{name}-osd-ldiskfs %endif -%if %{build_lustre_osd_zfs} +%if %{with zfs} %postun osd-zfs if [ -f /boot/System.map-%{kversion} ]; then depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0 @@ -643,7 +724,7 @@ rm /var/run/%{name}-osd-zfs %endif %endif -%if %{build_lustre_tests} +%if %{with lustre_tests} %post tests %if %{defined rpm_post_base} if [ -x %{rpm_post_base}-tests.sh ]; then