[Pkg-ceph-commits] [ceph] 02/02: Refresh patches

James Downing Page jamespage at moszumanska.debian.org
Mon Nov 16 15:57:54 UTC 2015 

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

jamespage pushed a commit to branch experimental
in repository ceph.

commit be5f829b305bd4cd60ee2e971a9e64b720789642
Author: James Page <james.page at ubuntu.com>
Date:   Mon Nov 16 10:45:53 2015 +0000

    Refresh patches
---
 debian/patches/arch.patch                      |  2 +-
 debian/patches/ceph-osd-prestart-path.patch    | 13 ++++-
 debian/patches/fix-argparse-defaults.patch     | 12 +----
 debian/patches/modules.patch                   | 66 ++++++++++++++++++++------
 debian/patches/sample.ceph.conf.patch          | 16 +++----
 debian/patches/series                          |  4 +-
 debian/patches/sleep-recover.patch             |  2 +-
 debian/patches/tests-disable-ceph-disk.patch   | 12 ++---
 debian/patches/tests-disable.patch             | 19 ++++----
 debian/patches/virtualenv-never-download.patch |  4 +-
 10 files changed, 95 insertions(+), 55 deletions(-)

diff --git a/debian/patches/arch.patch b/debian/patches/arch.patch
index 719085b..bbffcbf 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
-@@ -188,7 +188,7 @@ AC_CHECK_PROG(YASM_CHECK, yasm, yes)
+@@ -206,7 +206,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-osd-prestart-path.patch b/debian/patches/ceph-osd-prestart-path.patch
index 5f3d0f1..91609ad 100644
--- a/debian/patches/ceph-osd-prestart-path.patch
+++ b/debian/patches/ceph-osd-prestart-path.patch
@@ -2,10 +2,21 @@
 +++ b/src/upstart/ceph-osd.conf
 @@ -15,7 +15,7 @@ pre-start script
  
-     install -d -m0755 /var/run/ceph
+     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
index e9e1267..c0ba1e5 100644
--- a/debian/patches/fix-argparse-defaults.patch
+++ b/debian/patches/fix-argparse-defaults.patch
@@ -8,19 +8,11 @@ Forwarded: no
 
 --- a/src/ceph-disk
 +++ b/src/ceph-disk
-@@ -2749,7 +2749,6 @@ def parse_args():
+@@ -3236,6 +3236,7 @@ def parse_args(argv):
      parser.set_defaults(
          # we want to hold on to this, for later
          prog=parser.prog,
--        cluster='ceph',
++        cluster='ceph',
          )
  
      subparsers = parser.add_subparsers(
-@@ -2763,6 +2762,7 @@ def parse_args():
-         '--cluster',
-         metavar='NAME',
-         help='cluster name to assign this disk to',
-+        default='ceph',
-         )
-     prepare_parser.add_argument(
-         '--cluster-uuid',
diff --git a/debian/patches/modules.patch b/debian/patches/modules.patch
index 1ba1563..2913c9b 100644
--- a/debian/patches/modules.patch
+++ b/debian/patches/modules.patch
@@ -65,20 +65,9 @@ Description: Mark modules as actually being modules
  if LINUX
  libec_lrc_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
  endif
---- a/src/erasure-code/isa/Makefile.am
-+++ b/src/erasure-code/isa/Makefile.am
-@@ -49,7 +49,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:10: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/cls/Makefile-server.am
 +++ b/src/cls/Makefile-server.am
-@@ -46,7 +46,7 @@ radoslib_LTLIBRARIES += libcls_replica_l
+@@ -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)
@@ -87,12 +76,59 @@ Description: Mark modules as actually being modules
  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
-@@ -53,7 +53,7 @@ libec_shec_la_CXXFLAGS= ${AM_CXXFLAGS} \
+@@ -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_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
- #libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__erasure_code_.*'
 -libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
 +libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
  if LINUX
diff --git a/debian/patches/sample.ceph.conf.patch b/debian/patches/sample.ceph.conf.patch
index 02cf46d..98ae786 100644
--- a/debian/patches/sample.ceph.conf.patch
+++ b/debian/patches/sample.ceph.conf.patch
@@ -95,7 +95,7 @@ Description: sample.ceph.conf updates:
  
      # where the mds keeps it's secret encryption keys
      ;keyring                    = /var/lib/ceph/mds/$name/keyring
-@@ -279,7 +283,7 @@
+@@ -277,7 +281,7 @@
  # You need at least one.  Two or more if you want data to be replicated.
  # Define as many as you like.
  [osd]
@@ -104,7 +104,7 @@ Description: sample.ceph.conf updates:
  
      # The path to the OSDs data.
      # You must create the directory when deploying Ceph.
-@@ -339,7 +343,7 @@
+@@ -337,7 +341,7 @@
      # (Default: false)
      ;osd check for log corruption = true
  
@@ -113,7 +113,7 @@ Description: sample.ceph.conf updates:
  
      # The size of the journal in megabytes. If this is 0,
      # and the journal is a block device, the entire block device is used.
-@@ -365,7 +369,7 @@
+@@ -363,7 +367,7 @@
      ;debug filestore              = 20
      ;debug journal                = 20
  
@@ -122,7 +122,7 @@ Description: sample.ceph.conf updates:
  
      # The maximum interval in seconds for synchronizing the filestore.
      # Type: Double (optional)
-@@ -378,12 +382,6 @@
+@@ -376,12 +380,6 @@
      # (Default: true)
      ;filestore btrfs snap        = false
  
@@ -135,7 +135,7 @@ Description: sample.ceph.conf updates:
      # Defines the maximum number of in progress operations the file store
      # accepts before blocking on queuing new operations.
      # Type: Integer
-@@ -393,7 +391,7 @@
+@@ -391,7 +389,7 @@
  
      ## Filestore and OSD settings can be tweak to achieve better performance
  
@@ -144,7 +144,7 @@ Description: sample.ceph.conf updates:
  
      # Min number of files in a subdir before merging into parent NOTE: A negative value means to disable subdir merging
      # Type: Integer
-@@ -426,6 +424,7 @@
+@@ -424,6 +422,7 @@
      # (Default: true)
      ;osd crush update on start    = false
  
@@ -152,7 +152,7 @@ Description: sample.ceph.conf updates:
  ;[osd.0]
  ;    host                         = delta
  
-@@ -443,7 +442,7 @@
+@@ -441,7 +440,7 @@
  ## client settings
  [client]
  
@@ -161,7 +161,7 @@ Description: sample.ceph.conf updates:
  
      # Enable caching for RADOS Block Device (RBD).
      # Type: Boolean
-@@ -499,7 +498,7 @@
+@@ -497,7 +496,7 @@
  ## radosgw client settings
  [client.radosgw.gateway]
  
diff --git a/debian/patches/series b/debian/patches/series
index 9f24fbd..5c2e717 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@
 sleep-recover.patch
 
 ## Debian
-rbdmap3-lazyumount.patch
+#rbdmap3-lazyumount.patch
 arch.patch
 modules.patch
 sample.ceph.conf.patch
@@ -17,4 +17,4 @@ tests-disable.patch
 ceph-osd-prestart-path.patch
 fix-argparse-defaults.patch
 fix-cycles-arch.patch
-vivid-does-systemd.patch
+#vivid-does-systemd.patch
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index 115e5cc..9a98d55 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
-@@ -10467,6 +10467,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -11085,6 +11085,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 200407c..5f5f077 100644
--- a/debian/patches/tests-disable-ceph-disk.patch
+++ b/debian/patches/tests-disable-ceph-disk.patch
@@ -5,12 +5,12 @@ Description: disable (FS-dependent?) "ceph-disk" test which always seems to fail
 
 --- a/src/test/Makefile.am
 +++ b/src/test/Makefile.am
-@@ -83,8 +83,6 @@ check_SCRIPTS += \
+@@ -86,8 +86,6 @@ check_SCRIPTS += \
+ 	test/libradosstriper/rados-striper.sh \
+ 	test/test_objectstore_memstore.sh
  
- if ENABLE_ROOT_MAKE_CHECK
- check_SCRIPTS += test/ceph-disk-root.sh
--else
 -check_SCRIPTS += test/ceph-disk.sh
- endif
- 
+-
  EXTRA_DIST += \
+ 	$(srcdir)/test/python/ceph-disk/setup.py \
+ 	$(srcdir)/test/python/ceph-disk/tox.ini \
diff --git a/debian/patches/tests-disable.patch b/debian/patches/tests-disable.patch
index 9056fb9..bc2228a 100644
--- a/debian/patches/tests-disable.patch
+++ b/debian/patches/tests-disable.patch
@@ -13,17 +13,17 @@ Description: disable tests that depend on network...
  check_SCRIPTS += \
  	test/ceph_objectstore_tool.py \
  	test/test-ceph-helpers.sh \
-@@ -80,6 +81,7 @@ check_SCRIPTS += \
- 	test/osd/osd-bench.sh \
- 	test/osd/osd-copy-from.sh \
- 	test/mon/mon-handle-forward.sh
+@@ -85,6 +86,7 @@ check_SCRIPTS += \
+ 	test/mon/mon-handle-forward.sh \
+ 	test/libradosstriper/rados-striper.sh \
+ 	test/test_objectstore_memstore.sh
 +endif
  
- if ENABLE_ROOT_MAKE_CHECK
- check_SCRIPTS += test/ceph-disk-root.sh
+ EXTRA_DIST += \
+ 	$(srcdir)/test/python/ceph-disk/setup.py \
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1181,6 +1181,13 @@ AC_LANG_POP([C++])
+@@ -1326,6 +1326,13 @@ AC_LANG_POP([C++])
  
  AM_CONDITIONAL(WITH_BUILD_TESTS, test "$WITH_BUILD_TESTS" = "1")
  
@@ -39,13 +39,14 @@ Description: disable tests that depend on network...
  
 --- a/src/test/erasure-code/Makefile.am
 +++ b/src/test/erasure-code/Makefile.am
-@@ -1,8 +1,10 @@
+@@ -1,9 +1,11 @@
  if ENABLE_SERVER
  if WITH_OSD
  
 +if WITH_CLUSTER_TESTS
  check_SCRIPTS += \
- 	test/erasure-code/test-erasure-code.sh
+ 	test/erasure-code/test-erasure-code.sh \
+ 	test/erasure-code/test-erasure-eio.sh
 +endif
  
  noinst_HEADERS += \
diff --git a/debian/patches/virtualenv-never-download.patch b/debian/patches/virtualenv-never-download.patch
index dad3fcb..23f151f 100644
--- a/debian/patches/virtualenv-never-download.patch
+++ b/debian/patches/virtualenv-never-download.patch
@@ -9,8 +9,8 @@ Description: Ask virtualenv to never download anything
      # patched cram to support that. See upstream ticket at
      # https://bitbucket.org/brodie/cram/issue/9/allow-read-only-directories-for-t
      # -- tv at inktank.com
--    virtualenv "$VENV" && $VENV/bin/pip install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
-+    virtualenv --system-site-packages "$VENV" && $VENV/bin/pip install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
+-    virtualenv "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
++    virtualenv --system-site-packages "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
  fi
  
  SRCDIR_ABS="$(readlink -f "$SRCDIR")"

-- 
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