From: Ken Dreyer <kdreyer@redhat.com>
Date: Tue, 31 May 2016 23:50:05 +0000 (-0600)
Subject: packaging: move parted requirement to -osd subpkg
X-Git-Tag: v10.2.3~57^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1a47c7728a17dbfc71280270b0c3079e5961ffb;p=ceph.git

packaging: move parted requirement to -osd subpkg

Prior to this change, ceph-base required the "parted" package, which
meant that any installation of ceph-osd, ceph-mon, or ceph-mds would
pull in the parted package.

Move the parted dependency to ceph-osd, since ceph-disk is the only
thing that uses parted.

The advantage of this change is that Mon and MDS systems will not need
to install the parted package.

Fixes: http://tracker.ceph.com/issues/16095

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 115349680bad520a0aa56ce3a346d93f541a905c)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 3cf6307f117..c7ff05213f2 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -197,7 +197,6 @@ Requires:      python-setuptools
 Requires:      grep
 Requires:      xfsprogs
 Requires:      logrotate
-Requires:      parted
 Requires:      util-linux
 Requires:      hdparm
 Requires:      cryptsetup
@@ -342,6 +341,7 @@ Requires:	gdisk
 %if 0%{?suse_version}
 Requires:	gptfdisk
 %endif
+Requires:       parted
 %description osd
 ceph-osd is the object storage daemon for the Ceph distributed file
 system.  It is responsible for storing objects on a local file system
diff --git a/debian/control b/debian/control
index f774a30fc11..3e036892a04 100644
--- a/debian/control
+++ b/debian/control
@@ -90,7 +90,6 @@ Depends: binutils,
          grep,
          logrotate,
          lsb-release,
-         parted,
          python,
          python-argparse | libpython2.7-stdlib,
          python-pkg-resources,
@@ -179,7 +178,10 @@ Description: debugging symbols for ceph-mon
 
 Package: ceph-osd
 Architecture: linux-any
-Depends: ceph-base (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ceph-base (= ${binary:Version}),
+         parted,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: ceph-common (= ${binary:Version})
 Replaces: ceph (<< 10)
 Breaks: ceph (<< 10)