[Pkg-ceph-commits] [ceph] 01/01: d/p/modules.patch, d/ceph.install: Mark all jerasure plugins as modules and ensure they are all installed.

[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 8d2f02199201c6ddf9046c37894f4625f06a5364
Author: James Page <james.page at ubuntu.com>
Date:   Wed Apr 9 11:32:24 2014 +0100

    d/p/modules.patch,d/ceph.install: Mark all jerasure plugins as modules and ensure they are all installed.
---
 debian/ceph.install          |  2 +-
 debian/changelog             |  7 +++++++
 debian/patches/modules.patch | 40 +++++++++++++++++++++++++++++++---------
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/debian/ceph.install b/debian/ceph.install
index 10d6700..c43c4b9 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -14,7 +14,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/*/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 28a6ab3..5acbf5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ceph (0.79-2) UNRELEASED; urgency=medium
+
+  * d/p/modules.patch,d/ceph.install: Mark all jerasure plugins as modules
+    and ensure they are all installed.
+
+ -- James Page <james.page at ubuntu.com>  Wed, 09 Apr 2014 11:25:34 +0100
+
 ceph (0.79-1) experimental; urgency=low
 
   * New upstream release [April 2014].
diff --git a/debian/patches/modules.patch b/debian/patches/modules.patch
index 76b479f..b786693 100644
--- a/debian/patches/modules.patch
+++ b/debian/patches/modules.patch
@@ -1,12 +1,10 @@
-Last-Update: 2014-04-08
-Forwarded: no
-Author: James Page <james.page at ubuntu.com>
 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
-@@ -44,9 +44,9 @@
- radoslib_LTLIBRARIES += libcls_replica_log.la
+@@ -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)
@@ -15,11 +13,36 @@ Description: Mark modules as actually being modules
  radoslib_LTLIBRARIES += libcls_user.la
  
  libcls_rgw_la_SOURCES = \
- 	cls/rgw/cls_rgw.cc \
 --- a/src/erasure-code/jerasure/Makefile.am
 +++ b/src/erasure-code/jerasure/Makefile.am
-@@ -101,9 +101,9 @@
- 	erasure-code/jerasure/ErasureCodePluginSelectJerasure.cc
+@@ -40,7 +40,7 @@ libec_jerasure_generic_la_CXXFLAGS= ${AM
+ 	-Ierasure-code/jerasure/gf-complete/include \
+ 	-Ierasure-code/jerasure/jerasure/include
+ libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
++libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+ if LINUX
+ libec_jerasure_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+@@ -63,7 +63,7 @@ libec_jerasure_sse3_la_CXXFLAGS= ${AM_CX
+ 	-Ierasure-code/jerasure/gf-complete/include \
+ 	-Ierasure-code/jerasure/jerasure/include
+ libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
++libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+ if LINUX
+ libec_jerasure_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+@@ -90,7 +90,7 @@ libec_jerasure_sse4_la_CXXFLAGS= ${AM_CX
+ 	-Ierasure-code/jerasure/gf-complete/include \
+ 	-Ierasure-code/jerasure/jerasure/include
+ libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
++libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+ if LINUX
+ libec_jerasure_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+@@ -102,7 +102,7 @@ libec_jerasure_la_SOURCES = \
  libec_jerasure_la_CFLAGS = ${AM_CFLAGS} 
  libec_jerasure_la_CXXFLAGS= ${AM_CXXFLAGS}
  libec_jerasure_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
@@ -28,4 +51,3 @@ Description: Mark modules as actually being modules
  if LINUX
  libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
  endif
- 

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