[Pkg-ceph-commits] [ceph] 01/01: new patch to use system libjerasure

Tue Dec 9 13:24:53 UTC 2014

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

onlyjob pushed a commit to branch master
in repository ceph.

commit d625e8b (HEAD, master)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Tue Dec 9 10:30:56 2014

    new patch to use system libjerasure
---
 debian/control                           |   1 +
 debian/copyright                         |   2 +
 debian/patches/backfill-prio.patch       |  10 +--
 debian/patches/series                    |   1 +
 debian/patches/use_system_jerasure.patch | 117 +++++++++++++++++++++++++++++++
 5 files changed, 126 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 4d6a1ab..a8bb46b 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Build-Depends: debhelper (>= 9~),
                libfcgi-dev,
                libfuse-dev,
                libgoogle-perftools-dev [i386 amd64 powerpc armhf ppc64el],
+               libjerasure-dev,
                libkeyutils-dev,
                libleveldb-dev,
                libnss3-dev,
diff --git a/debian/copyright b/debian/copyright
index da07f5f..87363b9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ceph
 Upstream-Contact: Sage Weil <sage at newdream.net>
 Source: http://ceph.com/
+Files-Excluded: src/erasure-code/jerasure/gf-complete
+                src/erasure-code/jerasure/jerasure
 
 Files: *
 Copyright: 2004-2013 Sage Weil <sage at newdream.net>
diff --git a/debian/patches/backfill-prio.patch b/debian/patches/backfill-prio.patch
index c163aeb..4e1034f 100644
--- a/debian/patches/backfill-prio.patch
+++ b/debian/patches/backfill-prio.patch
@@ -151,7 +151,7 @@ Date:   Tue Jun 24 02:09:49 2014
  
 --- a/src/osd/PG.cc
 +++ b/src/osd/PG.cc
-@@ -1885,8 +1885,28 @@
+@@ -1884,8 +1884,28 @@
  
    dirty_info = true;
  }
@@ -180,7 +180,7 @@ Date:   Tue Jun 24 02:09:49 2014
  {
    dout(10) << "finish_recovery" << dendl;
    assert(info.last_complete == info.last_update);
-@@ -5852,15 +5872,14 @@
+@@ -5851,15 +5871,14 @@
      ConnectionRef con = pg->osd->get_con_osd_cluster(
        backfill_osd_it->osd, pg->get_osdmap()->get_epoch());
      if (con) {
@@ -198,7 +198,7 @@ Date:   Tue Jun 24 02:09:49 2014
        } else {
          post_event(RemoteBackfillReserved());
        }
-@@ -5927,10 +5946,10 @@
+@@ -5926,10 +5945,10 @@
    pg->osd->local_reserver.request_reservation(
      pg->info.pgid,
      new QueuePeeringEvt<LocalBackfillReserved>(
@@ -211,7 +211,7 @@ Date:   Tue Jun 24 02:09:49 2014
  
  void PG::RecoveryState::WaitLocalBackfillReserved::exit()
  {
-@@ -5995,9 +6014,10 @@
+@@ -5994,9 +6013,10 @@
    pg->osd->remote_reserver.request_reservation(
      pg->info.pgid,
      new QueuePeeringEvt<RemoteRecoveryReserved>(
@@ -223,7 +223,7 @@ Date:   Tue Jun 24 02:09:49 2014
  
  boost::statechart::result
  PG::RecoveryState::RepWaitRecoveryReserved::react(const RemoteRecoveryReserved &evt)
-@@ -6136,9 +6156,10 @@
+@@ -6135,9 +6155,10 @@
    pg->osd->local_reserver.request_reservation(
      pg->info.pgid,
      new QueuePeeringEvt<LocalRecoveryReserved>(
diff --git a/debian/patches/series b/debian/patches/series
index 6c2bef9..8625fda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,4 +20,5 @@ rbdmap3-lazyumount.patch
 arch.patch
 modules.patch
 sample.ceph.conf.patch
+use_system_jerasure.patch
 virtualenv-never-download.patch
diff --git a/debian/patches/use_system_jerasure.patch b/debian/patches/use_system_jerasure.patch
new file mode 100644
index 0000000..7541443
--- /dev/null
+++ b/debian/patches/use_system_jerasure.patch
@@ -0,0 +1,117 @@
+Last-Update: 2014-12-09
+Forwarded: not-needed
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: use system "libjerasure" instead of bundled one.
+
+--- a/src/erasure-code/jerasure/Makefile.am
++++ b/src/erasure-code/jerasure/Makefile.am
+@@ -1,47 +1,19 @@
+ # jerasure plugin
+ noinst_HEADERS += \
+-  erasure-code/jerasure/jerasure/include/cauchy.h \
+-  erasure-code/jerasure/jerasure/include/galois.h \
+-  erasure-code/jerasure/jerasure/include/jerasure.h \
+-  erasure-code/jerasure/jerasure/include/liberation.h \
+-  erasure-code/jerasure/jerasure/include/reed_sol.h \
+-  erasure-code/jerasure/gf-complete/include/gf_int.h \
+-  erasure-code/jerasure/gf-complete/include/gf_complete.h \
+-  erasure-code/jerasure/gf-complete/include/gf_rand.h \
+-  erasure-code/jerasure/gf-complete/include/gf_method.h \
+-  erasure-code/jerasure/gf-complete/include/gf_general.h \
+   erasure-code/jerasure/ErasureCodeJerasure.h
+ 
+ jerasure_sources = \
+-  erasure-code/jerasure/jerasure/src/cauchy.c \
+-  erasure-code/jerasure/jerasure/src/galois.c \
+-  erasure-code/jerasure/jerasure/src/jerasure.c \
+-  erasure-code/jerasure/jerasure/src/liberation.c \
+-  erasure-code/jerasure/jerasure/src/reed_sol.c \
+-  erasure-code/jerasure/gf-complete/src/gf_wgen.c \
+-  erasure-code/jerasure/gf-complete/src/gf_method.c \
+-  erasure-code/jerasure/gf-complete/src/gf_w16.c \
+-  erasure-code/jerasure/gf-complete/src/gf.c \
+-  erasure-code/jerasure/gf-complete/src/gf_w32.c \
+-  erasure-code/jerasure/gf-complete/src/gf_w64.c \
+-  erasure-code/jerasure/gf-complete/src/gf_w128.c \
+-  erasure-code/jerasure/gf-complete/src/gf_general.c \
+-  erasure-code/jerasure/gf-complete/src/gf_w4.c \
+-  erasure-code/jerasure/gf-complete/src/gf_rand.c \
+-  erasure-code/jerasure/gf-complete/src/gf_w8.c \
+   erasure-code/jerasure/ErasureCodePluginJerasure.cc \
+   erasure-code/jerasure/ErasureCodeJerasure.cc
+ 
+ libec_jerasure_generic_la_SOURCES = ${jerasure_sources}
+ libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS}  \
+-	-Ierasure-code/jerasure/gf-complete/include \
+-	-Ierasure-code/jerasure/jerasure/include
++	-I$(includedir)/jerasure
+ libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \
+-	-Ierasure-code/jerasure/gf-complete/include \
+-	-Ierasure-code/jerasure/jerasure/include
++	-I$(includedir)/jerasure
+ libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
++libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
+ if LINUX
+ libec_jerasure_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+ 
+@@ -52,19 +24,17 @@
+ 	${INTEL_SSE_FLAGS} \
+ 	${INTEL_SSE2_FLAGS} \
+ 	${INTEL_SSE3_FLAGS} \
+ 	${INTEL_SSSE3_FLAGS} \
+-	-Ierasure-code/jerasure/gf-complete/include \
+-	-Ierasure-code/jerasure/jerasure/include
++	-I$(includedir)/jerasure
+ libec_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
+ 	${INTEL_SSE_FLAGS} \
+ 	${INTEL_SSE2_FLAGS} \
+ 	${INTEL_SSE3_FLAGS} \
+ 	${INTEL_SSSE3_FLAGS} \
+-	-Ierasure-code/jerasure/gf-complete/include \
+-	-Ierasure-code/jerasure/jerasure/include
++	-I$(includedir)/jerasure
+ libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
++libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
+ if LINUX
+ libec_jerasure_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+ 
+@@ -77,21 +47,19 @@
+ 	${INTEL_SSE3_FLAGS} \
+ 	${INTEL_SSSE3_FLAGS} \
+ 	${INTEL_SSE4_1_FLAGS} \
+ 	${INTEL_SSE4_2_FLAGS} \
+-	-Ierasure-code/jerasure/gf-complete/include \
+-	-Ierasure-code/jerasure/jerasure/include
++	-I$(includedir)/jerasure
+ libec_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
+ 	${INTEL_SSE_FLAGS} \
+ 	${INTEL_SSE2_FLAGS} \
+ 	${INTEL_SSE3_FLAGS} \
+ 	${INTEL_SSSE3_FLAGS} \
+ 	${INTEL_SSE4_1_FLAGS} \
+ 	${INTEL_SSE4_2_FLAGS} \
+-	-Ierasure-code/jerasure/gf-complete/include \
+-	-Ierasure-code/jerasure/jerasure/include
++	-I$(includedir)/jerasure
+ libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
++libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
+ if LINUX
+ libec_jerasure_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+ 
+@@ -101,9 +69,9 @@
+ 	erasure-code/jerasure/ErasureCodePluginSelectJerasure.cc
+ libec_jerasure_la_CFLAGS = ${AM_CFLAGS} 
+ libec_jerasure_la_CXXFLAGS= ${AM_CXXFLAGS}
+ libec_jerasure_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
++libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
+ if LINUX
+ libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git

