[Pkg-ceph-commits] [ceph] 03/09: d/ceph.install, rules: Install rbdmap init file using dh_installinit. Refresh patches.

James Downing Page jamespage at moszumanska.debian.org
Fri Nov 22 14:01:40 UTC 2013 

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch master
in repository ceph.

commit 3c11354898d02117602b9e3c050bb41496a177d2
Author: James Page <james.page at ubuntu.com>
Date:   Fri Nov 22 09:38:52 2013 +0000

    d/ceph.install,rules: Install rbdmap init file using dh_installinit.
    Refresh patches.
---
 debian/ceph.install       |    1 -
 debian/changelog          |    2 ++
 debian/patches/make-clean |    6 ++--
 debian/patches/modules    |   74 +++++++++++++++++----------------------------
 debian/rules              |    6 ++--
 5 files changed, 37 insertions(+), 52 deletions(-)

diff --git a/debian/ceph.install b/debian/ceph.install
index 6d7e524..ba9ce3f 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -2,7 +2,6 @@
 ../../udev/60-ceph-partuuid-workaround.rules lib/udev/rules.d
 ../../udev/95-ceph-osd.rules lib/udev/rules.d
 etc/bash_completion.d/ceph
-etc/init.d/rbdmap
 sbin/mkcephfs
 sbin/ceph-create-keys
 sbin/ceph-disk
diff --git a/debian/changelog b/debian/changelog
index dce0ca4..66abdf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ ceph (0.72.1-1) UNRELEASED; urgency=low
     - d/ceph.install: Tweaked install path /usr/sbin -> /sbin.
     - d/control: Add new BD's on python-nose and yasm.
     - d/copyright: Add updates inline with upstream packaging.
+    - d/ceph.install,rules: Install rbdmap init file using dh_installinit.
+    - Refresh patches.
 
  -- James Page <james.page at ubuntu.com>  Fri, 22 Nov 2013 09:19:58 +0000
 
diff --git a/debian/patches/make-clean b/debian/patches/make-clean
index 7cd9d66..2df0516 100644
--- a/debian/patches/make-clean
+++ b/debian/patches/make-clean
@@ -5,13 +5,13 @@ Forwarded: no
 ---
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1453,7 +1453,8 @@
- 
+@@ -308,7 +308,8 @@ ceph: ceph.in ./ceph_ver.h Makefile
  # cleaning
+ 
  clean-local:
 -	-rm *.so *.gcno *.gcda
 +	rm -f *.so *.gcno *.gcda
 +	rm -f ceph java/java/com/ceph/crush/Bucket.class
  
- # libs
  
+ # pybind
diff --git a/debian/patches/modules b/debian/patches/modules
index 652f431..4b24869 100644
--- a/debian/patches/modules
+++ b/debian/patches/modules
@@ -3,86 +3,68 @@ Author: Bastian Blank <waldi at debian.org>
 Origin: vendor
 Forwarded: no
 ---
---- ceph-0.67.2.orig/src/Makefile.am
-+++ ceph-0.67.2/src/Makefile.am
-@@ -536,7 +536,7 @@ libcls_rbd_la_SOURCES = cls/rbd/cls_rbd.
- libcls_rbd_la_CFLAGS = ${AM_CFLAGS}
- libcls_rbd_la_CXXFLAGS= ${AM_CXXFLAGS}
+--- a/src/cls/Makefile.am
++++ b/src/cls/Makefile.am
+@@ -2,17 +2,17 @@
+ 
+ libcls_hello_la_SOURCES = cls/hello/cls_hello.cc
+ libcls_hello_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
+-libcls_hello_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
++libcls_hello_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
+ radoslib_LTLIBRARIES += libcls_hello.la
+ 
+ libcls_rbd_la_SOURCES = cls/rbd/cls_rbd.cc
  libcls_rbd_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
 -libcls_rbd_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
 +libcls_rbd_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
+ radoslib_LTLIBRARIES += libcls_rbd.la
  
- radoslibdir = $(libdir)/rados-classes
- radoslib_LTLIBRARIES = libcls_rbd.la
-@@ -547,7 +547,7 @@ libcls_lock_la_SOURCES = cls/lock/cls_lo
- libcls_lock_la_CFLAGS = ${AM_CFLAGS}
- libcls_lock_la_CXXFLAGS= ${AM_CXXFLAGS}
+ libcls_lock_la_SOURCES = cls/lock/cls_lock.cc
  libcls_lock_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
 -libcls_lock_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
 +libcls_lock_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- 
  radoslib_LTLIBRARIES += libcls_lock.la
  
-@@ -562,7 +562,7 @@ libcls_refcount_la_SOURCES = \
- libcls_refcount_la_CFLAGS = ${AM_CFLAGS}
- libcls_refcount_la_CXXFLAGS= ${AM_CXXFLAGS}
- libcls_refcount_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
+ libcls_refcount_la_SOURCES = \
+@@ -20,27 +20,27 @@ libcls_refcount_la_SOURCES = \
+ 	cls/refcount/cls_refcount_ops.cc \
+ 	common/ceph_json.cc 
+ libcls_refcount_la_LIBADD = libjson_spirit.la $(PTHREAD_LIBS) $(EXTRALIBS)
 -libcls_refcount_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
 +libcls_refcount_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- 
  radoslib_LTLIBRARIES += libcls_refcount.la
  
-@@ -571,7 +571,7 @@ libcls_version_la_SOURCES = cls/version/
- libcls_version_la_CFLAGS = ${AM_CFLAGS}
- libcls_version_la_CXXFLAGS= ${AM_CXXFLAGS}
+ libcls_version_la_SOURCES = cls/version/cls_version.cc
  libcls_version_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
 -libcls_version_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
 +libcls_version_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- 
  radoslib_LTLIBRARIES += libcls_version.la
  
-@@ -580,7 +580,7 @@ libcls_log_la_SOURCES = cls/log/cls_log.
- libcls_log_la_CFLAGS = ${AM_CFLAGS}
- libcls_log_la_CXXFLAGS= ${AM_CXXFLAGS}
+ libcls_log_la_SOURCES = cls/log/cls_log.cc
  libcls_log_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
 -libcls_log_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
 +libcls_log_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- 
  radoslib_LTLIBRARIES += libcls_log.la
  
-@@ -588,7 +588,7 @@ libcls_statelog_la_SOURCES = cls/statelo
- libcls_statelog_la_CFLAGS = ${AM_CFLAGS}
- libcls_statelog_la_CXXFLAGS= ${AM_CXXFLAGS}
+ libcls_statelog_la_SOURCES = cls/statelog/cls_statelog.cc
  libcls_statelog_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
 -libcls_statelog_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
 +libcls_statelog_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- 
  radoslib_LTLIBRARIES += libcls_statelog.la
  
-@@ -597,7 +597,7 @@ libcls_replica_log_la_SOURCES = cls/repl
- libcls_replica_log_la_CFLAGS = ${AM_CFLAGS}
- libcls_replica_log_la_CXXFLAGS= ${AM_CXXFLAGS}
+ libcls_replica_log_la_SOURCES = cls/replica_log/cls_replica_log.cc
  libcls_replica_log_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
 -libcls_replica_log_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
 +libcls_replica_log_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- 
  radoslib_LTLIBRARIES += libcls_replica_log.la
  
-@@ -613,7 +613,7 @@ libcls_rgw_la_SOURCES = \
- libcls_rgw_la_CFLAGS = ${AM_CFLAGS}
- libcls_rgw_la_CXXFLAGS= ${AM_CXXFLAGS}
- libcls_rgw_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
+ libcls_rgw_la_SOURCES = \
+@@ -49,7 +49,7 @@ libcls_rgw_la_SOURCES = \
+ 	cls/rgw/cls_rgw_types.cc \
+ 	common/ceph_json.cc
+ libcls_rgw_la_LIBADD = libjson_spirit.la $(PTHREAD_LIBS) $(EXTRALIBS)
 -libcls_rgw_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
 +libcls_rgw_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- 
  radoslib_LTLIBRARIES += libcls_rgw.la
  
-@@ -688,7 +688,7 @@ libcls_kvs_la_SOURCES = key_value_store/
- libcls_kvs_la_CFLAGS = ${AM_CFLAGS}
- libcls_kvs_la_CXXFLAGS= ${AM_CXXFLAGS}
- libcls_kvs_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
--libcls_kvs_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
-+libcls_kvs_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- 
- radoslib_LTLIBRARIES += libcls_kvs.la
- 
+ ## Rados object client classes
diff --git a/debian/rules b/debian/rules
index 5c3acc3..5931fd0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,20 +42,22 @@ override_dh_auto_build:
 	dh_auto_build
 	cp src/init-ceph debian/ceph.init
 	cp src/init-radosgw debian/radosgw.init
+	cp src/init-rbdmap debian/ceph.rbdmap.init
 	cp src/logrotate.conf debian/ceph.logrotate
 	cp src/rgw/logrotate.conf debian/radosgw.logrotate
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -f debian/ceph.init debian/radosgw.init debian/ceph.logrotate debian/radosgw.logrotate
+	rm -f debian/ceph.init debian/radosgw.init debian/ceph.rbdmap.init
+	rm -f debian/ceph.logrotate debian/radosgw.logrotate
 	rm -f debian/*.upstart
 
 override_dh_auto_install:
 	dh_auto_install
-	install -D -m 755 src/init-rbdmap $(DESTDIR)/etc/init.d/rbdmap
 
 override_dh_installinit:
 	dh_installinit --no-start
+	dh_installinit -pceph --no-start --name=rbdmap
 	# Install upstart configurations using dh_installinit
 	for conf in `ls -1 src/upstart/ceph*.conf | grep -v mds`; do \
         name=`basename $$conf | cut -d . -f 1`; \

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git

More information about the Pkg-ceph-commits mailing list