mirror of
https://github.com/ceph/ceph
synced 2024-12-27 14:03:25 +00:00
ceph.spec, debian: move deps from base to ceph-volume
this change makes util-linux, xfsprogs and e2fsprogs runtime deps of ceph-volume
ceph-volume uses blkid and lsblk, which are in turn packaged by
util-linux.
util-linux were added as build dependency to fulfill the needs of
ceph-disk. and we tested ceph-disk as part of "make check", since
ceph-disk was dropped, there is no need to have util-linux as
build dependency anymore.
the same applies to e2fsprogs and xfsprogs
see also a991778341
Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
parent
fd9d563a51
commit
94945b6408
@ -226,10 +226,8 @@ BuildRequires: snappy-devel
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: sudo
|
||||
BuildRequires: pkgconfig(udev)
|
||||
BuildRequires: util-linux
|
||||
BuildRequires: valgrind-devel
|
||||
BuildRequires: which
|
||||
BuildRequires: xfsprogs
|
||||
BuildRequires: xfsprogs-devel
|
||||
BuildRequires: xmlstarlet
|
||||
BuildRequires: nasm
|
||||
@ -435,14 +433,12 @@ Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
|
||||
%if 0%{with selinux}
|
||||
Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release}
|
||||
%endif
|
||||
Requires: e2fsprogs
|
||||
Requires: findutils
|
||||
Requires: grep
|
||||
Requires: logrotate
|
||||
Requires: parted
|
||||
Requires: psmisc
|
||||
Requires: util-linux
|
||||
Requires: xfsprogs
|
||||
Requires: which
|
||||
%if 0%{?rhel} && 0%{?rhel} < 8
|
||||
# The following is necessary due to tracker 36508 and can be removed once the
|
||||
@ -826,8 +822,11 @@ Group: System/Filesystems
|
||||
%endif
|
||||
Requires: ceph-osd = %{_epoch_prefix}%{version}-%{release}
|
||||
Requires: cryptsetup
|
||||
Requires: e2fsprogs
|
||||
Requires: lvm2
|
||||
Requires: parted
|
||||
Requires: util-linux
|
||||
Requires: xfsprogs
|
||||
Requires: python%{python3_pkgversion}-setuptools
|
||||
Requires: python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release}
|
||||
%description volume
|
||||
|
6
debian/control
vendored
6
debian/control
vendored
@ -104,7 +104,6 @@ Build-Depends: automake,
|
||||
uuid-runtime,
|
||||
valgrind,
|
||||
xfslibs-dev,
|
||||
xfsprogs <pkg.ceph.check>,
|
||||
xmlstarlet <pkg.ceph.check>,
|
||||
nasm [amd64],
|
||||
zlib1g-dev,
|
||||
@ -126,13 +125,11 @@ Architecture: linux-any
|
||||
Depends: binutils,
|
||||
ceph-common (= ${binary:Version}),
|
||||
debianutils,
|
||||
e2fsprogs,
|
||||
findutils,
|
||||
grep,
|
||||
logrotate,
|
||||
parted,
|
||||
psmisc,
|
||||
xfsprogs,
|
||||
${misc:Depends},
|
||||
${python:Depends},
|
||||
${shlibs:Depends},
|
||||
@ -442,8 +439,11 @@ Architecture: all
|
||||
Section: python
|
||||
Depends: ceph-osd (= ${binary:Version}),
|
||||
cryptsetup-bin,
|
||||
e2fsprogs,
|
||||
lvm2,
|
||||
parted,
|
||||
util-linux,
|
||||
xfsprogs,
|
||||
${misc:Depends},
|
||||
${python3:Depends}
|
||||
Description: tool to facilidate OSD deployment
|
||||
|
Loading…
Reference in New Issue
Block a user