[Pkg-ceph-commits] [ceph] 03/04: - d/p/modules.patch: Refresh. - d/ceph.install: Install all jerasure modules.

[James Downing Page]

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

jamespage pushed a commit to branch ubuntu
in repository ceph.

commit d44afe762e2d3e4ae1831ce1aaeeaa36b69ca068
Author: James Page <jamespage at debian.org>
Date:   Tue Apr 8 12:43:59 2014 +0100

    - d/p/modules.patch: Refresh.
    - d/ceph.install: Install all jerasure modules.
---
 debian/ceph.install                      |  2 +-
 debian/changelog                         |  4 +++-
 debian/patches/modules.patch             | 35 ++++++++++++++++++++++++++++----
 debian/patches/virtualenv-never-download |  4 ++--
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/debian/ceph.install b/debian/ceph.install
index 79a197d..198ec6e 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -13,7 +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/*/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 4d0c618..bed8bdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ceph (0.79-0ubuntu1) UNRELEASED; urgency=medium
 
-  * New upstream release (LP: #1278466).
+  * New upstream release (LP: #1278466):
+    - d/p/modules.patch: Refresh.
+    - d/ceph.install: Install all jerasure modules.
 
  -- James Page <james.page at ubuntu.com>  Tue, 08 Apr 2014 09:05:52 +0100
 
diff --git a/debian/patches/modules.patch b/debian/patches/modules.patch
index c803d42..3f1dcf5 100644
--- a/debian/patches/modules.patch
+++ b/debian/patches/modules.patch
@@ -15,12 +15,39 @@ Forwarded: no
  libcls_rgw_la_SOURCES = \
 --- a/src/erasure-code/jerasure/Makefile.am
 +++ b/src/erasure-code/jerasure/Makefile.am
-@@ -20,7 +20,7 @@ noinst_HEADERS += \
+@@ -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
+ 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
+ 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
+ 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_CXXFLAGS= ${AM_CXXFLAGS}
  libec_jerasure_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
-+libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+-libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
++libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version
  if LINUX
  libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
  endif
diff --git a/debian/patches/virtualenv-never-download b/debian/patches/virtualenv-never-download
index f1bad25..b95e96f 100644
--- a/debian/patches/virtualenv-never-download
+++ b/debian/patches/virtualenv-never-download
@@ -3,8 +3,8 @@ Author: Bastian Blank <waldi at debian.org>
 Origin: vendor
 Forwarded: no
 ---
---- ceph-0.67.2.orig/src/test/run-cli-tests
-+++ ceph-0.67.2/src/test/run-cli-tests
+--- a/src/test/run-cli-tests
++++ b/src/test/run-cli-tests
 @@ -30,7 +30,7 @@ if [ ! -e "$CRAM_BIN" ]; then
      # patched cram to support that. See upstream ticket at
      # https://bitbucket.org/brodie/cram/issue/9/allow-read-only-directories-for-t

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