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-6527 ext4: journal_commit_callback optimization
[fs/lustre-release.git]
/
lustre.spec.in
diff --git
a/lustre.spec.in
b/lustre.spec.in
index
d435639
..
4f6f6ca
100644
(file)
--- a/
lustre.spec.in
+++ b/
lustre.spec.in
@@
-9,6
+9,7
@@
%bcond_without lustre_iokit
%bcond_without lustre_modules
%bcond_with lnet_dlc
%bcond_without lustre_iokit
%bcond_without lustre_modules
%bcond_with lnet_dlc
+%bcond_without manpages
%if %{without servers}
# --without servers overrides --with {ldiskfs|zfs}
%if %{without servers}
# --without servers overrides --with {ldiskfs|zfs}
@@
-59,7
+60,7
@@
# for those uses that don't want the -smp/-bigsmp (or the .arch) on the end
# of %kversion
# for those uses that don't want the -smp/-bigsmp (or the .arch) on the end
# of %kversion
-%define krequires %(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 krequires %(echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/
[-.]
ppc64$//' -e 's/-default$//')
# Set the package name prefix
%if %{undefined lustre_name}
# Set the package name prefix
%if %{undefined lustre_name}
@@
-107,6
+108,9
@@
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
Provides: lustre-lite = %{version}, lustre-lite-utils = %{version}
Requires: %{name}-modules = %{version}
BuildRequires: libtool
+%if %{with manpages}
+BuildRequires: python-docutils
+%endif
%if %{with servers}
Requires: lustre-osd
Requires: lustre-osd-mount
%if %{with servers}
Requires: lustre-osd
Requires: lustre-osd-mount
@@
-196,7
+200,7
@@
backing store of a Lustre server.
%if %{with lustre_utils}
%package osd-zfs-mount
%if %{with lustre_utils}
%package osd-zfs-mount
-Summary: osd-zfs-mount contains mount's
ldisk
fs specific dso.
+Summary: osd-zfs-mount contains mount's
z
fs specific dso.
Provides: lustre-osd-mount
Group: Development/Kernel
Provides: lustre-osd-mount
Group: Development/Kernel
@@
-337,6
+341,7
@@
fi
%{!?with_servers:--disable-server} \
%{!?with_zfs:--without-zfs} \
%{!?with_lnet_dlc:--disable-dlc} \
%{!?with_servers:--disable-server} \
%{!?with_zfs:--without-zfs} \
%{!?with_lnet_dlc:--disable-dlc} \
+ %{!?with_manpages:--disable-manpages} \
--with-release=%{release} \
--with-linux=%{kdir} \
--with-linux-obj=%{kobjdir} \
--with-release=%{release} \
--with-linux=%{kdir} \
--with-linux-obj=%{kobjdir} \
@@
-442,6
+447,9
@@
find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} \
%files -f lustre.files
%defattr(-,root,root)
%{_sbindir}/*
%files -f lustre.files
%defattr(-,root,root)
%{_sbindir}/*
+%if %{with zfs}
+%exclude %{_sbindir}/zfsobj2fid
+%endif
%if %{with lustre_utils}
%if %{with servers}
%{_libexecdir}/lustre/lc_common
%if %{with lustre_utils}
%if %{with servers}
%{_libexecdir}/lustre/lc_common
@@
-460,7
+468,9
@@
find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} \
%{_libdir}/libcfsutil.a
%{_libdir}/liblustreapi.a
%{_libdir}/liblustreapi.so
%{_libdir}/libcfsutil.a
%{_libdir}/liblustreapi.a
%{_libdir}/liblustreapi.so
+%if %{with manpages}
%{_mandir}/man?/*
%{_mandir}/man?/*
+%endif
%{_includedir}/lustre
%{_includedir}/libcfs
%endif
%{_includedir}/lustre
%{_includedir}/libcfs
%endif
@@
-511,6
+521,7
@@
find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir} \
%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
+%{_sbindir}/zfsobj2fid
%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