[Pkg-ceph-commits] [ceph] 03/10: New upstream point release:
James Downing Page
jamespage at moszumanska.debian.org
Tue Jun 16 10:32:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch experimental
in repository ceph.
commit 94cb222ef3e9f24af39a4e82fe1eb3166a64f704
Author: James Page <james.page at ubuntu.com>
Date: Mon Jun 15 10:04:40 2015 +0100
New upstream point release:
d/p/*: Refresh.
---
debian/changelog | 6 ++-
debian/patches/fix-argparse-defaults.patch | 4 +-
debian/patches/fix-cycles-arch.patch | 19 --------
debian/patches/modules.patch | 11 +++++
debian/patches/sleep-recover.patch | 2 +-
debian/patches/use_system_jerasure.patch | 64 ++++++++++++++++++++++++++
debian/patches/virtualenv-never-download.patch | 4 +-
debian/patches/vivid-does-systemd.patch | 2 +-
8 files changed, 84 insertions(+), 28 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8494bfc..257a7b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-ceph (0.94.1-1) UNRELEASED; urgency=medium
+ceph (0.94.2-1) UNRELEASED; urgency=medium
- * Resync with Ubuntu, introducing Ceph Hammer stable release.
+ * Resync with Ubuntu, introducing Ceph Hammer stable release.
+ * New upstream point release:
+ - d/p/*: Refresh.
-- James Page <james.page at ubuntu.com> Tue, 09 Jun 2015 17:41:26 +0100
diff --git a/debian/patches/fix-argparse-defaults.patch b/debian/patches/fix-argparse-defaults.patch
index 0cc2db0..79eff01 100644
--- a/debian/patches/fix-argparse-defaults.patch
+++ b/debian/patches/fix-argparse-defaults.patch
@@ -8,7 +8,7 @@ Forwarded: no
--- a/src/ceph-disk
+++ b/src/ceph-disk
-@@ -2747,7 +2747,6 @@ def parse_args():
+@@ -2745,7 +2745,6 @@ def parse_args():
parser.set_defaults(
# we want to hold on to this, for later
prog=parser.prog,
@@ -16,7 +16,7 @@ Forwarded: no
)
subparsers = parser.add_subparsers(
-@@ -2761,6 +2760,7 @@ def parse_args():
+@@ -2759,6 +2758,7 @@ def parse_args():
'--cluster',
metavar='NAME',
help='cluster name to assign this disk to',
diff --git a/debian/patches/fix-cycles-arch.patch b/debian/patches/fix-cycles-arch.patch
index dac5903..492d4cc 100644
--- a/debian/patches/fix-cycles-arch.patch
+++ b/debian/patches/fix-cycles-arch.patch
@@ -4,25 +4,6 @@ Description: Enable high precision clock for PPC + fallback
Author: James Page <james.page at ubuntu.com>
Forwarded: no
---- a/src/common/Cycles.h
-+++ b/src/common/Cycles.h
-@@ -72,8 +72,15 @@ class Cycles {
- uint64_t cntvct;
- asm volatile ("isb; mrs %0, cntvct_el0; isb; " : "=r" (cntvct) :: "memory");
- return cntvct;
-+#elif defined(__powerpc__) || defined(__powerpc64__)
-+ // Based on:
-+ // https://github.com/randombit/botan/blob/net.randombit.botan/src/lib/entropy/hres_timer/hres_timer.cpp
-+ uint32_t lo = 0, hi = 0;
-+ asm volatile("mftbu %0; mftb %1" : "=r" (hi), "=r" (lo));
-+ return (((uint64_t)hi << 32) | lo);
- #else
--#error No high-precision counter available for your OS/arch
-+#warning No high-precision counter available for your OS/arch
-+ return 0;
- #endif
- }
-
--- a/src/common/Cycles.cc
+++ b/src/common/Cycles.cc
@@ -52,6 +52,10 @@ void Cycles::init()
diff --git a/debian/patches/modules.patch b/debian/patches/modules.patch
index 3ebce1d..c3f8540 100644
--- a/debian/patches/modules.patch
+++ b/debian/patches/modules.patch
@@ -78,3 +78,14 @@ Description: Mark modules as actually being modules
radoslib_LTLIBRARIES += libcls_user.la
libcls_rgw_la_SOURCES = \
+--- a/src/erasure-code/shec/Makefile.am
++++ b/src/erasure-code/shec/Makefile.am
+@@ -53,7 +53,7 @@ libec_shec_la_CXXFLAGS= ${AM_CXXFLAGS} \
+ libec_shec_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+ #libec_shec_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
+ #libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__erasure_code_.*'
+-libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
++libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
+ if LINUX
+ libec_shec_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index 28a98d7..15dfe4e 100644
--- a/debian/patches/sleep-recover.patch
+++ b/debian/patches/sleep-recover.patch
@@ -6,7 +6,7 @@ Description: fix fuse-client hang after wake-up from suspend.
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
-@@ -10444,6 +10444,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -10448,6 +10448,7 @@ void Client::ms_handle_remote_reset(Conn
case MetaSession::STATE_OPEN:
ldout(cct, 1) << "reset from mds we were open; mark session as stale" << dendl;
s->state = MetaSession::STATE_STALE;
diff --git a/debian/patches/use_system_jerasure.patch b/debian/patches/use_system_jerasure.patch
index e1d0775..7c9858c 100644
--- a/debian/patches/use_system_jerasure.patch
+++ b/debian/patches/use_system_jerasure.patch
@@ -116,3 +116,67 @@ Description: use system "libjerasure" instead of bundled one.
if LINUX
libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
endif
+--- a/src/erasure-code/shec/Makefile.am
++++ b/src/erasure-code/shec/Makefile.am
+@@ -6,54 +6,24 @@ libec_shec_la_SOURCES = \
+ erasure-code/shec/ErasureCodeShec.cc \
+ erasure-code/shec/ErasureCodeShecTableCache.cc \
+ erasure-code/shec/shec.cc \
+- erasure-code/shec/determinant.c \
+- 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/shec/determinant.c
+ noinst_HEADERS += \
+ erasure-code/shec/ErasureCodeShec.h \
+ erasure-code/shec/ErasureCodeShecTableCache.h \
+- erasure-code/shec/shec.h \
+- 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/shec/shec.h
+
+ erasure-code/shec/ErasureCodePluginShec.cc: ./ceph_ver.h
+
+ libec_shec_la_CFLAGS = ${AM_CFLAGS} \
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+- -I$(srcdir)/erasure-code/jerasure \
+- -I$(srcdir)/erasure-code/shec
++ -I$(srcdir)/erasure-code/shec \
++ -I$(includedir)/jerasure
+ libec_shec_la_CXXFLAGS= ${AM_CXXFLAGS} \
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+- -I$(srcdir)/erasure-code/jerasure \
+- -I$(srcdir)/erasure-code/shec
++ -I$(srcdir)/erasure-code/shec \
++ -I$(includedir)/jerasure
+ libec_shec_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+ #libec_shec_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
+ #libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__erasure_code_.*'
+-libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
++libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
+ if LINUX
+ libec_shec_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
diff --git a/debian/patches/virtualenv-never-download.patch b/debian/patches/virtualenv-never-download.patch
index 3c2b2c5..dad3fcb 100644
--- a/debian/patches/virtualenv-never-download.patch
+++ b/debian/patches/virtualenv-never-download.patch
@@ -5,8 +5,7 @@ Description: Ask virtualenv to never download anything
--- a/src/test/run-cli-tests
+++ b/src/test/run-cli-tests
-@@ -29,9 +29,9 @@
- # With "make distcheck", the source directory must be read-only. I
+@@ -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
# -- tv at inktank.com
@@ -15,4 +14,3 @@ Description: Ask virtualenv to never download anything
fi
SRCDIR_ABS="$(readlink -f "$SRCDIR")"
- BUILDDIR_ABS="$(readlink -f "$BUILDDIR")"
diff --git a/debian/patches/vivid-does-systemd.patch b/debian/patches/vivid-does-systemd.patch
index 1d9acac..07d7085 100644
--- a/debian/patches/vivid-does-systemd.patch
+++ b/debian/patches/vivid-does-systemd.patch
@@ -4,7 +4,7 @@ Forwarded: no
--- a/src/ceph-disk
+++ b/src/ceph-disk
-@@ -2130,7 +2130,10 @@ def activate(
+@@ -2128,7 +2128,10 @@ def activate(
else:
(distro, release, codename) = platform.dist()
if distro == 'Ubuntu':
--
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