[Pkg-ceph-commits] [ceph] 07/17: d/p/fix-systemd-escaping.patch, pybind-flags.patch: Dropped, included upstream.

James Downing Page jamespage at moszumanska.debian.org
Thu Mar 31 10:53:24 UTC 2016


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

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

commit 725e9f8a5df2b91236fc9e8661f034dd951236a3
Author: James Page <james.page at ubuntu.com>
Date:   Wed Mar 30 09:17:38 2016 +0100

    d/p/fix-systemd-escaping.patch,pybind-flags.patch: Dropped,
    included upstream.
    
    d/p/*: Refresh remaining patches.
---
 debian/changelog                           | 11 ++++++++++
 debian/patches/arch.patch                  |  2 +-
 debian/patches/fix-argparse-defaults.patch |  2 +-
 debian/patches/fix-systemd-escaping.patch  | 16 --------------
 debian/patches/pybind-flags.patch          | 34 ------------------------------
 debian/patches/series                      |  2 --
 debian/patches/sleep-recover.patch         |  2 +-
 debian/patches/tests-disable.patch         |  4 ++--
 8 files changed, 16 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a98afd4..11433a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ceph (10.1.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release candidate for Ceph Jewel:
+    - d/control,rules,librgw*: Add new binary packages for librgw2.
+    - d/p/fix-systemd-escaping.patch,pybind-flags.patch: Dropped,
+      included upstream.
+    - d/p/*: Refresh remaining patches.
+  * d/rules: Strip rbd-mirror package correctly.
+
+ -- James Page <james.page at ubuntu.com>  Wed, 30 Mar 2016 09:12:17 +0100
+
 ceph (10.0.5-0ubuntu1) xenial; urgency=medium
 
   * New upstream point release, in preparation for Ceph Jewel.
diff --git a/debian/patches/arch.patch b/debian/patches/arch.patch
index 2b2e4f0..7f21ff1 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)
+@@ -236,7 +236,7 @@ AC_CHECK_PROG(YASM_CHECK, yasm, yes)
  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-argparse-defaults.patch b/debian/patches/fix-argparse-defaults.patch
index d664219..19a6a29 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
-@@ -4168,6 +4168,7 @@ def parse_args(argv):
+@@ -4432,6 +4432,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/fix-systemd-escaping.patch b/debian/patches/fix-systemd-escaping.patch
deleted file mode 100644
index 6ad5f01..0000000
--- a/debian/patches/fix-systemd-escaping.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Ensure that leading / is stripped from device paths
-Author: James Page <james.page at ubuntu.com>
-Bug: http://tracker.ceph.com/issues/14706
-Forwarded: https://github.com/ceph/ceph/pull/7579
-
---- a/src/ceph-disk/ceph_disk/main.py
-+++ b/src/ceph-disk/ceph_disk/main.py
-@@ -3854,7 +3854,7 @@ def main_trigger(args):
-     LOG.debug("main_trigger: " + str(args))
-     if is_systemd() and not args.sync:
-         # http://www.freedesktop.org/software/systemd/man/systemd-escape.html
--        escaped_dev = args.dev.replace('-', '\\x2d')
-+        escaped_dev = args.dev[1:].replace('-', '\\x2d')
-         service = 'ceph-disk@{dev}.service'.format(dev=escaped_dev)
-         LOG.info('systemd detected, triggering %s' % service)
-         command(
diff --git a/debian/patches/pybind-flags.patch b/debian/patches/pybind-flags.patch
deleted file mode 100644
index 830afba..0000000
--- a/debian/patches/pybind-flags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Use python-config for cython flags
-Author: James Page <james.page at ubuntu.com>
-Forwarded: no
-
---- a/src/pybind/Makefile.am
-+++ b/src/pybind/Makefile.am
-@@ -7,8 +7,8 @@ if WITH_CYTHON
- 
- PY_DISTUTILS = \
- 	CPPFLAGS="-iquote \${abs_srcdir}/include ${AM_CPPFLAGS} ${CPPFLAGS}" \
--	CFLAGS="-iquote \${abs_srcdir}/include ${AM_CFLAGS} ${CFLAGS}" \
--	LDFLAGS="-L\${abs_builddir}/.libs $(subst -pie,,${AM_LDFLAGS}) ${LDFLAGS}" \
-+	CFLAGS="-iquote \${abs_srcdir}/include ${AM_CFLAGS} ${PYTHON_CFLAGS}" \
-+	LDFLAGS="-L\${abs_builddir}/.libs $(subst -pie,,${AM_LDFLAGS}) ${PYTHON_LDFLAGS}" \
- 	CYTHON_BUILD_DIR="$(shell readlink -f $(builddir))/build" \
- 	${PYTHON} ./setup.py
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -213,6 +213,14 @@ if test x"$with_cython" = xyes; then
-     if test x"$CYTHON_CHECK" != xyes; then
-         AC_MSG_FAILURE([cython not found])
-     fi
-+    AC_CHECK_PROG(PYTHON_CONFIG_CHECK, python-config, yes)
-+    if test x"$PYTHON_CONFIG_CHECK" != xyes; then
-+        AC_MSG_FAILURE([python-config not found])
-+    fi
-+    PYTHON_CFLAGS=`python-config --cflags`
-+    AC_SUBST(PYTHON_CFLAGS)
-+    PYTHON_LDFLAGS=`python-config --ldflags`
-+    AC_SUBST(PYTHON_LDFLAGS)
- fi
- 
- # cond-check if snappy-devel is installed, needed by leveldb that is need by server parts of the project
diff --git a/debian/patches/series b/debian/patches/series
index 4b9a085..aa23f8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,7 +14,5 @@ tests-disable.patch
 ## From Ubuntu
 fix-argparse-defaults.patch
 fix-cycles-arch.patch
-pybind-flags.patch
-fix-systemd-escaping.patch
 rocksdb-flags.patch
 skip-setup.py-makefiles.patch
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index 66565cf..070d9a3 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
-@@ -11800,6 +11800,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -11882,6 +11882,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 c14197e..0808f9e 100644
--- a/debian/patches/tests-disable.patch
+++ b/debian/patches/tests-disable.patch
@@ -13,7 +13,7 @@ Description: disable tests that depend on network...
  check_SCRIPTS += \
  	test/ceph_objectstore_tool.py \
  	test/test-ceph-helpers.sh \
-@@ -92,6 +93,7 @@ check_SCRIPTS += \
+@@ -93,6 +94,7 @@ check_SCRIPTS += \
  	test/libradosstriper/rados-striper.sh \
  	test/test_objectstore_memstore.sh \
          test/test_pidfile.sh
@@ -23,7 +23,7 @@ Description: disable tests that depend on network...
  	$(srcdir)/test/python/brag-client/setup.py \
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1316,6 +1316,13 @@ AC_LANG_POP([C++])
+@@ -1341,6 +1341,13 @@ AC_LANG_POP([C++])
  
  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



More information about the Pkg-ceph-commits mailing list