udpdate/drop patches for 15.2.0

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

diff --git a/patches/0001-cmake-disable-version-from-git.patch b/patches/0001-cmake-disable-version-from-git.patch
deleted file mode 100644 (file)
index 6ede154..0000000
--- a/patches/0001-cmake-disable-version-from-git.patch
+++ /dev/null
@@ -1,36 +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, 31 May 2017 14:33:09 +0200
-Subject: [PATCH] cmake: disable version from git
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-as this recurses up the directory tree and gets wrong
-information from the parent repository.
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- src/CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b0837ab1d9..f63bf44de3 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -206,15 +206,10 @@ set(GCOV_PREFIX_STRIP 4)
- # we pull the git version from .git
- option(ENABLE_GIT_VERSION "build Ceph with git version string" ON)
- if(${ENABLE_GIT_VERSION})
--  get_git_head_revision(GIT_REFSPEC CEPH_GIT_VER)
--  git_describe(CEPH_GIT_NICE_VER --always)
--  #if building from a source tarball via make-dist
--  if(${CEPH_GIT_VER} STREQUAL "GITDIR-NOTFOUND")
-     message(STATUS "Ceph/.git directory not found, parsing ${CMAKE_CURRENT_SOURCE_DIR}/.git_version for CEPH_GIT_VER and CEPH_GIT_NICE_VER")
-     file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/.git_version CEPH_GIT_SHA_AND_TAG)
-     list(GET CEPH_GIT_SHA_AND_TAG 0 CEPH_GIT_VER)
-     list(GET CEPH_GIT_SHA_AND_TAG 1 CEPH_GIT_NICE_VER)
--  endif(${CEPH_GIT_VER} STREQUAL "GITDIR-NOTFOUND")
-   # remove 'v' prefix from raw git version
-   string(SUBSTRING ${CEPH_GIT_NICE_VER} 1 -1 CEPH_GIT_NICE_VER)
- else(${ENABLE_GIT_VERSION})

diff --git a/patches/0011-only-suggest-mgr-plugins.patch b/patches/0011-only-suggest-mgr-plugins.patch
index 7d21403534f5cfcdd27a7bc0f369c82efc058228..e543cd54b22cb3f89928be2d08142f1f9f854559 100644 (file)
--- a/patches/0011-only-suggest-mgr-plugins.patch
+++ b/patches/0011-only-suggest-mgr-plugins.patch
@@ -1,37 +1,45 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Dominik Csapak <d.csapak@proxmox.com>
 Date: Thu, 4 Jul 2019 08:17:05 +0200
-Subject: [PATCH] only suggest mgr plugins
+Subject: [PATCH] ceph-mgr: only suggest mgr plugins
 
 so that they wont be installed by default
 
 Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- debian/control | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ debian/control | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/debian/control b/debian/control
 index e7a01c6ff8..692705c4c4 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -192,13 +192,13 @@ Depends: ceph-base (= ${binary:Version}),
+@@ -225,12 +225,12 @@ Depends: ceph-base (= ${binary:Version}),
           ${misc:Depends},
           ${python:Depends},
           ${shlibs:Depends},
 -Recommends: ceph-mgr-dashboard,
 -            ceph-mgr-diskprediction-local,
 -            ceph-mgr-diskprediction-cloud,
--            ceph-mgr-rook,
 -            ceph-mgr-k8sevents,
--            ceph-mgr-ssh
--Suggests: python-influxdb
+-            ceph-mgr-cephadm
+-Suggests: python3-influxdb
 +Suggests: ceph-mgr-dashboard,
 +          ceph-mgr-diskprediction-local,
 +          ceph-mgr-diskprediction-cloud,
-+          ceph-mgr-rook,
 +          ceph-mgr-k8sevents,
-+          ceph-mgr-ssh,
-+          python-influxdb
++          ceph-mgr-cephadm,
++          python3-influxdb
  Replaces: ceph (<< 0.93-417),
  Breaks: ceph (<< 0.93-417),
  Description: manager for the ceph distributed storage system
+@@ -304,7 +304,7 @@ Depends: ${misc:Depends},
+          python3-openssl,
+ Replaces: ceph-mgr (<< 15.1.0)
+ Breaks: ceph-mgr (<< 15.1.0)
+-Recommends: ceph-mgr-rook
++Suggests: ceph-mgr-rook
+ Description: ceph manager modules which are always enabled
+  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 b417c054721d9b0b0f3d9d0a138abe17a526dac7..8f800004035a89db0098204f9f4566f47bd0693e 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,3 @@
-0001-cmake-disable-version-from-git.patch
 0002-enable-systemd-targets-by-default.patch
 0006-debian-control-add-break-libpvestorage-perl.patch
 0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch