drop superfluous build-type patch and re-order other one

As Fabian correctly noticed, from the two PR's, namely PR #54918[0]
and PR #54891[1], only the first one is necessary, that's why the
second one was closed upstream, so drop it here too to avoid a
unnecessary divergence from upstream.

[0]: https://github.com/ceph/ceph/pull/54918
[1]: https://github.com/ceph/ceph/pull/54891

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2024-01-15 16:50:26 +01:00
parent 86a553d66e
commit ab5c03b44d
3 changed files with 1 additions and 24 deletions

View File

@ -1,22 +0,0 @@
From 1f4b106d49fc916994d97e273599f75caa904c3b Mon Sep 17 00:00:00 2001
From: Mark Nelson <mark.nelson@clyso.com>
Date: Thu, 14 Dec 2023 05:19:46 +0000
Subject: [PATCH] debian/rules: Fix build_type for massive performance gain
Signed-off-by: Mark Nelson <mark.nelson@clyso.com>
---
debian/rules | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/rules b/debian/rules
index ed7f4a255ed4b..b28abb7d62788 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,7 @@ extraopts += -DWITH_PYTHON3=3
extraopts += -DWITH_CEPHFS_JAVA=ON
extraopts += -DWITH_CEPHFS_SHELL=ON
extraopts += -DWITH_SYSTEMD=ON -DCEPH_SYSTEMD_ENV_DIR=/etc/default
+extraopts += -DCMAKE_BUILD_TYPE=RelWithDebInfo
extraopts += -DWITH_GRAFANA=ON
ifeq ($(DEB_HOST_ARCH), amd64)
extraopts += -DWITH_RBD_RWL=ON

View File

@ -11,5 +11,4 @@
0011-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch
0012-backport-mgr-dashboard-simplify-authentication-proto.patch
0013-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch
0012-debian-rules-fix-buildtype.patch
0013-rocksb-inherit-parent-cmake-cxx-flags.patch
0014-rocksb-inherit-parent-cmake-cxx-flags.patch