add all possible ceph-disk run-time requirements to build time deps

There really should be a better way than this to ensure the right things are installed for make check.

The existing list in ceph.spec.in has been re-sorted, just as the debian/control is

Andrew Bartlett

diff --git a/ceph.spec.in b/ceph.spec.in
index 98f2a80ae226c9bc60ca26d7143338c7c088f7c0..01a4980f668b8344669d3012a6dd9fd081c5a46e 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -35,26 +35,33 @@ Requires:   parted
 Requires:      util-linux
 Requires:      hdparm
 Requires(post):        binutils
-BuildRequires: make
 BuildRequires: gcc-c++
-BuildRequires: libtool
 BuildRequires: boost-devel
 BuildRequires:  bzip2-devel
-BuildRequires: libedit-devel
-BuildRequires: perl
+BuildRequires: cryptsetup
 BuildRequires: gdbm
-BuildRequires: pkgconfig
-BuildRequires: python
-BuildRequires: python-nose
-BuildRequires: python-argparse
-BuildRequires: python-virtualenv
+BuildRequires: hdparm
 BuildRequires: libaio-devel
 BuildRequires: libcurl-devel
+BuildRequires: libedit-devel
 BuildRequires: libxml2-devel
 BuildRequires: libuuid-devel
 BuildRequires: libblkid-devel >= 2.17
 BuildRequires: libudev-devel
+BuildRequires: libtool
 BuildRequires: leveldb-devel > 1.2
+BuildRequires: make
+BuildRequires: perl
+BuildRequires: parted
+BuildRequires: pkgconfig
+BuildRequires: python
+BuildRequires: python-argparse
+BuildRequires: python-flask
+BuildRequires: python-nose
+BuildRequires: python-requests
+BuildRequires: python-virtualenv
+BuildRequires: util-linux
+BuildRequires: xfsprogs
 BuildRequires: xfsprogs-devel
 BuildRequires: xmlstarlet
 BuildRequires: yasm

diff --git a/debian/control b/debian/control
index 3ed605e9be5cf47832a306f0d1e15e9cf8b6e79c..82bf0fcf2536beda805520f1d48d3d768ddf27e1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,9 +10,11 @@ Build-Depends: autoconf,
                automake,
                autotools-dev,
               libbz2-dev,
+              cryptsetup-bin | cryptsetup,
                debhelper (>= 6.0.7~),
                default-jdk,
                git,
+              gdisk,
                javahelper,
                junit4,
                libaio-dev,
@@ -39,14 +41,18 @@ Build-Depends: autoconf,
                libudev-dev,
                libxml2-dev,
               lsb-release,
+               parted,
                pkg-config,
                python (>= 2.6.6-3~),
                python-argparse,
+              python-flask,
                python-nose,
                python-virtualenv,
+               sdparm | hdparm,
                uuid-dev,
                uuid-runtime,
                xfslibs-dev,
+               xfsprogs,
                xmlstarlet,
                yasm [amd64]
 Standards-Version: 3.9.3