[Pkg-ceph-commits] [ceph] 11/43: Refresh patches for upstream version 10.2.2

[Gaudenz Steinlin]

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

gaudenz pushed a commit to branch jewel-gaudenz
in repository ceph.

commit 32c3d341bed0ea69dc98a796e51e1674fb55f74a
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date:   Fri Jul 29 14:56:45 2016 +0200

    Refresh patches for upstream version 10.2.2
---
 debian/patches/arch.patch            |  2 +-
 debian/patches/fix-cycles-arch.patch |  2 +-
 debian/patches/sleep-recover.patch   |  2 +-
 debian/patches/tests-disable.patch   | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/arch.patch b/debian/patches/arch.patch
index 2b2e4f0..adf31d0 100644
--- a/debian/patches/arch.patch
+++ b/debian/patches/arch.patch
@@ -6,7 +6,7 @@ Description: use `dpkg-architecture` instead of `arch` to get build architecture
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -228,7 +228,7 @@ AC_CHECK_PROG(YASM_CHECK, yasm, yes)
+@@ -244,7 +244,7 @@
  if test x"$YASM_CHECK" = x"yes"; then
    if yasm -f elf64 src/common/crc32c_intel_fast_asm.S -o /dev/null; then
       echo 'we have a modern and working yasm'
diff --git a/debian/patches/fix-cycles-arch.patch b/debian/patches/fix-cycles-arch.patch
index 2df54bf..c2dfff5 100644
--- a/debian/patches/fix-cycles-arch.patch
+++ b/debian/patches/fix-cycles-arch.patch
@@ -6,7 +6,7 @@ Forwarded: no
 
 --- a/src/common/Cycles.cc
 +++ b/src/common/Cycles.cc
-@@ -56,6 +56,10 @@ void Cycles::init()
+@@ -57,6 +57,10 @@
    if (rdtsc() == 0)
      return;
  
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index 47c4367..6003ef4 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
-@@ -11159,6 +11159,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -11970,6 +11970,7 @@
  	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 c816954..e4406f9 100644
--- a/debian/patches/tests-disable.patch
+++ b/debian/patches/tests-disable.patch
@@ -5,7 +5,7 @@ Description: disable tests that depend on network...
 
 --- a/src/test/Makefile.am
 +++ b/src/test/Makefile.am
-@@ -62,6 +62,7 @@ bin_DEBUGPROGRAMS += ceph_bench_log
+@@ -63,6 +63,7 @@
  
  ## Unit tests
  
@@ -13,17 +13,17 @@ Description: disable tests that depend on network...
  check_SCRIPTS += \
  	test/ceph_objectstore_tool.py \
  	test/test-ceph-helpers.sh \
-@@ -87,6 +88,7 @@ check_SCRIPTS += \
- 	test/mon/mon-handle-forward.sh \
+@@ -94,6 +95,7 @@
  	test/libradosstriper/rados-striper.sh \
- 	test/test_objectstore_memstore.sh
+ 	test/test_objectstore_memstore.sh \
+         test/test_pidfile.sh
 +endif
  
  EXTRA_DIST += \
- 	$(srcdir)/test/python/ceph-disk/setup.py \
+ 	$(srcdir)/test/python/brag-client/setup.py \
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1382,6 +1382,13 @@ AC_LANG_POP([C++])
+@@ -1349,6 +1349,13 @@
  
  AM_CONDITIONAL(WITH_BUILD_TESTS, test "$WITH_BUILD_TESTS" = "1")
  

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