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 a99177834120e7a2c4592054f6a8b8736e0ffb92

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 845da95948a0ece41d4d2b12c0b39eb66ff46ce0..1ce3caf4e64b1efbec1f894d99eefe47288b8eb8 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -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

diff --git a/debian/control b/debian/control
index 3e9a85cc601665d9b8e3dc6db8922f3a32333dd9..09011acb4fa0b9e14ae005b0894f432ddb35a003 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -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