[Pkg-ceph-commits] [ceph] 05/05: - d/*: Sync relevant packaging changes from upstream. - d/p/*: Drop upstreamed patches. - d/p/modules.patch: Mark libcls_user.so and libec_jerasure.so as modules. - d/ceph.install: Only install libec_jerasure.so.

[James Downing Page]

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

jamespage pushed a commit to branch experimental
in repository ceph.

commit 53aa9255c21754062e4d9cd7f74dd4780576661e
Author: James Page <jamespage at debian.org>
Date:   Tue Mar 18 18:27:25 2014 +0000

      - d/*: Sync relevant packaging changes from upstream.
      - d/p/*: Drop upstreamed patches.
      - d/p/modules.patch: Mark libcls_user.so and libec_jerasure.so as modules.
      - d/ceph.install: Only install libec_jerasure.so.
---
 debian/ceph-common.install   |  1 +
 debian/ceph-test.install     |  2 ++
 debian/ceph.install          |  1 +
 debian/changelog             |  5 ++++-
 debian/control               |  4 +++-
 debian/librados-dev.install  |  1 +
 debian/patches/modules.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 debian/radosgw.dirs          |  1 +
 debian/rules                 |  4 ++--
 10 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index 18c0d22..e341a06 100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -3,6 +3,7 @@ etc/bash_completion.d/rbd
 usr/bin/ceph
 usr/bin/ceph-authtool
 usr/bin/ceph-conf
+usr/bin/ceph-crush-location
 usr/bin/ceph-dencoder
 usr/bin/ceph-post-file
 usr/bin/ceph-rest-api
diff --git a/debian/ceph-test.install b/debian/ceph-test.install
index aab9ae4..471b75e 100644
--- a/debian/ceph-test.install
+++ b/debian/ceph-test.install
@@ -4,6 +4,7 @@ usr/bin/ceph-monstore-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_dupstore /usr/lib/ceph/bin
+usr/bin/ceph_erasure_code_benchmark /usr/lib/ceph/bin
 usr/bin/ceph_filestore_dump /usr/lib/ceph/bin
 usr/bin/ceph_filestore_tool /usr/lib/ceph/bin
 usr/bin/ceph_kvstorebench /usr/lib/ceph/bin
@@ -63,6 +64,7 @@ usr/bin/ceph_test_rados_api_misc /usr/lib/ceph/bin
 usr/bin/ceph_test_rados_api_pool /usr/lib/ceph/bin
 usr/bin/ceph_test_rados_api_snapshots /usr/lib/ceph/bin
 usr/bin/ceph_test_rados_api_stat /usr/lib/ceph/bin
+usr/bin/ceph_test_rados_api_tier /usr/lib/ceph/bin
 usr/bin/ceph_test_rados_api_watch_notify /usr/lib/ceph/bin
 usr/bin/ceph_test_rados_delete_pools_parallel /usr/lib/ceph/bin
 usr/bin/ceph_test_rados_list_parallel /usr/lib/ceph/bin
diff --git a/debian/ceph.install b/debian/ceph.install
index cad69ad..79a197d 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -13,6 +13,7 @@ usr/bin/crushtool
 usr/bin/monmaptool
 usr/bin/osdmaptool
 usr/lib/*/ceph/ceph_common.sh
+usr/lib/*/ceph/erasure-code/libec_jerasure.so
 usr/lib/*/rados-classes/*.so
 usr/sbin/ceph-create-keys
 usr/sbin/ceph-disk
diff --git a/debian/changelog b/debian/changelog
index 896efeb..092451f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 ceph (0.77-1) UNRELEASED; urgency=medium
 
   * New upstream release:
-    - d/patches/*: Drop upstreamed patches.
+    - d/*: Sync relevant packaging changes from upstream.
+    - d/p/*: Drop upstreamed patches.
+    - d/p/modules.patch: Mark libcls_user.so and libec_jerasure.so as modules.
+    - d/ceph.install: Only install libec_jerasure.so.
   * d/ceph-test.install: Install test binaries to /usr/lib/ceph/bin; they
     really don't need to be installed on the default path.
 
diff --git a/debian/control b/debian/control
index cbce948..3338fed 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 9~),
                junit4,
                libaio-dev,
                libatomic-ops-dev,
+               libblkid-dev (>= 2.17),
                libboost-dev (>= 1.42),
                libboost-program-options-dev (>= 1.42),
                libboost-system-dev (>= 1.42),
@@ -24,7 +25,7 @@ Build-Depends: debhelper (>= 9~),
                libexpat1-dev,
                libfcgi-dev,
                libfuse-dev,
-               libgoogle-perftools-dev [i386 amd64 powerpc armhf],
+               libgoogle-perftools-dev [i386 amd64 powerpc armhf ppc64el],
                libkeyutils-dev,
                libleveldb-dev,
                libnss3-dev,
@@ -36,6 +37,7 @@ Build-Depends: debhelper (>= 9~),
                python-all (>= 2.6.6-3~),
                python-nose,
                uuid-dev,
+               uuid-runtime,
                yasm
 Build-Conflicts: libcrypto++-dev
 Standards-Version: 3.9.4
diff --git a/debian/librados-dev.install b/debian/librados-dev.install
index 1907b5f..cc8a7c0 100644
--- a/debian/librados-dev.install
+++ b/debian/librados-dev.install
@@ -3,6 +3,7 @@ usr/include/rados/buffer.h
 usr/include/rados/crc32c.h
 usr/include/rados/librados.h
 usr/include/rados/librados.hpp
+usr/include/rados/memory.h
 usr/include/rados/page.h
 usr/include/rados/rados_types.h
 usr/include/rados/rados_types.hpp
diff --git a/debian/patches/modules.patch b/debian/patches/modules.patch
new file mode 100644
index 0000000..ce3f759
--- /dev/null
+++ b/debian/patches/modules.patch
@@ -0,0 +1,26 @@
+Description: Mark modules as actually being modules
+Author: James Page <james.page at ubuntu.com>
+Forwarded: no
+
+--- a/src/cls/Makefile.am
++++ b/src/cls/Makefile.am
+@@ -45,7 +45,7 @@ radoslib_LTLIBRARIES += libcls_replica_l
+ 
+ libcls_user_la_SOURCES = cls/user/cls_user.cc
+ libcls_user_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
+-libcls_user_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
++libcls_user_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
+ radoslib_LTLIBRARIES += libcls_user.la
+ 
+ libcls_rgw_la_SOURCES = \
+--- a/src/osd/ErasureCodePluginJerasure/Makefile.am
++++ b/src/osd/ErasureCodePluginJerasure/Makefile.am
+@@ -20,7 +20,7 @@ noinst_HEADERS += \
+ libec_jerasure_la_CFLAGS = ${AM_CFLAGS} 
+ libec_jerasure_la_CXXFLAGS= ${AM_CXXFLAGS} 
+ libec_jerasure_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
++libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+ if LINUX
+ libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
diff --git a/debian/patches/series b/debian/patches/series
index 2ede999..8e560e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 virtualenv-never-download
+modules.patch
diff --git a/debian/radosgw.dirs b/debian/radosgw.dirs
index effc250..f54add5 100644
--- a/debian/radosgw.dirs
+++ b/debian/radosgw.dirs
@@ -1,2 +1,3 @@
 var/log/ceph
+var/log/radosgw
 var/lib/ceph/radosgw
diff --git a/debian/rules b/debian/rules
index 0275e33..ebbd899 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ ifeq ($(DEB_HOST_ARCH), armel)
 endif
 
 # Only selected architectures support gperftools
-gperftools_archs = i386 amd64 powerpc armhf
+gperftools_archs = i386 amd64 powerpc armhf ppc64el
 ifneq (,$(filter $(DEB_HOST_ARCH), $(gperftools_archs)))
   extraopts += --with-tcmalloc
 else
@@ -59,7 +59,7 @@ 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 \
+	for conf in `ls -1 src/upstart/ceph*.conf src/upstart/rbdmap.conf | grep -v mds`; do \
         name=`basename $$conf | cut -d . -f 1`; \
         cp $$conf debian/ceph.$$name.upstart; \
         dh_installinit -pceph --no-start --name=$$name; \

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