[Pkg-ceph-commits] [ceph] 03/05: Patchworks

[James Downing Page]

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

jamespage pushed a commit to branch ubuntu-xenial
in repository ceph.

commit 26fe3ec527202a50efff1f596416316d31c37180
Author: James Page <james.page at ubuntu.com>
Date:   Thu Sep 29 09:32:39 2016 +0100

    Patchworks
---
 debian/changelog                           |  2 ++
 debian/patches/fix-argparse-defaults.patch |  2 +-
 debian/patches/rocksdb-flags.patch         | 16 ----------------
 debian/patches/series                      |  1 -
 debian/patches/sleep-recover.patch         |  2 +-
 debian/patches/tests-disable.patch         | 11 ++++++-----
 6 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63a542b..d55bb13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ceph (10.2.3-0ubuntu0.16.04.1) UNRELEASED; urgency=medium
 
   * New upstream stable release (LP: #1628809).
+    - d/p/*: Refresh.
+    - d/p/rocksdb-flags.patch: Dropped, accepted upstream.
 
  -- James Page <james.page at ubuntu.com>  Thu, 29 Sep 2016 09:28:57 +0100
 
diff --git a/debian/patches/fix-argparse-defaults.patch b/debian/patches/fix-argparse-defaults.patch
index 19a6a29..505f5fe 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/ceph_disk/main.py
 +++ b/src/ceph-disk/ceph_disk/main.py
-@@ -4432,6 +4432,7 @@ def parse_args(argv):
+@@ -4479,6 +4479,7 @@ def parse_args(argv):
      parser.set_defaults(
          # we want to hold on to this, for later
          prog=parser.prog,
diff --git a/debian/patches/rocksdb-flags.patch b/debian/patches/rocksdb-flags.patch
deleted file mode 100644
index 68f6671..0000000
--- a/debian/patches/rocksdb-flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Ensure that -momit-leaf-frame-pointer is only used on architectures that support it
-Author: James Page <james.page at ubuntu.com>
-Forwarded: https://github.com/facebook/rocksdb/pull/1019
-
---- a/src/rocksdb/Makefile
-+++ b/src/rocksdb/Makefile
-@@ -84,7 +84,8 @@ endif
- # compile with -O2 if debug level is not 2
- ifneq ($(DEBUG_LEVEL), 2)
- OPT += -O2 -fno-omit-frame-pointer
--ifneq ($(MACHINE),ppc64) # ppc64 doesn't support -momit-leaf-frame-pointer
-+# Skip for archs that don't support -momit-leaf-frame-pointer
-+ifeq (,$(shell $(CXX) -fsyntax-only -momit-leaf-frame-pointer -xc /dev/null 2>&1))
- OPT += -momit-leaf-frame-pointer
- endif
- endif
diff --git a/debian/patches/series b/debian/patches/series
index 1f934af..5533f3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,6 +14,5 @@ tests-disable.patch
 ## From Ubuntu
 fix-argparse-defaults.patch
 fix-cycles-arch.patch
-rocksdb-flags.patch
 skip-setup.py-makefiles.patch
 disable-openssl-linking.patch
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index 5eca0d1..2369611 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
-@@ -11918,6 +11918,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -12014,6 +12014,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/tests-disable.patch b/debian/patches/tests-disable.patch
index 7012f49..f03242a 100644
--- a/debian/patches/tests-disable.patch
+++ b/debian/patches/tests-disable.patch
@@ -13,14 +13,15 @@ Description: disable tests that depend on network...
  check_SCRIPTS += \
  	test/ceph_objectstore_tool.py \
  	test/test-ceph-helpers.sh \
-@@ -94,6 +95,7 @@ check_SCRIPTS += \
- 	test/libradosstriper/rados-striper.sh \
- 	test/test_objectstore_memstore.sh \
-         test/test_pidfile.sh
-+endif
+@@ -96,6 +97,8 @@ check_SCRIPTS += \
+         test/test_pidfile.sh \
+ 	test/test_subman.sh
  
++endif
++
  EXTRA_DIST += \
  	$(srcdir)/test/python/brag-client/setup.py \
+ 	$(srcdir)/test/python/brag-client/tox.ini \
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1349,6 +1349,13 @@ AC_LANG_POP([C++])

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