diff --git a/debian/ceph-base.dirs b/debian/ceph-base.dirs index 97d66adf00d..a60a331caac 100644 --- a/debian/ceph-base.dirs +++ b/debian/ceph-base.dirs @@ -1,5 +1,5 @@ -var/lib/ceph/tmp -var/lib/ceph/bootstrap-osd var/lib/ceph/bootstrap-mds -var/lib/ceph/bootstrap-rgw var/lib/ceph/bootstrap-mgr +var/lib/ceph/bootstrap-osd +var/lib/ceph/bootstrap-rgw +var/lib/ceph/tmp diff --git a/debian/ceph-base.install b/debian/ceph-base.install index 2a56cabee77..92af025a447 100644 --- a/debian/ceph-base.install +++ b/debian/ceph-base.install @@ -1,21 +1,21 @@ etc/init.d/ceph -usr/sbin/ceph-create-keys -usr/bin/ceph-detect-init usr/bin/ceph-debugpack +usr/bin/ceph-detect-init usr/bin/ceph-run usr/bin/crushtool usr/bin/monmaptool usr/bin/osdmaptool usr/lib/ceph/ceph_common.sh usr/lib/ceph/erasure-code/* +usr/lib/python*/dist-packages/ceph_detect_init* usr/lib/rados-classes/* +usr/sbin/ceph-create-keys usr/share/doc/ceph/sample.ceph.conf +usr/share/man/man8/ceph-create-keys.8 usr/share/man/man8/ceph-debugpack.8 usr/share/man/man8/ceph-deploy.8 +usr/share/man/man8/ceph-detect-init.8 usr/share/man/man8/ceph-run.8 usr/share/man/man8/crushtool.8 usr/share/man/man8/monmaptool.8 usr/share/man/man8/osdmaptool.8 -usr/lib/python*/dist-packages/ceph_detect_init* -usr/share/man/man8/ceph-detect-init.8 -usr/share/man/man8/ceph-create-keys.8 diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript index 9afaacbcae1..196dc084135 100644 --- a/debian/ceph-base.maintscript +++ b/debian/ceph-base.maintscript @@ -1,2 +1,2 @@ -rm_conffile /etc/logrotate.d/ceph.logrotate rm_conffile /etc/logrotate.d/ceph +rm_conffile /etc/logrotate.d/ceph.logrotate diff --git a/debian/ceph-common.dirs b/debian/ceph-common.dirs index a52e86d9727..ff05698c236 100644 --- a/debian/ceph-common.dirs +++ b/debian/ceph-common.dirs @@ -1,3 +1,3 @@ etc/ceph -var/log/ceph var/lib/ceph +var/log/ceph diff --git a/debian/ceph-fuse.install b/debian/ceph-fuse.install index 364e8639322..d6ad4dcb2a6 100644 --- a/debian/ceph-fuse.install +++ b/debian/ceph-fuse.install @@ -1,3 +1,3 @@ -usr/sbin/mount.fuse.ceph sbin usr/bin/ceph-fuse +usr/sbin/mount.fuse.ceph sbin usr/share/man/man8/ceph-fuse.8 diff --git a/debian/ceph-mon.install b/debian/ceph-mon.install index 9d08093f269..4fcee446efe 100644 --- a/debian/ceph-mon.install +++ b/debian/ceph-mon.install @@ -1,5 +1,5 @@ usr/bin/ceph-mon usr/bin/ceph-rest-api +usr/lib/python*/dist-packages/ceph_rest_api.py* usr/share/man/man8/ceph-mon.8 usr/share/man/man8/ceph-rest-api.8 -usr/lib/python*/dist-packages/ceph_rest_api.py* diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install index b1532d5e98d..b87ec1715b6 100644 --- a/debian/ceph-osd.install +++ b/debian/ceph-osd.install @@ -1,15 +1,15 @@ -lib/udev/rules.d/95-ceph-osd.rules lib/udev/rules.d/60-ceph-by-parttypeuuid.rules -usr/sbin/ceph-disk +lib/udev/rules.d/95-ceph-osd.rules +usr/bin/ceph-bluestore-tool usr/bin/ceph-clsinfo usr/bin/ceph-objectstore-tool -usr/bin/ceph-bluestore-tool -usr/bin/ceph_objectstore_bench usr/bin/ceph-osd +usr/bin/ceph_objectstore_bench usr/lib/ceph/ceph-osd-prestart.sh +usr/lib/libos_tp.so* +usr/lib/libosd_tp.so* +usr/lib/python*/dist-packages/ceph_disk* +usr/sbin/ceph-disk usr/share/man/man8/ceph-clsinfo.8 usr/share/man/man8/ceph-disk.8 usr/share/man/man8/ceph-osd.8 -usr/lib/python*/dist-packages/ceph_disk* -usr/lib/libosd_tp.so* -usr/lib/libos_tp.so* diff --git a/debian/ceph-test.install b/debian/ceph-test.install index 15b04664eaa..edd4cef00a0 100644 --- a/debian/ceph-test.install +++ b/debian/ceph-test.install @@ -1,15 +1,18 @@ usr/bin/ceph-client-debug usr/bin/ceph-coverage +usr/bin/ceph-kvstore-tool +usr/bin/ceph-monstore-tool +usr/bin/ceph-osdomap-tool usr/bin/ceph_bench_log -usr/bin/ceph_kvstorebench -usr/bin/ceph_multi_stress_watch usr/bin/ceph_erasure_code usr/bin/ceph_erasure_code_benchmark +usr/bin/ceph_kvstorebench +usr/bin/ceph_multi_stress_watch usr/bin/ceph_omapbench -usr/bin/ceph_perf_objectstore usr/bin/ceph_perf_local usr/bin/ceph_perf_msgr_client usr/bin/ceph_perf_msgr_server +usr/bin/ceph_perf_objectstore usr/bin/ceph_psim usr/bin/ceph_radosacl usr/bin/ceph_rgw_jsonparser @@ -23,8 +26,5 @@ usr/bin/ceph_smalliobenchrbd usr/bin/ceph_test_* usr/bin/ceph_tpbench usr/bin/ceph_xattr_bench -usr/bin/ceph-monstore-tool -usr/bin/ceph-osdomap-tool -usr/bin/ceph-kvstore-tool -usr/share/java/libcephfs-test.jar usr/lib/ceph/ceph-monstore-update-crush.sh +usr/share/java/libcephfs-test.jar diff --git a/debian/control b/debian/control index a9ce89021a3..4f77e3f4852 100644 --- a/debian/control +++ b/debian/control @@ -6,24 +6,24 @@ Vcs-Git: git://github.com/ceph/ceph.git Vcs-Browser: https://github.com/ceph/ceph Maintainer: Ceph Maintainers Uploaders: Ken Dreyer , - Alfredo Deza + Alfredo Deza , Build-Depends: bc, btrfs-tools, - gperf, - cmake, + cmake, cpio, - cryptsetup-bin | cryptsetup, + cryptsetup-bin | cryptsetup, cython, cython3, debhelper (>= 9), + default-jdk, dh-exec, dh-python, - dh-systemd, - default-jdk, + dh-systemd, + gdisk, git, - gdisk, + gperf, javahelper, - jq, + jq, junit4, libaio-dev, libbabeltrace-ctf-dev, @@ -33,47 +33,47 @@ Build-Depends: bc, libexpat1-dev, libfuse-dev, libgoogle-perftools-dev [i386 amd64 arm64], - libibverbs-dev, + libibverbs-dev, libkeyutils-dev, + libldap2-dev, libleveldb-dev, + liblttng-ust-dev, libnss3-dev, libsnappy-dev, - libldap2-dev, libssl-dev, - liblttng-ust-dev, libtool, libudev-dev, libxml2-dev, - lsb-release, + lsb-release, parted, pkg-config, python (>= 2.7), python-all-dev, python-cherrypy3, python-nose, - python-pecan, - python-prettytable, - python-setuptools, + python-pecan, + python-prettytable, + python-setuptools, python-sphinx, - python-werkzeug, + python-werkzeug, python3-all-dev, python3-setuptools, - virtualenv | python-virtualenv, uuid-runtime, valgrind, + virtualenv | python-virtualenv, xfslibs-dev, xfsprogs, xmlstarlet, yasm [amd64], - zlib1g-dev + zlib1g-dev, Standards-Version: 3.9.3 Package: ceph Architecture: linux-any -Depends: ceph-mon (= ${binary:Version}), - ceph-mgr (= ${binary:Version}), - ceph-osd (= ${binary:Version}) -Recommends: ceph-mds (= ${binary:Version}) +Depends: ceph-mgr (= ${binary:Version}), + ceph-mon (= ${binary:Version}), + ceph-osd (= ${binary:Version}), +Recommends: ceph-mds (= ${binary:Version}), Description: distributed storage and file system Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -90,20 +90,23 @@ Depends: binutils, grep, logrotate, psmisc, - ${python:Depends}, xfsprogs, ${misc:Depends}, - ${shlibs:Depends} + ${python:Depends}, + ${shlibs:Depends}, Recommends: btrfs-tools, ceph-mds (= ${binary:Version}), librados2 (= ${binary:Version}), libradosstriper1 (= ${binary:Version}), librbd1 (= ${binary:Version}), - ntp | time-daemon -Replaces: ceph-common (<< 0.78-500), python-ceph (<< 0.92-1223), - ceph-test (<< 0.94-1322), ceph (<< 10) -Breaks: python-ceph (<< 0.92-1223), ceph-test (<< 0.94-1322), - ceph (<< 10) + ntp | time-daemon, +Replaces: ceph (<< 10), + ceph-common (<< 0.78-500), + ceph-test (<< 0.94-1322), + python-ceph (<< 0.92-1223), +Breaks: ceph (<< 10), + ceph-test (<< 0.94-1322), + python-ceph (<< 0.92-1223), Description: common ceph daemon libraries and management tools Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -117,7 +120,8 @@ Package: ceph-base-dbg Architecture: linux-any Section: debug Priority: extra -Depends: ceph-base (= ${binary:Version}), ${misc:Depends} +Depends: ceph-base (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for ceph-base Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -133,11 +137,11 @@ Package: ceph-mds Architecture: linux-any Depends: ceph-base (= ${binary:Version}), ${misc:Depends}, - ${shlibs:Depends} + ${shlibs:Depends}, Recommends: ceph-fuse (= ${binary:Version}), - libcephfs2 (= ${binary:Version}) -Replaces: ceph (<< 0.93-417) -Breaks: ceph (<< 0.93-417) + libcephfs2 (= ${binary:Version}), +Replaces: ceph (<< 0.93-417), +Breaks: ceph (<< 0.93-417), Description: metadata server for the ceph distributed file system Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -150,7 +154,8 @@ Package: ceph-mds-dbg Architecture: linux-any Section: debug Priority: extra -Depends: ceph-mds (= ${binary:Version}), ${misc:Depends} +Depends: ceph-mds (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for ceph-mds Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -161,15 +166,15 @@ Description: debugging symbols for ceph-mds Package: ceph-mgr Architecture: linux-any Depends: ceph-base (= ${binary:Version}), + python-cherrypy3, python-openssl, python-pecan, python-werkzeug, ${misc:Depends}, ${python:Depends}, - python-cherrypy3, - ${shlibs:Depends} -Replaces: ceph (<< 0.93-417) -Breaks: ceph (<< 0.93-417) + ${shlibs:Depends}, +Replaces: ceph (<< 0.93-417), +Breaks: ceph (<< 0.93-417), Description: manager for the ceph distributed storage system Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -182,7 +187,8 @@ Package: ceph-mgr-dbg Architecture: linux-any Section: debug Priority: extra -Depends: ceph-mgr (= ${binary:Version}), ${misc:Depends} +Depends: ceph-mgr (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for ceph-mgr Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -195,10 +201,10 @@ Architecture: linux-any Depends: ceph-base (= ${binary:Version}), python-flask, ${misc:Depends}, - ${shlibs:Depends} -Recommends: ceph-common -Replaces: ceph (<< 10) -Breaks: ceph (<< 10) + ${shlibs:Depends}, +Recommends: ceph-common, +Replaces: ceph (<< 10), +Breaks: ceph (<< 10), Description: monitor server for the ceph storage system Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -213,7 +219,8 @@ Package: ceph-mon-dbg Architecture: linux-any Section: debug Priority: extra -Depends: ceph-mon (= ${binary:Version}), ${misc:Depends} +Depends: ceph-mon (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for ceph-mon Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -227,10 +234,10 @@ Depends: ceph-base (= ${binary:Version}), parted, ${misc:Depends}, ${python:Depends}, - ${shlibs:Depends} -Recommends: ceph-common (= ${binary:Version}) -Replaces: ceph (<< 10) -Breaks: ceph (<< 10) + ${shlibs:Depends}, +Recommends: ceph-common (= ${binary:Version}), +Replaces: ceph (<< 10), +Breaks: ceph (<< 10), Description: OSD server for the ceph storage system Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -244,7 +251,8 @@ Package: ceph-osd-dbg Architecture: linux-any Section: debug Priority: extra -Depends: ceph-osd (= ${binary:Version}), ${misc:Depends} +Depends: ceph-osd (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for ceph-osd Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -254,8 +262,9 @@ Description: debugging symbols for ceph-osd Package: ceph-fuse Architecture: linux-any -Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: fuse +Depends: ${misc:Depends}, + ${shlibs:Depends}, +Recommends: fuse, Description: FUSE-based client for the Ceph distributed file system Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -273,7 +282,8 @@ Package: ceph-fuse-dbg Architecture: linux-any Section: debug Priority: extra -Depends: ceph-fuse (= ${binary:Version}), ${misc:Depends} +Depends: ceph-fuse (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for ceph-fuse Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -285,8 +295,9 @@ Description: debugging symbols for ceph-fuse Package: rbd-fuse Architecture: linux-any -Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: fuse +Depends: ${misc:Depends}, + ${shlibs:Depends}, +Recommends: fuse, Description: FUSE-based rbd client for the Ceph distributed file system Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -299,7 +310,8 @@ Package: rbd-fuse-dbg Architecture: linux-any Section: debug Priority: extra -Depends: rbd-fuse (= ${binary:Version}), ${misc:Depends} +Depends: rbd-fuse (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for rbd-fuse Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -313,7 +325,7 @@ Architecture: linux-any Depends: ceph-common (= ${binary:Version}), librados2 (= ${binary:Version}), ${misc:Depends}, - ${shlibs:Depends} + ${shlibs:Depends}, Description: Ceph daemon for mirroring RBD images Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -325,7 +337,8 @@ Package: rbd-mirror-dbg Architecture: linux-any Section: debug Priority: extra -Depends: rbd-mirror (= ${binary:Version}), ${misc:Depends} +Depends: rbd-mirror (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for rbd-mirror Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -338,7 +351,7 @@ Description: debugging symbols for rbd-mirror Package: rbd-nbd Architecture: linux-any Depends: ${misc:Depends}, - ${shlibs:Depends} + ${shlibs:Depends}, Description: NBD-based rbd client for the Ceph distributed file system Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -353,7 +366,8 @@ Package: rbd-nbd-dbg Architecture: linux-any Section: debug Priority: extra -Depends: rbd-nbd (= ${binary:Version}), ${misc:Depends} +Depends: rbd-nbd (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for rbd-nbd Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -365,27 +379,30 @@ Description: debugging symbols for rbd-nbd Package: ceph-common Architecture: linux-any -Depends: librbd1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, - python-rados (= ${binary:Version}), +Depends: librbd1 (= ${binary:Version}), python-cephfs (= ${binary:Version}), + python-prettytable, + python-rados (= ${binary:Version}), python-rbd (= ${binary:Version}), + python-requests, python-rgw (= ${binary:Version}), + ${misc:Depends}, ${python:Depends}, - python-requests, - python-prettytable -Conflicts: ceph-client-tools -Replaces: ceph-client-tools, - ceph (<< 10), - ceph-test (<< 9.0.3-1646), - python-ceph (<< 0.92-1223), - librbd1 (<< 0.92-1238), - ceph-fs-common (<< 11.0) + ${shlibs:Depends}, +Conflicts: ceph-client-tools, +Replaces: ceph (<< 10), + ceph-client-tools, + ceph-fs-common (<< 11.0), + ceph-test (<< 9.0.3-1646), + librbd1 (<< 0.92-1238), + python-ceph (<< 0.92-1223), Breaks: ceph (<< 10), - ceph-test (<< 9.0.3-1646), - python-ceph (<< 0.92-1223), - librbd1 (<< 0.92-1238), - ceph-fs-common (<< 11.0) -Suggests: ceph-base (= ${binary:Version}), ceph-mds (= ${binary:Version}) + ceph-fs-common (<< 11.0), + ceph-test (<< 9.0.3-1646), + librbd1 (<< 0.92-1238), + python-ceph (<< 0.92-1223), +Suggests: ceph-base (= ${binary:Version}), + ceph-mds (= ${binary:Version}), Description: common utilities to mount and interact with a ceph storage cluster Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -394,11 +411,12 @@ Description: common utilities to mount and interact with a ceph storage cluster Package: ceph-common-dbg Architecture: linux-any -Depends: ceph-common (= ${binary:Version}), ${misc:Depends} -Conflicts: ceph-client-tools-dbg +Depends: ceph-common (= ${binary:Version}), + ${misc:Depends}, +Conflicts: ceph-client-tools-dbg, Replaces: ceph-client-tools-dbg, - ceph-test-dbg (<< 9.0.3-1646) -Breaks: ceph-test-dbg (<< 9.0.3-1646) + ceph-test-dbg (<< 9.0.3-1646), +Breaks: ceph-test-dbg (<< 9.0.3-1646), Section: debug Priority: extra Description: debugging symbols for ceph-common @@ -411,9 +429,11 @@ Description: debugging symbols for ceph-common Package: ceph-resource-agents Architecture: linux-any -Recommends: pacemaker +Recommends: pacemaker, Priority: extra -Depends: ceph (= ${binary:Version}), resource-agents, ${misc:Depends} +Depends: ceph (= ${binary:Version}), + resource-agents, + ${misc:Depends}, Description: OCF-compliant resource agents for Ceph Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -424,11 +444,14 @@ Description: OCF-compliant resource agents for Ceph such as Pacemaker. Package: librados2 -Conflicts: librados, librados1 -Replaces: librados, librados1 +Conflicts: librados, + librados1, +Replaces: librados, + librados1, Architecture: linux-any Section: libs -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends}, Description: RADOS distributed object store client library RADOS is a reliable, autonomic distributed object storage cluster developed as part of the Ceph distributed storage system. This is a @@ -436,12 +459,13 @@ Description: RADOS distributed object store client library store using a simple file-like interface. Package: librados2-dbg -Conflicts: librados1-dbg -Replaces: librados1-dbg +Conflicts: librados1-dbg, +Replaces: librados1-dbg, Architecture: linux-any Section: debug Priority: extra -Depends: librados2 (= ${binary:Version}), ${misc:Depends} +Depends: librados2 (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for librados RADOS is a reliable, autonomic distributed object storage cluster developed as part of the Ceph distributed storage system. This is a @@ -453,9 +477,13 @@ Description: debugging symbols for librados Package: librados-dev Architecture: linux-any Section: libdevel -Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Conflicts: librados1-dev, librados2-dev -Replaces: librados1-dev, librados2-dev +Depends: librados2 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Conflicts: librados1-dev, + librados2-dev, +Replaces: librados1-dev, + librados2-dev, Description: RADOS distributed object store client library (development files) RADOS is a reliable, autonomic distributed object storage cluster developed as part of the Ceph distributed storage system. This is a @@ -468,7 +496,9 @@ Description: RADOS distributed object store client library (development files) Package: libradosstriper1 Architecture: linux-any Section: libs -Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Depends: librados2 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, Description: RADOS striping interface Striping interface built on top of the rados library, allowing to stripe bigger objects onto several standard rados objects using @@ -478,7 +508,8 @@ Package: libradosstriper1-dbg Architecture: linux-any Section: debug Priority: extra -Depends: libradosstriper1 (= ${binary:Version}), ${misc:Depends} +Depends: libradosstriper1 (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for libradosstriper libradosstriper is a striping interface built on top of the rados library, allowing to stripe bigger objects onto several standard @@ -489,7 +520,8 @@ Description: debugging symbols for libradosstriper Package: libradosstriper-dev Architecture: linux-any Section: libdevel -Depends: libradosstriper1 (= ${binary:Version}), ${misc:Depends} +Depends: libradosstriper1 (= ${binary:Version}), + ${misc:Depends}, Description: RADOS striping interface (development files) libradosstriper is a striping interface built on top of the rados library, allowing to stripe bigger objects onto several standard @@ -501,7 +533,9 @@ Description: RADOS striping interface (development files) Package: librbd1 Architecture: linux-any Section: libs -Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Depends: librados2 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, Description: RADOS block device client library RBD is a block device striped across multiple distributed objects in RADOS, a reliable, autonomic distributed object storage cluster @@ -512,7 +546,8 @@ Package: librbd1-dbg Architecture: linux-any Section: debug Priority: extra -Depends: librbd1 (= ${binary:Version}), ${misc:Depends} +Depends: librbd1 (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for librbd1 RBD is a block device striped across multiple distributed objects in RADOS, a reliable, autonomic distributed object storage cluster @@ -525,9 +560,10 @@ Package: librbd-dev Architecture: linux-any Section: libdevel Depends: librados-dev (= ${binary:Version}), - librbd1 (= ${binary:Version}), ${misc:Depends} -Conflicts: librbd1-dev -Replaces: librbd1-dev + librbd1 (= ${binary:Version}), + ${misc:Depends}, +Conflicts: librbd1-dev, +Replaces: librbd1-dev, Description: RADOS block device client library (development files) RBD is a block device striped across multiple distributed objects in RADOS, a reliable, autonomic distributed object storage cluster @@ -538,11 +574,16 @@ Description: RADOS block device client library (development files) link against librbd1. Package: libcephfs2 -Conflicts: libceph, libceph1, libcephfs -Replaces: libceph, libceph1, libcephfs +Conflicts: libceph, + libceph1, + libcephfs, +Replaces: libceph, + libceph1, + libcephfs, Architecture: linux-any Section: libs -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends}, Description: Ceph distributed file system client library Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -554,9 +595,10 @@ Package: libcephfs2-dbg Architecture: linux-any Section: debug Priority: extra -Depends: libcephfs2 (= ${binary:Version}), ${misc:Depends} -Conflicts: libceph1-dbg -Replaces: libceph1-dbg +Depends: libcephfs2 (= ${binary:Version}), + ${misc:Depends}, +Conflicts: libceph1-dbg, +Replaces: libceph1-dbg, Description: debugging symbols for libcephfs2 Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -569,9 +611,14 @@ Description: debugging symbols for libcephfs2 Package: libcephfs-dev Architecture: linux-any Section: libdevel -Depends: libcephfs2 (= ${binary:Version}), ${misc:Depends} -Conflicts: libceph-dev, libceph1-dev, libcephfs2-dev -Replaces: libceph-dev, libceph1-dev, libcephfs2-dev +Depends: libcephfs2 (= ${binary:Version}), + ${misc:Depends}, +Conflicts: libceph-dev, + libceph1-dev, + libcephfs2-dev, +Replaces: libceph-dev, + libceph1-dev, + libcephfs2-dev, Description: Ceph distributed file system client library (development files) Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -585,7 +632,9 @@ Description: Ceph distributed file system client library (development files) Package: librgw2 Architecture: linux-any Section: libs -Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Depends: librados2 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, Description: RADOS Gateway client library RADOS is a distributed object store used by the Ceph distributed storage system. This package provides a REST gateway to the @@ -598,7 +647,8 @@ Package: librgw2-dbg Architecture: linux-any Section: debug Priority: extra -Depends: librgw2 (= ${binary:Version}), ${misc:Depends} +Depends: librgw2 (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for librbd1 RADOS is a distributed object store used by the Ceph distributed storage system. This package provides a REST gateway to the @@ -611,7 +661,8 @@ Package: librgw-dev Architecture: linux-any Section: libdevel Depends: librados-dev (= ${binary:Version}), - librgw2 (= ${binary:Version}), ${misc:Depends} + librgw2 (= ${binary:Version}), + ${misc:Depends}, Description: RADOS client library (development files) RADOS is a distributed object store used by the Ceph distributed storage system. This package provides a REST gateway to the @@ -624,11 +675,11 @@ Description: RADOS client library (development files) Package: radosgw Architecture: linux-any Depends: ceph-common (= ${binary:Version}), - mime-support, librgw2 (= ${binary:Version}), + mime-support, ${misc:Depends}, - ${shlibs:Depends} -Recommends: ntp | time-daemon + ${shlibs:Depends}, +Recommends: ntp | time-daemon, Description: REST gateway for RADOS distributed object store RADOS is a distributed object store used by the Ceph distributed storage system. This package provides a REST gateway to the @@ -641,7 +692,8 @@ Package: radosgw-dbg Architecture: linux-any Section: debug Priority: extra -Depends: radosgw (= ${binary:Version}), ${misc:Depends} +Depends: radosgw (= ${binary:Version}), + ${misc:Depends}, Description: debugging symbols for radosgw RADOS is a distributed object store used by the Ceph distributed storage system. This package provides a REST gateway to the @@ -652,7 +704,12 @@ Description: debugging symbols for radosgw Package: ceph-test Architecture: linux-any -Depends: ceph-common, curl, xmlstarlet, jq, ${misc:Depends}, ${shlibs:Depends} +Depends: ceph-common, + curl, + jq, + xmlstarlet, + ${misc:Depends}, + ${shlibs:Depends}, Description: Ceph test and benchmarking tools This package contains tools for testing and benchmarking Ceph. @@ -660,9 +717,10 @@ Package: ceph-test-dbg Architecture: linux-any Section: debug Priority: extra -Depends: ceph-test (= ${binary:Version}), ceph-common (= ${binary:Version}), +Depends: ceph-common (= ${binary:Version}), + ceph-test (= ${binary:Version}), curl, - ${misc:Depends} + ${misc:Depends}, Description: Ceph test and benchmarking tools . This package contains the debugging symbols for ceph-test. @@ -670,10 +728,10 @@ Description: Ceph test and benchmarking tools Package: python-ceph Architecture: linux-any Section: python -Depends: python-rados (= ${binary:Version}), +Depends: python-cephfs (= ${binary:Version}), + python-rados (= ${binary:Version}), python-rbd (= ${binary:Version}), python-rgw (= ${binary:Version}), - python-cephfs (= ${binary:Version}) Description: Meta-package for python libraries for the Ceph libraries Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -686,10 +744,10 @@ Architecture: linux-any Section: python Depends: librados2 (= ${binary:Version}), ${misc:Depends}, + ${python:Depends}, ${shlibs:Depends}, - ${python:Depends} -Replaces: python-ceph (<< 0.92-1223) -Breaks: python-ceph (<< 0.92-1223) +Replaces: python-ceph (<< 0.92-1223), +Breaks: python-ceph (<< 0.92-1223), Description: Python 2 libraries for the Ceph librados library Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -703,8 +761,8 @@ Architecture: linux-any Section: python Depends: librados2 (= ${binary:Version}), ${misc:Depends}, + ${python3:Depends}, ${shlibs:Depends}, - ${python3:Depends} Description: Python 3 libraries for the Ceph librados library Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -718,10 +776,10 @@ Architecture: linux-any Section: python Depends: librbd1 (>= ${binary:Version}), ${misc:Depends}, + ${python:Depends}, ${shlibs:Depends}, - ${python:Depends} -Replaces: python-ceph (<< 0.92-1223) -Breaks: python-ceph (<< 0.92-1223) +Replaces: python-ceph (<< 0.92-1223), +Breaks: python-ceph (<< 0.92-1223), Description: Python 2 libraries for the Ceph librbd library Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -735,8 +793,8 @@ Architecture: linux-any Section: python Depends: librbd1 (>= ${binary:Version}), ${misc:Depends}, + ${python3:Depends}, ${shlibs:Depends}, - ${python3:Depends} Description: Python 3 libraries for the Ceph librbd library Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -750,10 +808,10 @@ Architecture: linux-any Section: python Depends: librgw2 (>= ${binary:Version}), ${misc:Depends}, + ${python:Depends}, ${shlibs:Depends}, - ${python:Depends} -Replaces: python-ceph (<< 0.92-1223) -Breaks: python-ceph (<< 0.92-1223) +Replaces: python-ceph (<< 0.92-1223), +Breaks: python-ceph (<< 0.92-1223), Description: Python 2 libraries for the Ceph librgw library Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -767,8 +825,8 @@ Architecture: linux-any Section: python Depends: librgw2 (>= ${binary:Version}), ${misc:Depends}, + ${python3:Depends}, ${shlibs:Depends}, - ${python3:Depends} Description: Python 3 libraries for the Ceph librgw library Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -782,10 +840,10 @@ Architecture: linux-any Section: python Depends: libcephfs2 (= ${binary:Version}), ${misc:Depends}, + ${python:Depends}, ${shlibs:Depends}, - ${python:Depends} -Replaces: python-ceph (<< 0.92-1223) -Breaks: python-ceph (<< 0.92-1223) +Replaces: python-ceph (<< 0.92-1223), +Breaks: python-ceph (<< 0.92-1223), Description: Python 2 libraries for the Ceph libcephfs library Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -799,8 +857,8 @@ Architecture: linux-any Section: python Depends: libcephfs2 (= ${binary:Version}), ${misc:Depends}, + ${python3:Depends}, ${shlibs:Depends}, - ${python3:Depends} Description: Python 3 libraries for the Ceph libcephfs library Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -812,7 +870,8 @@ Description: Python 3 libraries for the Ceph libcephfs library Package: python3-ceph-argparse Architecture: linux-any Section: python -Depends: ${misc:Depends}, ${python3:Depends} +Depends: ${misc:Depends}, + ${python3:Depends}, Description: Python 3 utility libraries for Ceph CLI Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, @@ -824,20 +883,24 @@ Description: Python 3 utility libraries for Ceph CLI Package: libcephfs-java Section: java Architecture: all -Depends: libcephfs-jni (= ${binary:Version}), ${java:Depends}, ${misc:Depends} +Depends: libcephfs-jni (= ${binary:Version}), + ${java:Depends}, + ${misc:Depends}, Description: Java libraries for the Ceph File System Package: libcephfs-jni Architecture: linux-any Section: java -Depends: libcephfs2 (= ${binary:Version}), ${java:Depends}, - ${misc:Depends}, ${shlibs:Depends} +Depends: libcephfs2 (= ${binary:Version}), + ${java:Depends}, + ${misc:Depends}, + ${shlibs:Depends}, Description: Java Native Interface library for CephFS Java bindings Package: rados-objclass-dev Architecture: linux-any Section: libdevel -Depends: librados-dev (= ${binary:Version}) ${misc:Depends} +Depends: librados-dev (= ${binary:Version}) ${misc:Depends}, Description: RADOS object class development kit. . This package contains development files needed for building RADOS object class plugins. diff --git a/debian/copyright b/debian/copyright index 362ae78f291..994d676073a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -38,25 +38,25 @@ Copyright: Copyright 2012-2013 Intel Corporation All Rights Reserved. License: BSD 3-clause -Files: src/common/sctp_crc32.c: +Files: src/common/sctp_crc32.c: Copyright: Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved. Copyright (c) 2004-2006 Intel Corporation - All Rights Reserved License: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + a) Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + b) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + c) Neither the name of Cisco Systems, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -110,19 +110,19 @@ License: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + - Neither the name of the University of Tennessee nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR diff --git a/debian/libcephfs-dev.install b/debian/libcephfs-dev.install index d2d648719fd..e2cf6e9f375 100644 --- a/debian/libcephfs-dev.install +++ b/debian/libcephfs-dev.install @@ -1,3 +1,3 @@ -usr/include/cephfs/libcephfs.h usr/include/cephfs/ceph_statx.h +usr/include/cephfs/libcephfs.h usr/lib/libcephfs.so diff --git a/debian/libcephfs2.install b/debian/libcephfs2.install index f1b4adf056b..b7c0eb0581e 100644 --- a/debian/libcephfs2.install +++ b/debian/libcephfs2.install @@ -1,2 +1 @@ - usr/lib/libcephfs.so.* diff --git a/debian/librados-dev.install b/debian/librados-dev.install index ec6b4332a14..19ce3914fbd 100644 --- a/debian/librados-dev.install +++ b/debian/librados-dev.install @@ -2,13 +2,13 @@ usr/bin/librados-config usr/include/rados/buffer.h usr/include/rados/buffer_fwd.h usr/include/rados/crc32c.h +usr/include/rados/inline_memory.h usr/include/rados/librados.h usr/include/rados/librados.hpp -usr/include/rados/inline_memory.h +usr/include/rados/memory.h usr/include/rados/page.h usr/include/rados/rados_types.h usr/include/rados/rados_types.hpp -usr/include/rados/memory.h usr/lib/librados.so usr/lib/librados_tp.so usr/share/man/man8/librados-config.8 diff --git a/debian/librados2.install b/debian/librados2.install index 722bf58048d..3bdeedfd183 100644 --- a/debian/librados2.install +++ b/debian/librados2.install @@ -1,3 +1,3 @@ +usr/lib/ceph/libceph-common.so* usr/lib/librados.so.* usr/lib/librados_tp.so.* -usr/lib/ceph/libceph-common.so* diff --git a/debian/libradosstriper1.install b/debian/libradosstriper1.install index 0adecb52589..46235acff31 100644 --- a/debian/libradosstriper1.install +++ b/debian/libradosstriper1.install @@ -1,2 +1 @@ - usr/lib/libradosstriper.so.* diff --git a/debian/python-cephfs.install b/debian/python-cephfs.install index ed18d2e7e7d..d8a283424ff 100644 --- a/debian/python-cephfs.install +++ b/debian/python-cephfs.install @@ -1,3 +1,3 @@ usr/lib/python2*/dist-packages/ceph_volume_client.py* -usr/lib/python2*/dist-packages/cephfs.so usr/lib/python2*/dist-packages/cephfs-*.egg-info +usr/lib/python2*/dist-packages/cephfs.so diff --git a/debian/python-rados.install b/debian/python-rados.install index 64379a78aa2..0519518e4cd 100644 --- a/debian/python-rados.install +++ b/debian/python-rados.install @@ -1,2 +1,2 @@ -usr/lib/python2*/dist-packages/rados.so usr/lib/python2*/dist-packages/rados-*.egg-info +usr/lib/python2*/dist-packages/rados.so diff --git a/debian/python-rbd.install b/debian/python-rbd.install index 57051ff12b4..4a170ce5616 100644 --- a/debian/python-rbd.install +++ b/debian/python-rbd.install @@ -1,2 +1,2 @@ -usr/lib/python2*/dist-packages/rbd.so usr/lib/python2*/dist-packages/rbd-*.egg-info +usr/lib/python2*/dist-packages/rbd.so diff --git a/debian/python-rgw.install b/debian/python-rgw.install index 15e1f49215b..05e6936c06b 100644 --- a/debian/python-rgw.install +++ b/debian/python-rgw.install @@ -1,2 +1,2 @@ -usr/lib/python2*/dist-packages/rgw.so usr/lib/python2*/dist-packages/rgw-*.egg-info +usr/lib/python2*/dist-packages/rgw.so diff --git a/debian/python3-cephfs.install b/debian/python3-cephfs.install index 8d07200da62..6eb8836707f 100644 --- a/debian/python3-cephfs.install +++ b/debian/python3-cephfs.install @@ -1,3 +1,3 @@ usr/lib/python3*/dist-packages/ceph_volume_client.py -usr/lib/python3*/dist-packages/cephfs.cpython*.so usr/lib/python3*/dist-packages/cephfs-*.egg-info +usr/lib/python3*/dist-packages/cephfs.cpython*.so diff --git a/debian/python3-rados.install b/debian/python3-rados.install index 5622ac0e4b6..98b5d76cbe7 100644 --- a/debian/python3-rados.install +++ b/debian/python3-rados.install @@ -1,2 +1,2 @@ -usr/lib/python3*/dist-packages/rados.cpython*.so usr/lib/python3*/dist-packages/rados-*.egg-info +usr/lib/python3*/dist-packages/rados.cpython*.so diff --git a/debian/python3-rbd.install b/debian/python3-rbd.install index c721ca25a17..5f4e6e143e8 100644 --- a/debian/python3-rbd.install +++ b/debian/python3-rbd.install @@ -1,2 +1,2 @@ -usr/lib/python3*/dist-packages/rbd.cpython*.so usr/lib/python3*/dist-packages/rbd-*.egg-info +usr/lib/python3*/dist-packages/rbd.cpython*.so diff --git a/debian/python3-rgw.install b/debian/python3-rgw.install index 4131a2ce5dc..57f45590771 100644 --- a/debian/python3-rgw.install +++ b/debian/python3-rgw.install @@ -1,2 +1,2 @@ -usr/lib/python3*/dist-packages/rgw.cpython*.so usr/lib/python3*/dist-packages/rgw-*.egg-info +usr/lib/python3*/dist-packages/rgw.cpython*.so diff --git a/debian/radosgw.install b/debian/radosgw.install index 9f2c8debb32..d583799299c 100644 --- a/debian/radosgw.install +++ b/debian/radosgw.install @@ -1,5 +1,5 @@ usr/bin/radosgw -usr/bin/radosgw-token usr/bin/radosgw-es usr/bin/radosgw-object-expirer +usr/bin/radosgw-token usr/share/man/man8/radosgw.8