drop patches applied upstream

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/patches/0003-enable-LZ4-support.patch b/patches/0003-enable-LZ4-support.patch
deleted file mode 100644 (file)
index 9bf4a11..0000000
--- a/patches/0003-enable-LZ4-support.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 15 Nov 2017 10:51:08 +0100
-Subject: [PATCH] enable LZ4 support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- debian/control | 1 +
- debian/rules   | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/debian/control b/debian/control
-index 65c29ed0d5..819f4f0b4d 100644
---- a/debian/control
-+++ b/debian/control
-@@ -38,6 +38,7 @@ Build-Depends: bc,
-                libldap2-dev,
-                libleveldb-dev,
-                liblttng-ust-dev,
-+               liblz4-dev,
-                libnss3-dev,
-                libsnappy-dev,
-                libssl-dev,
-diff --git a/debian/rules b/debian/rules
-index 00e9ac6b16..3ac923f71a 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -7,6 +7,7 @@ export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
- 
- extraopts += -DUSE_CRYPTOPP=OFF -DWITH_OCF=ON -DWITH_LTTNG=ON -DWITH_PYTHON3=ON
- extraopts += -DWITH_CEPHFS_JAVA=ON
-+extraopts += -DWITH_LZ4=ON
- # assumes that ceph is exmpt from multiarch support, so we override the libdir.
- extraopts += -DCMAKE_INSTALL_LIBDIR=/usr/lib
- extraopts += -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib

diff --git a/patches/0004-msg-async-rdma-uninitialized-variable-fix.patch b/patches/0004-msg-async-rdma-uninitialized-variable-fix.patch
deleted file mode 100644 (file)
index 88b51b7..0000000
--- a/patches/0004-msg-async-rdma-uninitialized-variable-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Vasily Philipov <vasilyf@mellanox.com>
-Date: Tue, 3 Oct 2017 12:15:13 +0300
-Subject: [PATCH] msg/async/rdma: uninitialized variable fix
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When port constructor is called gid_idx variable stays uninitialized if
-"#else" case is acting.
-
-Signed-off-by: Vasily Philipov <vasilyf@mellanox.com>
-(cherry picked from commit 7ba25bb52a66566c52b352bd6f05794853a6cdca)
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- src/msg/async/rdma/Infiniband.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/msg/async/rdma/Infiniband.cc b/src/msg/async/rdma/Infiniband.cc
-index 37e1a53077..06f514fe24 100644
---- a/src/msg/async/rdma/Infiniband.cc
-+++ b/src/msg/async/rdma/Infiniband.cc
-@@ -28,7 +28,7 @@ static const uint32_t MAX_INLINE_DATA = 0;
- static const uint32_t TCP_MSG_LEN = sizeof("0000:00000000:00000000:00000000:00000000000000000000000000000000");
- static const uint32_t CQ_DEPTH = 30000;
- 
--Port::Port(CephContext *cct, struct ibv_context* ictxt, uint8_t ipn): ctxt(ictxt), port_num(ipn), port_attr(new ibv_port_attr)
-+Port::Port(CephContext *cct, struct ibv_context* ictxt, uint8_t ipn): ctxt(ictxt), port_num(ipn), port_attr(new ibv_port_attr), gid_idx(0)
- {
- #ifdef HAVE_IBV_EXP
-   union ibv_gid cgid;

diff --git a/patches/0005-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch b/patches/0005-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch
deleted file mode 100644 (file)
index 98d0e16..0000000
--- a/patches/0005-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 21 Feb 2018 13:20:11 +0100
-Subject: [PATCH] Revert "debian/control: adjust
- ceph-{osdomap,kvstore,monstore}-tool feature move"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit f6fb266699f7a39005cb76a2c878bdff5b3a7ff0.
-
-as it is not compatible with our PVE debian revision scheme.
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- debian/control | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/debian/control b/debian/control
-index 819f4f0b4d..83dc414788 100644
---- a/debian/control
-+++ b/debian/control
-@@ -108,10 +108,10 @@ Recommends: btrfs-tools,
-             ntp | time-daemon,
- Replaces: ceph (<< 10),
-           ceph-common (<< 0.78-500),
--          ceph-test (<< 12.2.2-14),
-+          ceph-test (<< 12.2.3),
-           python-ceph (<< 0.92-1223),
- Breaks: ceph (<< 10),
--        ceph-test (<< 12.2.2-14),
-+        ceph-test (<< 12.2.3),
-         python-ceph (<< 0.92-1223),
- Description: common ceph daemon libraries and management tools
-  Ceph is a massively scalable, open-source, distributed
-@@ -210,8 +210,8 @@ Depends: ceph-base (= ${binary:Version}),
-          ${misc:Depends},
-          ${shlibs:Depends},
- Recommends: ceph-common,
--Replaces: ceph (<< 10), ceph-test (<< 12.2.2-14)
--Breaks: ceph (<< 10), ceph-test (<< 12.2.2-14)
-+Replaces: ceph (<< 10), ceph-test (<< 12.2.3)
-+Breaks: ceph (<< 10), ceph-test (<< 12.2.3)
- Description: monitor server for the ceph storage system
-  Ceph is a massively scalable, open-source, distributed
-  storage system that runs on commodity hardware and delivers object,
-@@ -243,8 +243,8 @@ Depends: ceph-base (= ${binary:Version}),
-          ${python:Depends},
-          ${shlibs:Depends},
- Recommends: ceph-common (= ${binary:Version}),
--Replaces: ceph (<< 10), ceph-test (<< 12.2.2-14)
--Breaks: ceph (<< 10), ceph-test (<< 12.2.2-14)
-+Replaces: ceph (<< 10), ceph-test (<< 12.2.3)
-+Breaks: ceph (<< 10), ceph-test (<< 12.2.3)
- Description: OSD server for the ceph storage system
-  Ceph is a massively scalable, open-source, distributed
-  storage system that runs on commodity hardware and delivers object,

diff --git a/patches/series b/patches/series
index 0b1b9c7946ce0553684f77c0d9f8f6a818f9e8df..e66667e33075f3b90c2a7662e73d3578b00eee87 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -1,7 +1,4 @@
 0001-cmake-disable-version-from-git.patch
 0002-enable-systemd-targets-by-default.patch
-0003-enable-LZ4-support.patch
-0004-msg-async-rdma-uninitialized-variable-fix.patch
-0005-Revert-debian-control-adjust-ceph-osdomap-kvstore-mo.patch
 0006-debian-control-add-break-libpvestorage-perl.patch
 0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch