From: Kefu Chai <kchai@redhat.com>
Date: Wed, 28 Jul 2021 07:16:19 +0000 (+0800)
Subject: debian/control: make cryptsetup-bin a ceph-volume runtime dep
X-Git-Tag: v17.1.0~879^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fd9d563a51cfac01d3084b1dd6e4afe584d2d904;p=ceph-ci.git

debian/control: make cryptsetup-bin a ceph-volume runtime dep

was originally added by 6a45b8ed041514816d09b2808d2d390eadbd0dd9 and
cfcaceac44d6b7b7c55e81d0bfb05f4893f3b1d0 as a dependency of ceph-disk.
although, ceph-disk was replaced by ceph-volume, cryptsetup-bin is still
used.

but it should be a runtime dependency of ceph-volume. and it is not a
build dependency of ceph, so it's removed from the build dependency list
as well.

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

diff --git a/debian/control b/debian/control
index 7b845cf3331..3e9a85cc601 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends: automake,
                bison  <pkg.ceph.jaeger>,
                cmake (>= 3.10.2),
                cpio,
-               cryptsetup-bin | cryptsetup,
                cython3,
                debhelper (>= 10),
                default-jdk,
@@ -126,7 +125,6 @@ Package: ceph-base
 Architecture: linux-any
 Depends: binutils,
          ceph-common (= ${binary:Version}),
-         cryptsetup-bin | cryptsetup,
          debianutils,
          e2fsprogs,
          findutils,
@@ -443,6 +441,7 @@ Package: ceph-volume
 Architecture: all
 Section: python
 Depends: ceph-osd (= ${binary:Version}),
+         cryptsetup-bin,
          lvm2,
          parted,
          ${misc:Depends},