[Pkg-ceph-commits] [ceph] 12/43: Remove patches applied upstream in 10.2.2
Gaudenz Steinlin
gaudenz at moszumanska.debian.org
Mon Aug 15 21:41:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
gaudenz pushed a commit to branch jewel-gaudenz
in repository ceph.
commit ee40dac01936bf6922b7663fdc4edcb09385169f
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date: Fri Jul 29 14:59:55 2016 +0200
Remove patches applied upstream in 10.2.2
---
debian/patches/ceph-osd-prestart-path.patch | 22 ------------------
debian/patches/fix-argparse-defaults.patch | 18 ---------------
debian/patches/fix-systemd-escaping.patch | 16 -------------
debian/patches/pybind-flags.patch | 34 ----------------------------
debian/patches/series | 5 ----
debian/patches/tests-disable-ceph-disk.patch | 16 -------------
6 files changed, 111 deletions(-)
diff --git a/debian/patches/ceph-osd-prestart-path.patch b/debian/patches/ceph-osd-prestart-path.patch
deleted file mode 100644
index 91609ad..0000000
--- a/debian/patches/ceph-osd-prestart-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/upstart/ceph-osd.conf
-+++ b/src/upstart/ceph-osd.conf
-@@ -15,7 +15,7 @@ pre-start script
-
- install -d -m0770 -o ceph -g ceph /var/run/ceph
-
-- /usr/libexec/ceph/ceph-osd-prestart.sh --cluster="${cluster:-ceph}" -i "$id"
-+ /usr/lib/ceph/ceph-osd-prestart.sh --cluster="${cluster:-ceph}" -i "$id"
- end script
-
- instance ${cluster:-ceph}/$id
---- a/systemd/ceph-osd at .service
-+++ b/systemd/ceph-osd at .service
-@@ -10,7 +10,7 @@ LimitNPROC=1048576
- EnvironmentFile=-/etc/sysconfig/ceph
- Environment=CLUSTER=ceph
- ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
--ExecStartPre=/usr/libexec/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
-+ExecStartPre=/usr/lib/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
- ExecReload=/bin/kill -HUP $MAINPID
-
- [Install]
diff --git a/debian/patches/fix-argparse-defaults.patch b/debian/patches/fix-argparse-defaults.patch
deleted file mode 100644
index 55d00e3..0000000
--- a/debian/patches/fix-argparse-defaults.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix argparse usage for Python 2.7.9
- The behaviour of set_defaults appears to have
- regressed in python 2.7.9; this patch works around
- this problem by providing the default for 'cluster'
- alongside the --cluster option.
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1413321
-Forwarded: no
-
---- a/src/ceph-disk
-+++ b/src/ceph-disk
-@@ -3627,6 +3627,7 @@ def parse_args(argv):
- parser.set_defaults(
- # we want to hold on to this, for later
- prog=parser.prog,
-+ cluster='ceph',
- )
-
- subparsers = parser.add_subparsers(
diff --git a/debian/patches/fix-systemd-escaping.patch b/debian/patches/fix-systemd-escaping.patch
deleted file mode 100644
index 39ca842..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
-+++ b/src/ceph-disk
-@@ -2998,7 +2998,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 eb26730..025ff18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,12 +9,7 @@ sample.ceph.conf.patch
# use_system_jerasure.patch
virtualenv-never-download.patch
# Testing patches
-tests-disable-ceph-disk.patch
tests-disable.patch
## From Ubuntu
-ceph-osd-prestart-path.patch
-fix-argparse-defaults.patch
fix-cycles-arch.patch
-pybind-flags.patch
-fix-systemd-escaping.patch
diff --git a/debian/patches/tests-disable-ceph-disk.patch b/debian/patches/tests-disable-ceph-disk.patch
deleted file mode 100644
index f2e3da9..0000000
--- a/debian/patches/tests-disable-ceph-disk.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Last-Update: 2014-10-31
-Forwarded: no
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: disable (FS-dependent?) "ceph-disk" test which always seems to fail...
-
---- a/src/test/Makefile.am
-+++ b/src/test/Makefile.am
-@@ -88,8 +88,6 @@ check_SCRIPTS += \
- test/libradosstriper/rados-striper.sh \
- test/test_objectstore_memstore.sh
-
--check_SCRIPTS += test/ceph-disk.sh
--
- EXTRA_DIST += \
- $(srcdir)/test/python/ceph-disk/setup.py \
- $(srcdir)/test/python/ceph-disk/tox.ini \
--
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