Commit Graph

871 Commits

Author SHA1 Message Date
Kefu Chai
f369f4d585 debian: move libcephfs-jni to section "java"
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-18 23:55:00 +08:00
Kefu Chai
62d4aab325 debian: remove X-Python-Version section
it's obsolete and can be removed now,
see
https://www.debian.org/doc/packaging-manuals/python-policy/ch-module_packages.html#s-specifying_versions

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-18 23:55:00 +08:00
Kefu Chai
2454bda3f3 debian: add ${shlibs:Depends} to binary packages' Depends
rationale
* this fixes:
  warning: dpkg-gencontrol: package python-rbd: unused substitution
  variable ${shlibs:Depends}
* and to comply to debian policy. see
  https://www.debian.org/doc/debian-policy/ch-sharedlibs.html#s-dpkg-shlibdeps

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-18 23:54:59 +08:00
Kefu Chai
e00610a50f debian: add jh_depends for ${java:Depends}
this fixes:
warning: dpkg-gencontrol: Depends field of package libcephfs-java:
unknown substitution variable ${java:Depends}

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-18 23:54:59 +08:00
Kefu Chai
25dfbd09f4 Merge pull request #9476 from ceph/wip-no-unittests-in-deb
packaging: do not package unused unittests in deb

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-09 01:52:28 +08:00
Sage Weil
4dc3d08ef7 Merge pull request #9475 from tchaikov/wip-debian
debian: package compressor plugins and silence dpkg-shlibdeps warnings  

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-08 12:43:50 -04:00
Kefu Chai
70bbf1aded configure.ac,debian,rpm: do not package .a files in rpm/deb packages
this change removes *.a from -dev or -devel packages.

* configure.ac:
  - use LT_INIT instead of AM_PROG_LIBTOOL. the later is deprecated.
  - disable static lib:
    .a static libraries not not useful, it's tricky to generate both
    static libraries and shared libraries in cmake.
    see http://www.spinics.net/lists/ceph-devel/msg30637.html
* ceph.spec.in: fedora packaging policy forbids this
  see
  https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_Static_Libraries
* debian/*-dev.install: debian does not requires this
  see
  https://www.debian.org/doc/debian-policy/ch-sharedlibs.html#s-sharedlibs-static

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-07 14:08:59 +08:00
Kefu Chai
4ba2bb750b debian: do not install *.la files
rationales:
* .la files are worthless
  see http://www.spinics.net/lists/ceph-devel/msg30637.html
* debian does not like it:
  see https://wiki.debian.org/ReleaseGoals/LAFileRemoval
* neither does fedora:
  https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_Static_Libraries
* also they are created by libtools, and cmake does not use libtools.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-07 14:08:59 +08:00
Kefu Chai
d596146e6d makefile,debian,rpm: do not package librgw_file* anymore
they are unit tests for rgw.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-07 14:08:59 +08:00
Kefu Chai
52021ff9f0 makefile: install mount.fuse.ceph,mount.ceph into /usr/sbin
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-04 09:37:33 +08:00
Kefu Chai
33b64f5b0e debian: package compressor plugsin in ceph-common
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-03 15:40:34 +08:00
Kefu Chai
edeac4baed debian/rules: silence dpkg-shlibdeps warnings
plugins do have unresolved symbols. so exclude them from
dpkg-shlibdeps's scan list. this silences warnings like:

```
dpkg-shlibdeps: warning:
debian/ceph-base/usr/lib/ceph/erasure-code/libec_shec_generic.so.1.0.0
contains an unresolvable reference to symbol
_ZN4ceph6buffer3ptrC1EPNS0_3rawE: it's probably a plugin
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-03 15:40:31 +08:00
Ken Dreyer
115349680b 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>
2016-05-31 17:51:55 -06:00
Ken Dreyer
4353eb2721 packaging: drop python-flask dependency from radosgw
The PowerDNS integration code itself is not packaged at this point, so
remove the python-flask dependency from the radosgw package.

Maybe the PowerDNS integration bits could live in a separate
sub-package, eventually.

Fixes: http://tracker.ceph.com/issues/16032
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-05-25 23:28:09 -06:00
Sage Weil
266ccccccf debian,rpm: add jq build dependency
Needed since db517ba917.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-06 13:44:16 +02:00
Alexandre Derumier
13804fafd4 fix deb package /etc/default/ceph location
commit 7384a14f24 have introduce
the /etc/default/ceph file at a wrong location : /etc/default/ceph/ceph
2016-04-28 22:48:52 +02:00
Sage Weil
89154d1e01 debian/control: dh_systemd_start is in the dh-systemd package
Fixes: http://tracker.ceph.com/issues/15573
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-28 09:13:50 -04:00
Kefu Chai
f950a0a7f5 debian: install systemd target files
* enable it using dh_systemd_enable
* start the target using dh_systemd_start
* move the dh_installinit, dh_systemd_enable, dh_systemd_start calls
  down, so they can identify the service files if they care about them.

Fixes: http://tracker.ceph.com/issues/15573
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-04-28 10:02:08 +08:00
Nathan Cutler
f27cda03b7 deb: make ceph-base and radosgw recommend time-daemon
References: http://tracker.ceph.com/issues/15419

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-04-25 22:16:15 +02:00
Sage Weil
b7afa78e22 Merge remote-tracking branch 'gh/jewel' 2016-04-21 07:39:36 -04:00
Jenkins Build Slave User
3a9fba20ec 10.2.0 2016-04-20 11:29:48 +00:00
Sage Weil
9f77244b8e udev: remove 60-ceph-partuuid-workaround-rules
These were added to get /dev/disk/by-partuuid/ symlinks to work on
wheezy.  They are no longer needed for the supported distros (el7+,
jessie+, trusty+), and they apparently break dm by opening devices they
should not.

Fixes: http://tracker.ceph.com/issues/15516
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-18 09:16:02 -04:00
Sage Weil
0cdf3bc875 debian: start ceph-mon-all and ceph-osd-all on package install
This matches ceph-mds-all and ceph-all behavior.

Fixes: http://tracker.ceph.com/issues/15098
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-15 11:46:56 -04:00
Jenkins Build Slave User
4a2a6f7264 10.1.2 2016-04-12 17:42:56 +00:00
Sage Weil
4e2a29ad4e Merge remote-tracking branch 'gh/jewel' 2016-04-11 08:38:27 -04:00
Sage Weil
9414befb89 debian/rules: include ceph-mds-*.conf upstart files in ceph-mds
These were lost by a typo in 0cbe3dea69

Fixes: http://tracker.ceph.com/issues/15395
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-06 08:55:49 -04:00
Jenkins Build Slave User
ce50389b77 10.1.1 2016-04-06 00:45:19 +00:00
Dan Mick
a29b96ad3a debian/rules: put init-ceph in /etc/init.d/ceph, not ceph-base
When the package name changed from ceph to ceph-base, dh_installinit
started installing the init script into /etc/init.d/ceph-base.  Fix
this by using --name ceph with dh_installinit, which requires
1) naming the .init file ceph-base.ceph.init, and
2) calling dh_installinit separately for each package

Fixes: http://tracker.ceph.com/issues/15329
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2016-03-31 21:13:13 -07:00
Sage Weil
a0e5aa5c8a Merge remote-tracking branch 'gh/jewel' 2016-03-25 15:49:23 -04:00
Josh Durgin
20c86506ae Merge pull request #8224 from SUSE/wip-15212
rbdmap: add manpage

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-24 09:19:48 -07:00
Jenkins Build Slave User
96ae8bd25f 10.1.0 2016-03-24 10:53:48 +00:00
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
d01d983ad4 packaging: rbdmap manpage
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-23 15:05:16 +01:00
Yehuda Sadeh
5df0653723 Merge pull request #8225 from SUSE/wip-radosgw-description
packaging: align radosgw package description

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-21 13:41:28 -07: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
Jason Dillaman
f5375dcd1f packaging: added rbd-mirror startup scripts
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-18 17:53:06 -04:00
Sage Weil
7504dc266a Merge pull request #7930 from ceph/wip-debian-librgw-tests
debian: package librgw_file* tests
2016-03-17 17:58:58 -04:00
Sage Weil
5b18de23b5 Merge remote-tracking branch 'gh/wip-strict-debian-deps' 2016-03-17 17:53:23 -04:00
Ken Dreyer
5f3f37f9c0 packaging: move cephfs repair tools to ceph-common
The CephFS repair tools are generally useful to run on any node, not
just the MDS nodes themselves.

Move the utilities from the ceph-mds package to the ceph-common package.

Fixes: #15145
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-03-15 11:13:39 -06: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
96c1da9cd1 v10.0.5
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlbi+tkACgkQ2kQg7SiJlcjm4gCeJ5FdX6wYXP69g3yrY7wHRxtM
 TawAoMnRD5i0Ndz4cceCvcBMk64W7mQG
 =Ta2C
 -----END PGP SIGNATURE-----

Merge tag 'v10.0.5'

v10.0.5

Conflicts:
	debian/changelog
2016-03-11 12:07:55 -05:00
Sage Weil
5acb2655ec v10.0.5
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 12:05:13 -05:00
Dan Mick
10ca7f3efb debian/changelog: Remove stray 'v' in version
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 0f7730c8f4)
2016-03-11 11:57:56 -05: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
Matt Benjamin
2bb6ef9d84 rgw: ldap token glue
Based on feedback from upstream RGW, introduce a new json-format
token structure representing credentials for pass-through authentication
(e.g., LDAP without Keystone's digest authentication).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-03-09 10:54:35 -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