[Pkg-ceph-commits] [ceph] 01/02: Resync packaging changes with upstream.
James Downing Page
jamespage at moszumanska.debian.org
Mon Nov 16 15:57:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch experimental
in repository ceph.
commit df85c355e4af77a5875a8141c17a4277544a65ab
Author: James Page <james.page at ubuntu.com>
Date: Mon Nov 16 10:30:28 2015 +0000
Resync packaging changes with upstream.
---
debian/ceph-common.install | 5 ++--
debian/ceph-mds.install | 2 +-
debian/ceph-mds.postinst | 6 ++++
debian/ceph-test.install | 5 ++--
debian/ceph.dirs | 4 +--
debian/ceph.install | 23 ++++++++-------
debian/ceph.postinst | 8 ++++++
debian/control | 72 ++++++++++++++++++++++------------------------
debian/librados2.install | 1 +
debian/librbd1.install | 1 +
debian/radosgw.dirs | 2 --
debian/radosgw.install | 1 +
debian/radosgw.postinst | 6 ++++
debian/rules | 31 ++++++++++++++++++--
14 files changed, 105 insertions(+), 62 deletions(-)
diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index c9a75b9..96bafda 100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -1,5 +1,6 @@
etc/bash_completion.d/rados
etc/bash_completion.d/rbd
+src/rbdmap etc/ceph
udev/50-rbd.rules /lib/udev/rules.d
usr/bin/ceph
usr/bin/ceph-authtool
@@ -8,10 +9,10 @@ usr/bin/ceph-crush-location
usr/bin/ceph-dencoder
usr/bin/ceph-post-file
usr/bin/ceph-rbdnamer
-usr/bin/ceph-rest-api
usr/bin/ceph-syn
usr/bin/rados
usr/bin/rbd
+usr/bin/rbd-replay*
usr/lib/python*/dist-packages/ceph_argparse.py*
usr/share/ceph/id_dsa_drop.ceph.com
usr/share/ceph/id_dsa_drop.ceph.com.pub
@@ -21,8 +22,8 @@ usr/share/man/man8/ceph-conf.8
usr/share/man/man8/ceph-dencoder.8
usr/share/man/man8/ceph-post-file.8
usr/share/man/man8/ceph-rbdnamer.8
-usr/share/man/man8/ceph-rest-api.8
usr/share/man/man8/ceph-syn.8
usr/share/man/man8/ceph.8
usr/share/man/man8/rados.8
+usr/share/man/man8/rbd-replay*.8
usr/share/man/man8/rbd.8
diff --git a/debian/ceph-mds.install b/debian/ceph-mds.install
index f393838..ea3dae6 100644
--- a/debian/ceph-mds.install
+++ b/debian/ceph-mds.install
@@ -1,5 +1,5 @@
-debian/lib-systemd/system/ceph-mds.service /lib/systemd/system/
usr/bin/ceph-mds
+usr/bin/cephfs-data-scan
usr/bin/cephfs-journal-tool
usr/bin/cephfs-table-tool
usr/share/man/man8/ceph-mds.8
diff --git a/debian/ceph-mds.postinst b/debian/ceph-mds.postinst
index 5001fa9..e1eb035 100644
--- a/debian/ceph-mds.postinst
+++ b/debian/ceph-mds.postinst
@@ -18,6 +18,9 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
+[ -f "/etc/default/ceph" ] && . /etc/default/ceph
+[ -z "$SERVER_USER" ] && SERVER_USER=ceph
+[ -z "$SERVER_GROUP" ] && SERVER_GROUP=ceph
case "$1" in
configure)
@@ -29,6 +32,9 @@ case "$1" in
fi
}
fi
+ if ! dpkg-statoverride --list /var/lib/ceph/mds >/dev/null
+ chown $SERVER_USER:$SERVER_GROUP /var/lib/ceph/mds
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
:
diff --git a/debian/ceph-test.install b/debian/ceph-test.install
index ff32269..2559eff 100644
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@ -1,7 +1,6 @@
usr/bin/ceph-coverage /usr/lib/ceph/bin
usr/bin/ceph-kvstore-tool /usr/lib/ceph/bin
usr/bin/ceph-monstore-tool /usr/lib/ceph/bin
-usr/bin/ceph-objectstore-tool /usr/lib/ceph/bin
usr/bin/ceph-osdomap-tool /usr/lib/ceph/bin
usr/bin/ceph_bench_log /usr/lib/ceph/bin
usr/bin/ceph_erasure_code /usr/lib/ceph/bin
@@ -9,6 +8,7 @@ usr/bin/ceph_erasure_code_benchmark /usr/lib/ceph/bin
usr/bin/ceph_kvstorebench /usr/lib/ceph/bin
usr/bin/ceph_multi_stress_watch /usr/lib/ceph/bin
usr/bin/ceph_omapbench /usr/lib/ceph/bin
+usr/bin/ceph_perf_* /usr/lib/ceph/bin
usr/bin/ceph_psim /usr/lib/ceph/bin
usr/bin/ceph_radosacl /usr/lib/ceph/bin
usr/bin/ceph_rgw_jsonparser /usr/lib/ceph/bin
@@ -23,6 +23,5 @@ usr/bin/ceph_streamtest /usr/lib/ceph/bin
usr/bin/ceph_test_* /usr/lib/ceph/bin
usr/bin/ceph_tpbench /usr/lib/ceph/bin
usr/bin/ceph_xattr_bench /usr/lib/ceph/bin
-usr/bin/rbd-replay* /usr/lib/ceph/bin
+usr/lib/ceph/ceph-monstore-update-crush.sh
usr/share/java/libcephfs-test.jar
-usr/share/man/man8/rbd-replay*.8
diff --git a/debian/ceph.dirs b/debian/ceph.dirs
index c8999fd..b948689 100644
--- a/debian/ceph.dirs
+++ b/debian/ceph.dirs
@@ -1,8 +1,6 @@
-etc/ceph
var/lib/ceph/bootstrap-mds
var/lib/ceph/bootstrap-osd
-var/lib/ceph/mds
+var/lib/ceph/bootstrap-rgw
var/lib/ceph/mon
var/lib/ceph/osd
var/lib/ceph/tmp
-var/log/ceph
diff --git a/debian/ceph.install b/debian/ceph.install
index 664f4e8..93a33be 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -1,17 +1,15 @@
## install from source tree
debian/etc/pm/sleep.d/* /etc/pm/sleep.d/
-debian/lib-systemd/system-sleep/* /lib/systemd/system-sleep/
-debian/lib-systemd/system/ceph-create-keys.service /lib/systemd/system/
-debian/lib-systemd/system/ceph-mon.service /lib/systemd/system/
-debian/lib-systemd/system/ceph-osd at .service /lib/systemd/system/
etc/bash_completion.d/ceph
-src/rbdmap /etc/ceph
-udev/60-ceph-partuuid-workaround.rules /lib/udev/rules.d
-udev/95-ceph-osd.rules /lib/udev/rules.d
+udev/60-ceph-partuuid-workaround.rules lib/udev/rules.d
+udev/95-ceph-osd.rules lib/udev/rules.d
usr/bin/ceph-clsinfo
usr/bin/ceph-debugpack
+usr/bin/ceph-detect-init
usr/bin/ceph-mon
+usr/bin/ceph-objectstore-tool
usr/bin/ceph-osd
+usr/bin/ceph-rest-api
usr/bin/ceph-run
usr/bin/crushtool
usr/bin/monmaptool
@@ -19,19 +17,24 @@ usr/bin/osdmaptool
usr/lib/*/ceph/ceph-osd-prestart.sh /usr/lib/ceph/
usr/lib/*/ceph/ceph_common.sh
usr/lib/*/ceph/erasure-code/libec_*.so
+usr/lib/*/libos_tp.so.*
+usr/lib/*/libosd_tp.so.*
usr/lib/*/rados-classes/*.so
+usr/lib/python*/dist-packages/ceph_daemon.py*
+usr/lib/python*/dist-packages/ceph_detect_init*
+usr/lib/python*/dist-packages/ceph_rest_api.py
usr/sbin/ceph-create-keys
usr/sbin/ceph-disk
-usr/sbin/ceph-disk-activate
-usr/sbin/ceph-disk-prepare
usr/share/doc/ceph/sample.ceph.conf
usr/share/doc/ceph/sample.fetch_config
usr/share/man/man8/ceph-clsinfo.8
+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-disk.8
usr/share/man/man8/ceph-mon.8
usr/share/man/man8/ceph-osd.8
+usr/share/man/man8/ceph-rest-api.8
usr/share/man/man8/ceph-run.8
usr/share/man/man8/crushtool.8
usr/share/man/man8/monmaptool.8
diff --git a/debian/ceph.postinst b/debian/ceph.postinst
index 8292e64..cc3712a 100644
--- a/debian/ceph.postinst
+++ b/debian/ceph.postinst
@@ -24,6 +24,9 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
+[ -f "/etc/default/ceph" ] && . /etc/default/ceph
+[ -z "$SERVER_USER" ] && SERVER_USER=ceph
+[ -z "$SERVER_GROUP" ] && SERVER_GROUP=ceph
case "$1" in
configure)
@@ -36,6 +39,11 @@ case "$1" in
fi
}
fi
+ for DIR in /var/lib/ceph/* ; do
+ if ! dpkg-statoverride --list $DIR >/dev/null
+ chown $SERVER_USER:$SERVER_GROUP $DIR
+ fi
+ done
;;
abort-upgrade|abort-remove|abort-deconfigure)
:
diff --git a/debian/control b/debian/control
index 06330f6..307802a 100644
--- a/debian/control
+++ b/debian/control
@@ -20,10 +20,12 @@ Build-Depends: debhelper (>= 9~),
libbabeltrace-ctf-dev,
libbabeltrace-dev,
libblkid-dev,
- libboost-dev,
- libboost-program-options-dev,
- libboost-system-dev,
- libboost-thread-dev,
+ libboost-dev (>= 1.42),
+ libboost-program-options-dev (>= 1.42),
+ libboost-random-dev,
+ libboost-regex-dev,
+ libboost-system-dev (>= 1.42),
+ libboost-thread-dev (>= 1.42),
libbz2-dev,
libcurl4-gnutls-dev,
libedit-dev,
@@ -34,7 +36,6 @@ Build-Depends: debhelper (>= 9~),
libkeyutils-dev,
libleveldb-dev,
libnss3-dev,
- libs3-dev,
libsnappy-dev,
libtool,
libudev-dev,
@@ -47,6 +48,8 @@ Build-Depends: debhelper (>= 9~),
valgrind [amd64 armhf i386 powerpc],
virtualenv,
xfslibs-dev,
+ xfsprogs,
+ xmlstarlet,
yasm [amd64],
zlib1g-dev
Build-Conflicts: libcrypto++-dev
@@ -69,15 +72,17 @@ Depends: binutils,
${python:Depends},
${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Breaks: python-ceph (<< 0.94.1-1~)
-Conflicts: gceph, librgw-dev, librgw1, librgw1-dbg, obsync
-Replaces: gceph,
- librgw-dev,
- librgw1,
- librgw1-dbg,
- obsync,
+Breaks: ceph-common (<< 9.2.0-1~),
+ ceph-test (<< 9.2.0-1~),
+ python-ceph (<< 0.94.1-1~)
+Replaces: ceph-common (<< 9.2.0-1~),
+ ceph-test (<< 9.2.0-1~),
python-ceph (<< 0.94.1-1~)
-Recommends: libcephfs1, librados2, librbd1, ntp | time-daemon | chrony
+Recommends: libcephfs1,
+ librados2,
+ libradosstriper1,
+ librbd1,
+ ntp | time-daemon | chrony
Suggests: logrotate
Description: distributed storage and file system
Ceph is a distributed storage system designed to provide excellent
@@ -93,8 +98,8 @@ Architecture: linux-any
Section: debug
Priority: extra
Depends: ceph (= ${binary:Version}), ${misc:Depends}
-Conflicts: gceph-dbg
-Replaces: gceph-dbg
+Replaces: ceph-test-dbg (<< 9.2.0-1~)
+Breaks: ceph-test-dbg (<< 9.2.0-1~)
Description: debugging symbols for ceph
Ceph is a distributed storage system designed to provide excellent
performance, reliability, and scalability.
@@ -113,10 +118,12 @@ Depends: librbd1 (= ${binary:Version}),
${shlibs:Depends}
Conflicts: ceph-client-tools
Breaks: ceph (<< 0.93-0ubuntu3~),
+ ceph-test (<< 9.2.0-1~),
librbd1 (<< 0.94.1-1~),
python-ceph (<< 0.94.1-1~)
Replaces: ceph (<< 0.93-0ubuntu3~),
ceph-client-tools,
+ ceph-test (<< 9.2.0-1~),
librbd1 (<< 0.94.1-1~),
python-ceph (<< 0.94.1-1~)
Suggests: ceph, ceph-mds
@@ -257,8 +264,8 @@ Description: OCF-compliant resource agents for Ceph
Package: librados2
Architecture: linux-any
Section: libs
-Conflicts: libcrush, libcrush1, librados, librados1
-Replaces: libcrush, libcrush1, librados, librados1
+Conflicts: librados, librados1
+Replaces: librados, librados1
Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: RADOS distributed object store client library
@@ -271,8 +278,8 @@ Package: librados2-dbg
Architecture: linux-any
Section: debug
Priority: extra
-Conflicts: libcrush1-dbg, librados1-dbg
-Replaces: libcrush1-dbg, librados1-dbg
+Conflicts: librados1-dbg
+Replaces: librados1-dbg
Depends: librados2 (= ${binary:Version}), ${misc:Depends}
Description: debugging symbols for librados2
RADOS is a reliable, autonomic distributed object storage cluster
@@ -286,8 +293,8 @@ Package: librados-dev
Architecture: linux-any
Section: libdevel
Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libcrush-dev, libcrush1-dev, librados1-dev, librados2-dev
-Replaces: libcrush-dev, libcrush1-dev, librados1-dev, librados2-dev
+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
@@ -437,25 +444,14 @@ Description: debugging symbols for radosgw
.
This package contains debugging symbols for radosgw.
-Package: rest-bench
-Architecture: linux-any
-Depends: ceph-common, curl, xml2, ${misc:Depends}, ${shlibs:Depends}
-Description: RESTful bencher that can be used to benchmark radosgw performance
- Simple tool to benchmark radosgw (or S3) (based on 'rados-bench' command).
-
-Package: rest-bench-dbg
-Architecture: linux-any
-Section: debug
-Priority: extra
-Depends: rest-bench (= ${binary:Version}), ${misc:Depends}
-Description: debugging symbols for rest-bench
- Simple tool to benchmark radosgw (or S3) (based on 'rados-bench' command).
- .
- This package contains the debugging symbols for rest-bench.
-
Package: ceph-test
Architecture: linux-any
-Depends: ceph-common, curl, xml2, ${misc:Depends}, ${shlibs:Depends}
+Depends: ceph-common,
+ curl,
+ xml2,
+ xmlstarlet,
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Ceph test and benchmarking tools
Ceph is a distributed storage system designed to provide excellent
performance, reliability, and scalability.
diff --git a/debian/librados2.install b/debian/librados2.install
index a96bdb2..51ef81d 100644
--- a/debian/librados2.install
+++ b/debian/librados2.install
@@ -1 +1,2 @@
usr/lib/*/librados.so.*
+usr/lib/*/librados_tp.so.*
diff --git a/debian/librbd1.install b/debian/librbd1.install
index decadbc..525af7b 100644
--- a/debian/librbd1.install
+++ b/debian/librbd1.install
@@ -1 +1,2 @@
usr/lib/*/librbd.so.*
+usr/lib/*/librbd_tp.so.
diff --git a/debian/radosgw.dirs b/debian/radosgw.dirs
index b99cc97..a2f1849 100644
--- a/debian/radosgw.dirs
+++ b/debian/radosgw.dirs
@@ -1,3 +1 @@
var/lib/ceph/radosgw
-var/log/ceph
-var/log/radosgw
diff --git a/debian/radosgw.install b/debian/radosgw.install
index 1ed620e..25f0cdd 100644
--- a/debian/radosgw.install
+++ b/debian/radosgw.install
@@ -1,5 +1,6 @@
etc/bash_completion.d/radosgw-admin
usr/bin/radosgw
usr/bin/radosgw-admin
+usr/bin/radosgw-object-expirer
usr/share/man/man8/radosgw-admin.8
usr/share/man/man8/radosgw.8
diff --git a/debian/radosgw.postinst b/debian/radosgw.postinst
index ec8d86a..b886c05 100644
--- a/debian/radosgw.postinst
+++ b/debian/radosgw.postinst
@@ -24,6 +24,9 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
+[ -f "/etc/default/ceph" ] && . /etc/default/ceph
+[ -z "$SERVER_USER" ] && SERVER_USER=ceph
+[ -z "$SERVER_GROUP" ] && SERVER_GROUP=ceph
case "$1" in
configure)
@@ -35,6 +38,9 @@ case "$1" in
fi
}
fi
+ if ! dpkg-statoverride --list /var/lib/ceph/radosgw >/dev/null; then
+ chown $SERVER_USER:$SERVER_GROUP /var/lib/ceph/radosgw
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
:
diff --git a/debian/rules b/debian/rules
index 6310c47..ec80857 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java
export JAVAC=javac
extraopts += --disable-silent-rules
-extraopts += --with-ocf --with-rest-bench --with-nss
+extraopts += --with-ocf --with-nss
extraopts += --with-debug
extraopts += --enable-cephfs-java
extraopts += --with-babeltrace
@@ -85,6 +85,33 @@ override_dh_installinit:
cp -v $$conf debian/radosgw.$$name.upstart; \
dh_installinit -pradosgw --no-start --name=$$name; \
done
+ # install the systemd stuff manually since we have funny service names
+ # and need to update the paths in all of the files post install
+ # systemd:ceph-common
+ install -d -m0755 debian/ceph-common/lib/systemd/system
+ install -m0644 systemd/ceph.target debian/ceph-common/lib/systemd/system
+ install -d -m0755 debian/ceph-common/etc/default/ceph
+ install -m0644 etc/default/ceph debian/ceph-common/etc/default/ceph
+ install -d -m0755 debian/ceph-common/usr/lib/tmpfiles.d
+ install -m 0644 -D systemd/ceph.tmpfiles.d debian/ceph-common/usr/lib/tmpfiles.d/ceph.conf
+ # systemd:ceph
+ install -d -m0755 debian/ceph/lib/systemd/system
+ install -m0644 systemd/ceph-mon at .service debian/ceph/lib/systemd/system
+ install -m0644 systemd/ceph-create-keys at .service debian/ceph/lib/systemd/system
+ install -m0644 systemd/ceph-osd at .service debian/ceph/lib/systemd/system
+ install -m0644 systemd/ceph-disk at .service debian/ceph/lib/systemd/system
+ sed -i s./etc/sysconfig/./etc/default/.g debian/ceph/lib/systemd/system/ceph-mon at .service
+ sed -i s./etc/sysconfig/./etc/default/.g debian/ceph/lib/systemd/system/ceph-create-keys at .service
+ sed -i s./etc/sysconfig/./etc/default/.g debian/ceph/lib/systemd/system/ceph-osd at .service
+ sed -i s./etc/sysconfig/./etc/default/.g debian/ceph/lib/systemd/system/ceph-disk at .service
+ # systemd:ceph-mds
+ install -d -m0755 debian/ceph-mds/lib/systemd/system
+ install -m0644 systemd/ceph-mds at .service debian/ceph-mds/lib/systemd/system
+ sed -i s./etc/sysconfig/./etc/default/.g debian/ceph-mds/lib/systemd/system/ceph-mds at .service
+ # systemd:radosgw
+ install -d -m0755 debian/radosgw/lib/systemd/system
+ install -m0644 systemd/ceph-radosgw at .service debian/radosgw/lib/systemd/system
+ sed -i s./etc/sysconfig/./etc/default/.g debian/radosgw/lib/systemd/system/ceph-radosgw at .service
override_dh_systemd_enable:
## Do not enable services to match `dh_installinit --no-start`
@@ -104,9 +131,7 @@ override_dh_strip:
dh_strip -plibrbd1 --dbg-package=librbd1-dbg
dh_strip -plibcephfs1 --dbg-package=libcephfs1-dbg
dh_strip -pradosgw --dbg-package=radosgw-dbg
- dh_strip -prest-bench --dbg-package=rest-bench-dbg
dh_strip -pceph-test --dbg-package=ceph-test-dbg
- dh_strip -plibrados-dev
dh_strip -plibcephfs-jni --dbg-package=libcephfs-jni-dbg
override_dh_makeshlibs:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list