[Pkg-ceph-commits] [ceph] 06/23: Drop patches include upstream, refresh remaining patches
James Downing Page
jamespage at moszumanska.debian.org
Wed Feb 17 10:42:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch jewel
in repository ceph.
commit 0d1069d4bca471e3b4b4379877b3493f78634f92
Author: James Page <james.page at ubuntu.com>
Date: Mon Jan 25 15:23:15 2016 +0000
Drop patches include upstream, refresh remaining patches
---
debian/patches/arch.patch | 2 +-
debian/patches/ceph-detect-init-ubuntu.patch | 28 ------
debian/patches/fix-argparse-defaults.patch | 2 +-
debian/patches/flock-location-debian.patch | 13 ---
debian/patches/modules.patch | 136 ---------------------------
debian/patches/series | 4 -
debian/patches/sleep-recover.patch | 2 +-
debian/patches/tests-disable-ceph-disk.patch | 2 +-
debian/patches/tests-disable.patch | 4 +-
debian/patches/vivid-does-systemd.patch | 18 ----
10 files changed, 6 insertions(+), 205 deletions(-)
diff --git a/debian/patches/arch.patch b/debian/patches/arch.patch
index bbffcbf..2b2e4f0 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
-@@ -206,7 +206,7 @@ AC_CHECK_PROG(YASM_CHECK, yasm, yes)
+@@ -228,7 +228,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/ceph-detect-init-ubuntu.patch b/debian/patches/ceph-detect-init-ubuntu.patch
deleted file mode 100644
index 81d7867..0000000
--- a/debian/patches/ceph-detect-init-ubuntu.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fixup handling of init detection for newer Ubuntu releases
-Author: James Page <james.page at ubuntu.com>
-Forwarded: https://github.com/ceph/ceph/pull/6873
-
---- a/src/ceph-detect-init/ceph_detect_init/debian/__init__.py
-+++ b/src/ceph-detect-init/ceph_detect_init/debian/__init__.py
-@@ -9,5 +9,8 @@ def choose_init():
- Returns the name of a init system (upstart, sysvinit ...).
- """
- if distro.lower() in ('ubuntu', 'linuxmint'):
-- return 'upstart'
-+ if codename >= 'vivid':
-+ return 'systemd'
-+ else:
-+ return 'upstart'
- return 'sysvinit'
---- a/src/ceph-detect-init/tests/test_all.py
-+++ b/src/ceph-detect-init/tests/test_all.py
-@@ -50,6 +50,9 @@ class TestCephDetectInit(testtools.TestC
- with mock.patch('ceph_detect_init.debian.distro',
- 'ubuntu'):
- self.assertEqual('upstart', debian.choose_init())
-+ with mock.patch('ceph_detect_init.debian.codename',
-+ 'vivid'):
-+ self.assertEqual('systemd', debian.choose_init())
-
- def test_fedora(self):
- with mock.patch('ceph_detect_init.fedora.release',
diff --git a/debian/patches/fix-argparse-defaults.patch b/debian/patches/fix-argparse-defaults.patch
index c0ba1e5..55d00e3 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
-@@ -3236,6 +3236,7 @@ def parse_args(argv):
+@@ -3627,6 +3627,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/flock-location-debian.patch b/debian/patches/flock-location-debian.patch
deleted file mode 100644
index 30ab1ca..0000000
--- a/debian/patches/flock-location-debian.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Correct flock location for Debian
-Author: James Page <james.page at ubuntu.com>
-Forwarded: no
-
---- a/systemd/ceph-disk at .service
-+++ b/systemd/ceph-disk at .service
-@@ -4,5 +4,5 @@ Description=Ceph disk activation: %f
- [Service]
- Type=oneshot
- KillMode=none
--ExecStart=/bin/flock /var/lock/ceph-disk -c '/usr/sbin/ceph-disk --verbose --log-stdout trigger --sync %f'
-+ExecStart=/usr/bin/flock /var/lock/ceph-disk -c '/usr/sbin/ceph-disk --verbose --log-stdout trigger --sync %f'
- TimeoutSec=0
diff --git a/debian/patches/modules.patch b/debian/patches/modules.patch
deleted file mode 100644
index 2913c9b..0000000
--- a/debian/patches/modules.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-Last-Update: 2014-04-14
-Forwarded: no
-Author: James Page <james.page at ubuntu.com>
-Description: Mark modules as actually being modules
- Ceph was/is building internal plugins/modules as versioned libraries;
- this makes no sense as they are not exposed to anything other than
- ceph so ABI compat is irrelevant - this patch makes them build without
- the so.2.0.0 extensions and is a little cleaner.
-
---- a/src/erasure-code/jerasure/Makefile.am
-+++ b/src/erasure-code/jerasure/Makefile.am
-@@ -48,7 +48,7 @@ libec_jerasure_generic_la_CXXFLAGS= ${AM
- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure/jerasure/include
- libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
-+libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
- libec_jerasure_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
-@@ -70,7 +70,7 @@ libec_jerasure_neon_la_CXXFLAGS= ${AM_CX
- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure/jerasure/include
- libec_jerasure_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
-+libec_jerasure_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
- libec_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
-@@ -95,7 +95,7 @@ libec_jerasure_sse3_la_CXXFLAGS= ${AM_CX
- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure/jerasure/include
- libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
-+libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
- libec_jerasure_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
-@@ -124,7 +124,7 @@ libec_jerasure_sse4_la_CXXFLAGS= ${AM_CX
- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
- -I$(srcdir)/erasure-code/jerasure/jerasure/include
- libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
-+libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
- libec_jerasure_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
-@@ -138,7 +138,7 @@ libec_jerasure_la_SOURCES = \
- libec_jerasure_la_CFLAGS = ${AM_CFLAGS}
- libec_jerasure_la_CXXFLAGS= ${AM_CXXFLAGS}
- libec_jerasure_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0
-+libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
- libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
---- a/src/erasure-code/lrc/Makefile.am
-+++ b/src/erasure-code/lrc/Makefile.am
-@@ -13,7 +13,7 @@ libec_lrc_la_SOURCES = ${lrc_sources} co
- libec_lrc_la_CFLAGS = ${AM_CFLAGS}
- libec_lrc_la_CXXFLAGS= ${AM_CXXFLAGS}
- libec_lrc_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(LIBJSON_SPIRIT)
--libec_lrc_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
-+libec_lrc_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
- libec_lrc_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
---- a/src/cls/Makefile-server.am
-+++ b/src/cls/Makefile-server.am
-@@ -55,7 +55,7 @@ radoslib_LTLIBRARIES += libcls_replica_l
-
- libcls_user_la_SOURCES = cls/user/cls_user.cc
- libcls_user_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
--libcls_user_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
-+libcls_user_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- radoslib_LTLIBRARIES += libcls_user.la
-
- libcls_rgw_la_SOURCES = \
---- a/src/erasure-code/isa/Makefile.am
-+++ b/src/erasure-code/isa/Makefile.am
-@@ -67,7 +67,7 @@ libec_isa_la_CXXFLAGS = ${AM_CXXFLAGS} -
- libec_isa_la_CCASFLAGS = ${AM_CCASFLAGS} -I $(abs_srcdir)/erasure-code/isa/isa-l/include/
-
- libec_isa_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_isa_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:14:0
-+libec_isa_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
- libec_isa_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
---- a/src/erasure-code/shec/Makefile.am
-+++ b/src/erasure-code/shec/Makefile.am
-@@ -50,7 +50,7 @@ libec_shec_generic_la_CXXFLAGS= ${AM_CXX
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- libec_shec_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_shec_generic_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
-+libec_shec_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
- libec_shec_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
-@@ -76,7 +76,7 @@ libec_shec_neon_la_CXXFLAGS= ${AM_CXXFLA
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- libec_shec_neon_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_shec_neon_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
-+libec_shec_neon_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
- libec_shec_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
-@@ -105,7 +105,7 @@ libec_shec_sse3_la_CXXFLAGS= ${AM_CXXFLA
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- libec_shec_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_shec_sse3_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
-+libec_shec_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
- libec_shec_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
-@@ -138,7 +138,7 @@ libec_shec_sse4_la_CXXFLAGS= ${AM_CXXFLA
- -I$(srcdir)/erasure-code/jerasure \
- -I$(srcdir)/erasure-code/shec
- libec_shec_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_shec_sse4_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
-+libec_shec_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
- if LINUX
- libec_shec_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
-@@ -152,7 +152,7 @@ libec_shec_la_SOURCES = \
- libec_shec_la_CFLAGS = ${AM_CFLAGS}
- libec_shec_la_CXXFLAGS= ${AM_CXXFLAGS}
- libec_shec_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--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/series b/debian/patches/series
index 01bcfa2..057a594 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ sleep-recover.patch
## Debian
#rbdmap3-lazyumount.patch
arch.patch
-modules.patch
sample.ceph.conf.patch
# Disabled until adopted upstream
# use_system_jerasure.patch
@@ -17,6 +16,3 @@ tests-disable.patch
ceph-osd-prestart-path.patch
fix-argparse-defaults.patch
fix-cycles-arch.patch
-#vivid-does-systemd.patch
-flock-location-debian.patch
-ceph-detect-init-ubuntu.patch
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index 9a98d55..47c4367 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
-@@ -11085,6 +11085,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -11159,6 +11159,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-ceph-disk.patch b/debian/patches/tests-disable-ceph-disk.patch
index 5f5f077..f2e3da9 100644
--- a/debian/patches/tests-disable-ceph-disk.patch
+++ b/debian/patches/tests-disable-ceph-disk.patch
@@ -5,7 +5,7 @@ Description: disable (FS-dependent?) "ceph-disk" test which always seems to fail
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
-@@ -86,8 +86,6 @@ check_SCRIPTS += \
+@@ -88,8 +88,6 @@ check_SCRIPTS += \
test/libradosstriper/rados-striper.sh \
test/test_objectstore_memstore.sh
diff --git a/debian/patches/tests-disable.patch b/debian/patches/tests-disable.patch
index bc2228a..c816954 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 \
-@@ -85,6 +86,7 @@ check_SCRIPTS += \
+@@ -87,6 +88,7 @@ check_SCRIPTS += \
test/mon/mon-handle-forward.sh \
test/libradosstriper/rados-striper.sh \
test/test_objectstore_memstore.sh
@@ -23,7 +23,7 @@ Description: disable tests that depend on network...
$(srcdir)/test/python/ceph-disk/setup.py \
--- a/configure.ac
+++ b/configure.ac
-@@ -1326,6 +1326,13 @@ AC_LANG_POP([C++])
+@@ -1382,6 +1382,13 @@ AC_LANG_POP([C++])
AM_CONDITIONAL(WITH_BUILD_TESTS, test "$WITH_BUILD_TESTS" = "1")
diff --git a/debian/patches/vivid-does-systemd.patch b/debian/patches/vivid-does-systemd.patch
deleted file mode 100644
index 07d7085..0000000
--- a/debian/patches/vivid-does-systemd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Ensure systemd used >= vivid
-Author: James Page <james.page at ubuntu.com>
-Forwarded: no
-
---- a/src/ceph-disk
-+++ b/src/ceph-disk
-@@ -2128,7 +2128,10 @@ def activate(
- else:
- (distro, release, codename) = platform.dist()
- if distro == 'Ubuntu':
-- init = 'upstart'
-+ if codename >= 'vivid':
-+ init = 'systemd'
-+ else:
-+ init = 'upstart'
- else:
- init = 'sysvinit'
-
--
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