mirror of
https://github.com/ceph/ceph
synced 2025-03-09 17:59:10 +00:00
Merge pull request #16449 from smithfarm/wip-obsolete-xio
build/ops: rpm: Drop legacy libxio support Reviewed-by: Ken Dreyer <kdreyer@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
commit
3bce6128b5
14
ceph.spec.in
14
ceph.spec.in
@ -22,7 +22,6 @@
|
|||||||
%bcond_without ceph_test_package
|
%bcond_without ceph_test_package
|
||||||
%endif
|
%endif
|
||||||
%bcond_with make_check
|
%bcond_with make_check
|
||||||
%bcond_with xio
|
|
||||||
%ifarch s390 s390x
|
%ifarch s390 s390x
|
||||||
%bcond_with tcmalloc
|
%bcond_with tcmalloc
|
||||||
%else
|
%else
|
||||||
@ -218,10 +217,6 @@ BuildRequires: expat-devel
|
|||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
BuildRequires: redhat-rpm-config
|
BuildRequires: redhat-rpm-config
|
||||||
%endif
|
%endif
|
||||||
# Accelio IB/RDMA
|
|
||||||
%if 0%{with xio}
|
|
||||||
BuildRequires: libxio-devel
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Ceph is a massively scalable, open-source, distributed storage system that runs
|
Ceph is a massively scalable, open-source, distributed storage system that runs
|
||||||
@ -258,9 +253,6 @@ Requires: which
|
|||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Recommends: ntp-daemon
|
Recommends: ntp-daemon
|
||||||
%endif
|
%endif
|
||||||
%if 0%{with xio}
|
|
||||||
Requires: libxio
|
|
||||||
%endif
|
|
||||||
%description base
|
%description base
|
||||||
Base is the package that includes all the files shared amongst ceph servers
|
Base is the package that includes all the files shared amongst ceph servers
|
||||||
|
|
||||||
@ -287,9 +279,6 @@ Requires: python-requests
|
|||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Requires(pre): pwdutils
|
Requires(pre): pwdutils
|
||||||
%endif
|
%endif
|
||||||
%if 0%{with xio}
|
|
||||||
Requires: libxio
|
|
||||||
%endif
|
|
||||||
%description -n ceph-common
|
%description -n ceph-common
|
||||||
Common utilities to mount and interact with a ceph storage cluster.
|
Common utilities to mount and interact with a ceph storage cluster.
|
||||||
Comprised of files that are common to Ceph clients and servers.
|
Comprised of files that are common to Ceph clients and servers.
|
||||||
@ -831,9 +820,6 @@ cmake .. \
|
|||||||
%if 0%{?rhel} && ! 0%{?centos}
|
%if 0%{?rhel} && ! 0%{?centos}
|
||||||
-DWITH_SUBMAN=ON \
|
-DWITH_SUBMAN=ON \
|
||||||
%endif
|
%endif
|
||||||
%if 0%{with xio}
|
|
||||||
-DWITH_XIO=ON \
|
|
||||||
%endif
|
|
||||||
%if 0%{without ceph_test_package}
|
%if 0%{without ceph_test_package}
|
||||||
-DWITH_TESTS=OFF \
|
-DWITH_TESTS=OFF \
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
Reference in New Issue
Block a user