[Pkg-ceph-commits] [ceph] 03/05: Revert "new patch to use system libjerasure"
Gaudenz Steinlin
gaudenz at moszumanska.debian.org
Wed May 6 07:01:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
gaudenz pushed a commit to annotated tag 0.80.9-1_bpo70+1
in repository ceph.
commit 063e12d985f64d9af8e52e2fae24b85348d31171
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date: Sun May 3 20:33:39 2015 +0200
Revert "new patch to use system libjerasure"
This reverts commit d625e8bb023d88ac6b249a1d884236dda5626b01.
Conflicts:
debian/control
---
debian/copyright | 2 -
debian/patches/backfill-prio.patch | 10 +--
debian/patches/series | 1 -
debian/patches/use_system_jerasure.patch | 117 -------------------------------
4 files changed, 5 insertions(+), 125 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 87363b9..da07f5f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,6 @@ 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 4e1034f..c163aeb 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
-@@ -1884,8 +1884,28 @@
+@@ -1885,8 +1885,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);
-@@ -5851,15 +5871,14 @@
+@@ -5852,15 +5872,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());
}
-@@ -5926,10 +5945,10 @@
+@@ -5927,10 +5946,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()
{
-@@ -5994,9 +6013,10 @@
+@@ -5995,9 +6014,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)
-@@ -6135,9 +6155,10 @@
+@@ -6136,9 +6156,10 @@
pg->osd->local_reserver.request_reservation(
pg->info.pgid,
new QueuePeeringEvt<LocalRecoveryReserved>(
diff --git a/debian/patches/series b/debian/patches/series
index 7a423c8..ee9ce31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,5 +18,4 @@ 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
deleted file mode 100644
index 7541443..0000000
--- a/debian/patches/use_system_jerasure.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-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
More information about the Pkg-ceph-commits
mailing list