Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-4579 ldlm: Properly display time on lock timeout
[fs/lustre-release.git]
/
lustre.spec.in
diff --git
a/lustre.spec.in
b/lustre.spec.in
index
fb757d8
..
227e0cb
100644
(file)
--- a/
lustre.spec.in
+++ b/
lustre.spec.in
@@
-94,6
+94,7
@@
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}
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
%if %{with servers}
Requires: lustre-osd
%endif
@@
-270,9
+271,9
@@
cd $RPM_BUILD_DIR/lustre-%{version}
%define optflags -g -O2 -Werror
CONFIGURE_ARGS="%{?configure_args} --with-release=%release"
%if %{with lustre_tests}
%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
%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"
%endif
%if %{without lustre_iokit}
CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-iokit"
@@
-284,6
+285,10
@@
CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-modules"
CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-modules"
%endif
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=[^ ][^ ]* \?//')
# 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=[^ ][^ ]* \?//')
@@
-309,8
+314,6
@@
make %{?_smp_mflags} -s %{?make_args}
%install
make install DESTDIR=$RPM_BUILD_ROOT
%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
:> lustre.files
@@
-342,11
+345,6
@@
chmod -R go-w lustre-source/lustre-%{version}
# fc18 needs 'x' permission for library files
find $RPM_BUILD_ROOT -name '*.so' | xargs chmod +x
# fc18 needs 'x' permission for library files
find $RPM_BUILD_ROOT -name '*.so' | xargs chmod +x
-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
if [ -f $RPM_BUILD_ROOT%{_libdir}/libiam.a ] ; then
echo '%{_libdir}/libiam.a' >>lustre.files
fi
@@
-356,6
+354,8
@@
if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then
echo '%{_datadir}/lustre/snmp/mibs' >>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_tests}
echo '%{_libdir}/lustre/tests/*' >>lustre-tests.files
echo '%{_bindir}/mcreate' >>lustre-tests.files
@@
-363,9
+363,6
@@
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 %{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}
%endif
%if %{defined cross_path}
@@
-445,6
+442,7
@@
find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} -name "*.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
%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 %{defined rpm_post_base}
%attr(0555, root, root) %{rpm_post_base}-osd-ldiskfs.sh
%endif
@@
-454,6
+452,7
@@
find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} -name "*.ko"
%files osd-zfs
%defattr(-,root,root)
%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/@PACKAGE@/osd_zfs.ko
%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 %{defined rpm_post_base}
%attr(0555, root, root) %{rpm_post_base}-osd-zfs.sh
%endif
@@
-476,25
+475,25
@@
find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} -name "*.ko"
%if %{with lustre_iokit}
%files -n lustre-iokit
%defattr(-, root, root)
%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}/ior-survey
-%{_bindir}/parse-ior
-%{_bindir}/libecho
+%{_bindir}/mds-survey
%{_bindir}/obdfilter-survey
%{_bindir}/obdfilter-survey
-%{_bindir}/plot-obdfilter
-%{_bindir}/plot-ost
%{_bindir}/ost-survey
%{_bindir}/sgpdd-survey
%{_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/ior-survey/README.ior-survey
-%doc lustre-iokit/ost-survey/README.ost-survey
%doc lustre-iokit/mds-survey/README.mds-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/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}
%endif
%if %{defined rpm_post_base}