%define rpm_post_base %(echo $(dirname %{cross_path})/%{lustre_name})
%endif
+# SUSE don't support .debug_info section from cross compiler:
+# /usr/lib/rpm/debugedit: Unhandled relocation 10 in .debug_info section
+%if %{defined cross_path} && 0%{?suse_version}
+%global __debug_install_post %{nil}
+%global __debug_package %{nil}
+%global debug_package %{nil}
+%endif
+
Summary: Lustre File System
Name: %{lustre_name}
Version: %{version}
License: GPL
Group: Utilities/System
Source: lustre-%{version}.tar.gz
-URL: http://wiki.whamcloud.com/
+URL: https://wiki.hpdd.intel.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}
+BuildRequires: libtool
%if %{with servers}
Requires: lustre-osd
%endif
%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: module-init-tools >= 3.9
Requires: ldiskfsprogs >= 1.42.7.wc1
Provides: lustre-osd
Obsoletes: lustre-ldiskfs
%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 --disable-liblustre-tests"
+CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests"
%endif
%if %{without lustre_iokit}
CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-iokit"
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 "%kdir" ]; then
CONFIGURE_ARGS=$(echo $CONFIGURE_ARGS | sed -e 's/"\?--with-linux=[^ ][^ ]* \?//')
%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
+:> 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
-:> lustre.files
-
-if [ -f $RPM_BUILD_ROOT%{_libdir}/liblustre.so ] ; then
- echo '%{_libdir}/liblustre.a' >>lustre.files
- echo '%{_libdir}/liblustre.so' >>lustre.files
-fi
-
if [ -f $RPM_BUILD_ROOT%{_libdir}/libiam.a ] ; then
echo '%{_libdir}/libiam.a' >>lustre.files
fi
echo '%{_datadir}/lustre/snmp/mibs' >>lustre.files
fi
+find $RPM_BUILD_ROOT%{_libdir}/@PACKAGE@/ -name \*.la -delete
+
%if %{with lustre_tests}
echo '%{_libdir}/lustre/tests/*' >>lustre-tests.files
echo '%{_bindir}/mcreate' >>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 '%{_libdir}/lustre/liblustre/tests/*' >>lustre-tests.files
-fi
%endif
%if %{defined cross_path}
%{_includedir}/libcfs
%{_includedir}/linux/lustre_user.h
%{_libexecdir}/lustre/lc_common
+%{_libexecdir}/lustre/haconfig
%{_sysconfdir}/udev/rules.d/99-lustre.rules
-%{_sysconfdir}/init.d/lnet
-%{_sysconfdir}/init.d/lustre
%config(noreplace) %{_sysconfdir}/ldev.conf
-%{_sysconfdir}/sysconfig/lustre
-%{_libexecdir}/lustre/haconfig
-%{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2
-%{_sysconfdir}/ha.d/resource.d/Lustre
%if %{with lustre_modules}
%files modules
%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
%files osd-zfs
%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
%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}/parse-ior
-%{_bindir}/libecho
+%{_bindir}/mds-survey
%{_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/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.lstats.sh
+%doc lustre-iokit/stats-collect/README.iokit-lstats
%endif
%if %{defined rpm_post_base}