Commit Graph

254 Commits

Author SHA1 Message Date
Dan Mick
fa05d802c6 debian/control: try installing virtualenv first, if it exists
Debian Jessie (at least) now has the virtualenv command in
package 'virtualenv', which depends on python3-virtualenv, and
that's how you get the virtualenv command there.  Earlier
Debian-based releases still use python-virtualenv.  Jessie's
virtualenv command still creates a python2 venv by default.

This will require a followup fix for install-deps.sh
to handle the | correctly, because currently it sends
the string to apt-get, which treats it as a regular expression
alternation of the two package names, so will try to install both.

The problem occurs when packages are installed without Recommended
packages (because jessie's virtualenv package currently Recommends
python-virtualenv); this is the case under pbuilder, and also using
'mk-build-deps --install', and I suspect under other automated
package-building tools.

Note that Build-Requires processing is not specified to
perform the searches in left-to-right order, so even this is
a tenuous workaround.  We probably need distro-specific
debian/ directories.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2016-03-23 17:38:12 -07:00
Loic Dachary
eb583cbbbf build/ops: in jessie virtualenv is in package virtualenv
The python scripts are not yet compatible with python3, yet it is the
default on jessie. Force the creation of the virtualenv to use python2.7
instead. The wheelhouse is already explicitly populated for both python3
and python2.7 by install-deps.sh, regardless of the default interpreter.

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-23 19:56:11 +01:00
Nathan Cutler
c4364b13b7 packaging: align radosgw package description
First, make the Debian package description mention that RGW aims to
implement the Swift API.

Second, replace the RPM package description with the Debian one, both for
consistency and because the Debian one is better.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-19 22:43:53 +01:00
Sage Weil
5b18de23b5 Merge remote-tracking branch 'gh/wip-strict-debian-deps' 2016-03-17 17:53:23 -04:00
Yehuda Sadeh
5077d729cb Merge remote-tracking branch 'origin/master' into wip-rgw-ldap 2016-03-12 15:17:03 -08:00
Matt Benjamin
de8367bc27 rgw: require openldap library client headers
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-03-12 13:02:58 -08:00
Sage Weil
41cf56062b Merge remote-tracking branch 'gh/jewel' 2016-03-12 09:03:06 -05:00
Nathan Cutler
a230a3839d debian: make infernalis -> jewel upgrade work
Attempts to install jewel ceph-common, ceph-mon, ceph-osd, and ceph-base
package over infernalis ceph package fail due to files existing in both.

See comment #4 in the tracker issue for a deeper analysis.

http://tracker.ceph.com/issues/15047 Fixes: #15047

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-12 00:22:07 +01:00
Sage Weil
57c6d3b67a Merge branch 'debian-stretch-dep-fix' of git://github.com/rldleblanc/ceph
Reviewed-by: Sage Weil <sage@redhat.com>
# Conflicts:
#	debian/control
2016-03-11 11:14:18 -05:00
Erwan Velu
7d48d21a53 packaging: Adding btrfs build require
When doing a 'make check', 'qa/workunits/ceph-helpers.sh' does expect the 'btrfs'
command to be available. If not, that make many tests failing.

Signed-off-by: Erwan Velu <erwan@redhat.com>
2016-03-07 20:27:06 +01:00
Ken Dreyer
11b1cdc649 debian: tighten sub-package version dependencies
Prior to this change, users could possibly install some ceph
sub-packages with differing versions. Make each sub-package explicitly
depend on a particular version of its dependencies.

I've purposly excluded ceph-test's dependencies for now (see
http://tracker.ceph.com/issues/10989 for background.)

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-03-04 07:57:36 -07:00
Sage Weil
2786f0bf11 Merge remote-tracking branch 'gh/jewel' 2016-03-02 09:22:28 -05:00
Nathan Cutler
b87f4efb56 packaging: lsb_release build and runtime dependency
The lsb_release executable is being run in multiple places, not least in
src/common/util.cc, which calls it via shell in the collect_sys_info() code
path.

This patch addresses this issue on SUSE- and Debian-derivatives, as well
as reinstating the dependency for RHEL/Fedora after it was dropped in
1560057226.

http://tracker.ceph.com/issues/14906 Fixes: #14906

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-01 15:14:46 +01:00
Robert LeBlanc
b4f19352bc Python-argparse is a virtual package which stretch wants you to pick
a real package to satisfy the dependency.

Signed-off-by: Robert LeBlanc <robert.leblanc@endurance.com>
2016-02-27 17:16:18 +00:00
Nathan Cutler
cba211dfa8 packaging: pkg_resources.py runtime dependency
ceph-detect-init uses pkg_resources.py

http://tracker.ceph.com/issues/14864 Fixes: #14864

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-27 14:59:54 +01:00
Nathan Cutler
1a0bb0f687 packaging: move python-flask runtime dependency to ceph-mon, radosgw
Flask is used by MON (in the Ceph REST API) and by RGW (powerdns).
Therefore, it only needs to be in the ceph-mon and ceph-radosgw packages.

Also, this commit encloses the specification of the python-flask runtime
dependency in distro-conditional blocks to account for a minor difference
in the package name between RHEL and SUSE.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-27 14:59:54 +01:00
Ali Maredia
d4dd0f495b debian: remove ceph-dbg package and any traces of it
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-02-26 13:17:25 -05:00
Ken Dreyer
3fc7fdba91 debian: remove ceph-base's dependency on -mon and -osd
The ceph-base package contains files shared between the -mon, -osd, and
-mds. In other words, the MON, OSD, and MDS servers depend on ceph-base,
but ceph-base should not depend on the leaf packages.

Reported-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-02-26 10:51:39 -07:00
Sage Weil
aa92f9dff0 rgw: link against system openssl (instead of dlopen at runtime)
Signed-off-by: Sage Weil <sage@redhat.com>
2016-02-25 11:44:10 -08:00
Ali Maredia
0cbe3dea69 debian/rpm: split mon/osd/mds server packages
Split up the "ceph" package into four new packages:

  1. ceph-mon
  2. ceph-osd
  3. ceph-mds (already done on Debian)
  4. ceph-base (files shared among multiple servers)

and then:

  5. Make "ceph" into a metapackage that depends on both -mon and -osd
    (and -mds, for RPMs).

To describe the outcome of this change another way:

  For RPMs:
  - "ceph-{mon,osd,mds}" Require: ceph-base.
  - "ceph" will become a metapackage that Requires: ceph-{mon,osd,mds}.

  For DEBs:
  - "ceph-{mon,osd,mds}" will Depends: ceph-base.
  - "ceph" will become a metapackage that Depends: ceph-{mon,osd}.
  - "ceph" will continue to Recommends: ceph-mds

New users should "yum install ceph-mon" or "yum install ceph-osd" (or
"apt-get install ceph-mon", etc) in order to install the exact daemons
that they need.

http://tracker.ceph.com/issues/10587 Fixes: #10587

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-02-24 16:47:34 -05:00
Matt Benjamin
85e4febb17 librgw: fix new Debian control entries
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-02-12 13:07:28 -05:00
Matt Benjamin
de0f86691b librgw: add debian and rpm packaging
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-02-12 13:07:24 -05:00
Sage Weil
e211b5b278 Merge pull request #7533 from Cdiscount/master
debian: include cpio in build-requiers

Reviewed-by: Sage Weil <sage@redhat.com>
2016-02-11 08:45:17 -05:00
Rémi BUISSON
6666300084 debian: fix build-depends
Signed-off-by: Rémi BUISSON <remi.buisson@cdiscount.com>
2016-02-09 14:41:51 +01:00
Josh Durgin
8f0166728b packaging: add an rbd-mirror package
Depend on ceph-common for /etc/ceph. Startup scripts will be added later.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2016-02-04 00:10:16 -08:00
Marcel Lauhoff
f88fcf032f debian: Add build dep 'libboost-iostreams-dev'
Required by graylog logging backend

Signed-off-by: Marcel Lauhoff <ml@irq0.org>
2016-01-29 15:32:47 +01:00
Kefu Chai
f5da159457 makefile: remove dependency on libedit
turns out we are not using it anymore

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-20 00:35:50 +08:00
Jason Dillaman
a290d34ebd Merge remote-tracking branch 'upstream/jewel' 2016-01-14 16:21:05 -05:00
Jason Dillaman
953bdfbccd deb,rpm: add valgrind to build dependencies
Provides necessary support for annotating helgrind
false-positives.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-01-13 09:54:29 -05:00
Josh Durgin
ebdb0a9c30 packaging: add build dependency on python devel package
This is required for building python modules with cython, but for some
reason is not a direct dependency (on debian only a recommends) for
the cython package itself.

Refs: #14059
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2016-01-12 11:12:30 -08:00
Kefu Chai
0dc0d425ff Revert "Revert "makefiles: remove bz2-dev from dependencies""
This reverts commit 35542eb6ed.
2015-12-23 01:40:54 -08:00
Samuel Just
35542eb6ed Revert "makefiles: remove bz2-dev from dependencies" 2015-12-15 15:12:19 -08:00
Piotr Dałek
a8b5920259 makefiles: remove bz2-dev from dependencies
The only thing that uses bzip2-devel is RocksDB, and it's optional, not
requirement. Drop the bzip2-devel/libbz2-dev dependency entirely, and
let RocksDB use it only if it is already present.

Fixes: #13981
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2015-12-15 14:01:51 +01:00
Josh Durgin
701a6626a2 Merge pull request #6768 from marcan/cython
pybind: port the rbd bindings to Cython

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2015-12-09 15:45:17 -08:00
Hector Martin
8655cca10b debian/control: make python-rbd depend on minimum librbd version
As the Cython bindings build to a binary module, backwards compatibility with
older librbd ABIs at runtime is not possible, so depend on at least the same
version (or newer).

Signed-off-by: Hector Martin <marcan@marcan.st>
2015-12-02 00:29:55 +09:00
Hector Martin
5113c962ee configure/packaging: introduce Cython dependency
To prepare for the migration of rbd.py to Cython, add Cython as a package
dependency and have the configure script look for it.

Also adds Cython as a dependency for admin/build-doc, and changes the
virtualenv to allow usage of system packages (to avoid having to compile
Cython inside the virtualenv).

With contributions by Josh Durgin <jdurgin@redhat.com>

Signed-off-by: Hector Martin <marcan@marcan.st>
2015-12-02 00:29:54 +09:00
Yunchuan Wen
7bbd54a1e6 add rbd-nbd package
Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
2015-11-21 23:26:44 +08:00
Loic Dachary
a0204dc47a build/ops: rbd-replay moved from ceph-test-dbg to ceph-common-dbg
http://tracker.ceph.com/issues/13785 Fixes: #13785

Signed-off-by: Loic Dachary <loic@dachary.org>
2015-11-13 19:11:48 +01:00
Yehuda Sadeh
a5651b867a Revert 0374bb4a2f 2015-11-09 15:24:29 -08:00
Sage Weil
173bfd03c4 rgw: link against system openssl (instead of dlopen at runtime)
Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-29 01:06:36 -04:00
Sage Weil
036d36f4ff debian/control: python-setuptools is a build dependency
cd ./ceph-detect-init ; python setup.py build
Traceback (most recent call last):
  File "setup.py", line 23, in <module>
    from setuptools import setup
ImportError: No module named setuptools

Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-13 08:37:40 -04:00
Ken Dreyer
96486fd6f2 packaging: move rbd-replay* to ceph-common
The rbd-replay* utilities are useful for Ceph users with RBD clients.
Currently the rbd-replay* utilities ship in the "ceph-test" package, and
we intend this ceph-test package for Ceph developers and contributors,
not normal users.

Move the rbd-replay* utilities to "ceph-common".

http://tracker.ceph.com/issues/12994 Fixes: #12994

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-09-15 14:01:18 -06:00
Sage Weil
322ad808cd debian/control: build requires cmake
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-03 15:01:34 -04:00
Sage Weil
f69498f320 debian/control: build-requires libboost-regex-dev
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-03 14:59:37 -04:00
Sage Weil
dbcaa54485 uuid: use boost::random:random_device
The boost mt code uses uninitialized memory for extra randomness,
which is a bad idea in general but more importantly makes valgrind
unhappy.  Use /dev/urandom instead.

Unfortunately this introduces a link time dependency.. meh!

Fixes: #12736
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-24 14:51:47 -04:00
Loic Dachary
d2d540c165 build/ops: add uuid-runtime to debian/control
uuid-runtime was incorrectly removed by
62bfc7a1ab, restore it.

http://tracker.ceph.com/issues/12734 Fixes: #12734

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-08-20 16:19:00 +02:00
Rohan Mars
62bfc7a1ab moved to use boost uuid implementation, based on commit 4fe89a7b14
Signed-off-by: Rohan Mars <code@rohanmars.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2015-08-19 06:46:17 -04:00
Ken Dreyer
af336313fe Merge pull request #5344 from trhoden/update_debain_maintainer
debian: Update maintainers and uploaders

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-08-10 17:02:03 -06:00
Sage Weil
bbe84578bf remove rest-bench
This is a weak tool; users should look to cosbench or others instead.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-07-30 13:21:36 -04:00
Travis Rhoden
6f54c61bcf debian: Update maintainers and uploaders
Signed-off-by: Travis Rhoden <trhoden@redhat.com>
2015-07-24 14:00:50 -07:00