From aa6f50f4ec1d86b632bc1caef93a1bcdd91764c0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 21 Feb 2018 12:27:39 +0100 Subject: [PATCH] rebase patches --- .../0002-cmake-disable-version-from-git.patch | 6 +- ...03-enable-systemd-targets-by-default.patch | 6 +- patches/0004-enable-LZ4-support.patch | 8 +- ...sync-rdma-uninitialized-variable-fix.patch | 4 +- ...-add-deprecation-warnings-in-favor-o.patch | 96 ------------------- patches/series | 1 - 6 files changed, 12 insertions(+), 109 deletions(-) delete mode 100644 patches/0006-Revert-ceph-disk-add-deprecation-warnings-in-favor-o.patch diff --git a/patches/0002-cmake-disable-version-from-git.patch b/patches/0002-cmake-disable-version-from-git.patch index cf44e54c3..6829479ae 100644 --- a/patches/0002-cmake-disable-version-from-git.patch +++ b/patches/0002-cmake-disable-version-from-git.patch @@ -1,7 +1,7 @@ -From 7d0c1cd4c4c0061ab9c1be0d56ceabc636d98096 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 31 May 2017 14:33:09 +0200 -Subject: [PATCH 2/6] cmake: disable version from git +Subject: [PATCH] cmake: disable version from git MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,7 +15,7 @@ Signed-off-by: Fabian Grünbichler 1 file changed, 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3d3d2f7af0..b3e06b2dd0 100644 +index 7aa8a4392e..77a05ad960 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -206,15 +206,10 @@ set(GCOV_PREFIX_STRIP 4) diff --git a/patches/0003-enable-systemd-targets-by-default.patch b/patches/0003-enable-systemd-targets-by-default.patch index 3c4dd21d6..9d9b7d0c3 100644 --- a/patches/0003-enable-systemd-targets-by-default.patch +++ b/patches/0003-enable-systemd-targets-by-default.patch @@ -1,7 +1,7 @@ -From 39fe5f678a61b5d3a15ea8cd671fc0c810b97888 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 22 Mar 2017 09:00:34 +0100 -Subject: [PATCH 3/6] enable systemd targets by default +Subject: [PATCH] enable systemd targets by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,7 +12,7 @@ Signed-off-by: Fabian Grünbichler 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules -index 857888f84e..641a409831 100755 +index 9c63c99c31..4442732e17 100755 --- a/debian/rules +++ b/debian/rules @@ -133,6 +133,9 @@ override_dh_installinit: diff --git a/patches/0004-enable-LZ4-support.patch b/patches/0004-enable-LZ4-support.patch index a95b54efb..6ab9b23d3 100644 --- a/patches/0004-enable-LZ4-support.patch +++ b/patches/0004-enable-LZ4-support.patch @@ -1,7 +1,7 @@ -From 29003f6e13fc3c50b0253be02c64107c36726898 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 15 Nov 2017 10:51:08 +0100 -Subject: [PATCH 4/6] enable LZ4 support +Subject: [PATCH] enable LZ4 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,7 +13,7 @@ Signed-off-by: Fabian Grünbichler 2 files changed, 2 insertions(+) diff --git a/debian/control b/debian/control -index 79bef9bfb3..e363e436b6 100644 +index 9940e74914..02babc3e9d 100644 --- a/debian/control +++ b/debian/control @@ -38,6 +38,7 @@ Build-Depends: bc, @@ -25,7 +25,7 @@ index 79bef9bfb3..e363e436b6 100644 libsnappy-dev, libssl-dev, diff --git a/debian/rules b/debian/rules -index 641a409831..0308d33d4d 100755 +index 4442732e17..a631658d4c 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,7 @@ export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) diff --git a/patches/0005-msg-async-rdma-uninitialized-variable-fix.patch b/patches/0005-msg-async-rdma-uninitialized-variable-fix.patch index 3094abb2f..975fad1da 100644 --- a/patches/0005-msg-async-rdma-uninitialized-variable-fix.patch +++ b/patches/0005-msg-async-rdma-uninitialized-variable-fix.patch @@ -1,7 +1,7 @@ -From 166210c6005403d06e221db9bc97f70a6a43df5e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Vasily Philipov Date: Tue, 3 Oct 2017 12:15:13 +0300 -Subject: [PATCH 5/6] msg/async/rdma: uninitialized variable fix +Subject: [PATCH] msg/async/rdma: uninitialized variable fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/patches/0006-Revert-ceph-disk-add-deprecation-warnings-in-favor-o.patch b/patches/0006-Revert-ceph-disk-add-deprecation-warnings-in-favor-o.patch deleted file mode 100644 index 59f91e38a..000000000 --- a/patches/0006-Revert-ceph-disk-add-deprecation-warnings-in-favor-o.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 69fa7d657d2b849c7d472a2aa8965fa858bc4fd1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= -Date: Mon, 4 Dec 2017 10:23:30 +0100 -Subject: [PATCH 6/6] Revert "ceph-disk add deprecation warnings in favor of - ceph-volume" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit b8bf0d047868054135592188c7ebe186181310c5. - -Signed-off-by: Fabian Grünbichler ---- - src/ceph-disk/ceph_disk/main.py | 29 +---------------------------- - 1 file changed, 1 insertion(+), 28 deletions(-) - -diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py -index 6516750d22..6d1a555ead 100644 ---- a/src/ceph-disk/ceph_disk/main.py -+++ b/src/ceph-disk/ceph_disk/main.py -@@ -42,23 +42,12 @@ import pwd - import grp - import textwrap - import glob --import warnings - - CEPH_OSD_ONDISK_MAGIC = 'ceph osd volume v026' - CEPH_LOCKBOX_ONDISK_MAGIC = 'ceph lockbox volume v001' - - KEY_MANAGEMENT_MODE_V1 = 'ceph-mon v1' - --DEPRECATION_WARNING = """ --******************************************************************************* --This tool is now deprecated in favor of ceph-volume. --It is recommended to use ceph-volume for OSD deployments. For details see: -- -- http://docs.ceph.com/docs/master/ceph-volume/#migrating -- --******************************************************************************* --""" -- - PTYPE = { - 'regular': { - 'journal': { -@@ -5649,8 +5638,6 @@ def make_zap_parser(subparsers): - - - def main(argv): -- # Deprecate from the very beginning -- warnings.warn(DEPRECATION_WARNING) - args = parse_args(argv) - - setup_logging(args.verbose, args.log_stdout) -@@ -5670,20 +5657,10 @@ def main(argv): - CEPH_PREF_GROUP = args.setgroup - - if args.verbose: -- try: -- args.func(args) -- except Exception: -- # warn on any exception when running with verbosity -- warnings.warn(DEPRECATION_WARNING) -- # but still raise the original issue -- raise -- -+ args.func(args) - else: - main_catch(args.func, args) - -- # if there aren't any errors, still log again at the very bottom -- warnings.warn(DEPRECATION_WARNING) -- - - def setup_logging(verbose, log_stdout): - loglevel = logging.WARNING -@@ -5710,8 +5687,6 @@ def main_catch(func, args): - func(args) - - except Error as e: -- # warn on generic 'error' exceptions -- warnings.warn(DEPRECATION_WARNING) - raise SystemExit( - '{prog}: {msg}'.format( - prog=args.prog, -@@ -5720,8 +5695,6 @@ def main_catch(func, args): - ) - - except CephDiskException as error: -- # warn on ceph-disk exceptions -- warnings.warn(DEPRECATION_WARNING) - exc_name = error.__class__.__name__ - raise SystemExit( - '{prog} {exc_name}: {msg}'.format( --- -2.14.2 - diff --git a/patches/series b/patches/series index 9283f4c2e..8d4ea4d5d 100644 --- a/patches/series +++ b/patches/series @@ -3,4 +3,3 @@ 0003-enable-systemd-targets-by-default.patch 0004-enable-LZ4-support.patch 0005-msg-async-rdma-uninitialized-variable-fix.patch -0006-Revert-ceph-disk-add-deprecation-warnings-in-favor-o.patch -- 2.39.2