proxmox-mirrors/ceph
1
0
Fork 0
mirror of https://git.proxmox.com/git/ceph.git synced 2025-04-29 06:46:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refresh patches for 17.2.8

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2024-11-28 19:49:08 +01:00
parent b009440314
commit 77e666e915
22 changed files with 108 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/0001-cmake-disable-version-from-git.patch
View File

@ -7,11 +7,11 @@ to avoid that the parent (packaging) git info is used..
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
ceph/src/CMakeLists.txt | 7 ------- src/CMakeLists.txt | 7 -------
1 file changed, 7 deletions(-) 1 file changed, 7 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb4a7812d..ea4789522 100644 index cdc183d2463..5f92eafd95b 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -35,17 +35,10 @@ configure_file(ceph-crash.in @@ -35,17 +35,10 @@ configure_file(ceph-crash.in

7
patches/0002-enable-systemd-targets-by-default.patch
View File

@ -7,12 +7,13 @@ Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/rules | 3 +++ debian/rules | 5 +++++
1 file changed, 3 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/debian/rules b/debian/rules diff --git a/debian/rules b/debian/rules
index b5ce42c6f3..00e9ac6b16 100755 index 9f49deabb0e..b123ae95424 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -98,6 +98,11 @@ override_dh_installinit: @@ -98,6 +98,11 @@ override_dh_installinit:

7
patches/0006-debian-control-add-break-libpvestorage-perl.patch → patches/0003-debian-control-add-break-libpvestorage-perl.patch
View File

@ -3,15 +3,16 @@ From: Alwin Antreich <a.antreich@proxmox.com>
Date: Wed, 24 Oct 2018 10:38:19 +0200 Date: Wed, 24 Oct 2018 10:38:19 +0200
Subject: [PATCH] debian/control: add break libpvestorage-perl Subject: [PATCH] debian/control: add break libpvestorage-perl
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/control | 2 ++ debian/control | 2 ++
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/debian/control b/debian/control diff --git a/debian/control b/debian/control
index 83dc414788..1cfa2250de 100644 index 55eacdd4971..37f480fc530 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -154,6 +154,7 @@ Replaces: ceph (<< 10), @@ -155,6 +155,7 @@ Replaces: ceph (<< 10),
Breaks: ceph (<< 10), Breaks: ceph (<< 10),
ceph-test (<< 12.2.2-14), ceph-test (<< 12.2.2-14),
python-ceph (<< 0.92-1223), python-ceph (<< 0.92-1223),
@ -19,7 +20,7 @@ index 83dc414788..1cfa2250de 100644
Description: common ceph daemon libraries and management tools Description: common ceph daemon libraries and management tools
Ceph is a massively scalable, open-source, distributed Ceph is a massively scalable, open-source, distributed
storage system that runs on commodity hardware and delivers object, storage system that runs on commodity hardware and delivers object,
@@ -660,6 +661,7 @@ Breaks: ceph (<< 10), @@ -662,6 +663,7 @@ Breaks: ceph (<< 10),
ceph-test (<< 9.0.3-1646), ceph-test (<< 9.0.3-1646),
librbd1 (<< 0.92-1238), librbd1 (<< 0.92-1238),
python-ceph (<< 0.92-1223), python-ceph (<< 0.92-1223),

7
patches/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch → patches/0004-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch
View File

@ -9,12 +9,13 @@ The `override_dh_installdocs` target was left over as empty override
by MISTAKE in uptream commit c3a53010af432e77f74bcb46e7205c5500b6af77, by MISTAKE in uptream commit c3a53010af432e77f74bcb46e7205c5500b6af77,
fix that by just dropping it completely. fix that by just dropping it completely.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/rules | 2 +- debian/rules | 4 +---
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/debian/rules b/debian/rules diff --git a/debian/rules b/debian/rules
index 3ac923f71a..d9927b3e0d 100755 index b123ae95424..1e33397f55b 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -81,9 +81,7 @@ override_dh_auto_install: @@ -81,9 +81,7 @@ override_dh_auto_install:

7
patches/0009-remove-legacy-pve-ceph-osd-activation-script-in-post.patch → patches/0005-remove-legacy-pve-ceph-osd-activation-script-in-post.patch
View File

@ -1,8 +1,8 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak@proxmox.com> From: Dominik Csapak <d.csapak@proxmox.com>
Date: Thu, 27 Jun 2019 14:37:06 +0200 Date: Thu, 27 Jun 2019 14:37:06 +0200
Subject: [PATCH 09/10] remove legacy pve ceph osd activation script in Subject: [PATCH] remove legacy pve ceph osd activation script in postinst of
postinst of ceph-osd ceph-osd
that service was distributed by pve-manager (but not in a regular way) that service was distributed by pve-manager (but not in a regular way)
and only executed ceph-disk activate-all and only executed ceph-disk activate-all
@ -11,12 +11,13 @@ this fails on nautilus and has to be removed when upgrading from
luminous luminous
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/ceph-osd.postinst | 13 +++++++++++++ debian/ceph-osd.postinst | 13 +++++++++++++
1 file changed, 13 insertions(+) 1 file changed, 13 insertions(+)
diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst
index 5e44548fe8..7cc1f6ce14 100644 index 5e44548fe82..fadd899cd02 100644
--- a/debian/ceph-osd.postinst --- a/debian/ceph-osd.postinst
+++ b/debian/ceph-osd.postinst +++ b/debian/ceph-osd.postinst
@@ -25,6 +25,19 @@ case "$1" in @@ -25,6 +25,19 @@ case "$1" in

7
patches/0010-remove-legacy-init.d-ceph-script.patch → patches/0006-remove-legacy-init.d-ceph-script.patch
View File

@ -1,16 +1,17 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak@proxmox.com> From: Dominik Csapak <d.csapak@proxmox.com>
Date: Fri, 28 Jun 2019 16:31:34 +0200 Date: Fri, 28 Jun 2019 16:31:34 +0200
Subject: [PATCH 10/10] remove legacy init.d ceph script Subject: [PATCH] remove legacy init.d ceph script
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/ceph-base.install | 1 - debian/ceph-base.install | 1 -
debian/ceph-base.maintscript | 1 + debian/ceph-base.maintscript | 1 +
2 files changed, 1 insertion(+), 1 deletion(-) 2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/ceph-base.install b/debian/ceph-base.install diff --git a/debian/ceph-base.install b/debian/ceph-base.install
index 24731dc89d..7f7c56c4bc 100644 index 80aadd909e8..7bf376c87fe 100644
--- a/debian/ceph-base.install --- a/debian/ceph-base.install
+++ b/debian/ceph-base.install +++ b/debian/ceph-base.install
@@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
@ -19,7 +20,7 @@ index 24731dc89d..7f7c56c4bc 100644
usr/bin/ceph-crash usr/bin/ceph-crash
usr/bin/ceph-debugpack usr/bin/ceph-debugpack
diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript
index 196dc08413..180b7dfde4 100644 index 196dc084135..180b7dfde4d 100644
--- a/debian/ceph-base.maintscript --- a/debian/ceph-base.maintscript
+++ b/debian/ceph-base.maintscript +++ b/debian/ceph-base.maintscript
@@ -1,2 +1,3 @@ @@ -1,2 +1,3 @@

4
patches/0011-only-suggest-mgr-plugins.patch → patches/0007-ceph-mgr-only-suggest-mgr-plugins.patch
View File

@ -12,10 +12,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 5 insertions(+), 5 deletions(-) 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control diff --git a/debian/control b/debian/control
index e7a01c6ff8..692705c4c4 100644 index 37f480fc530..152b56f31c4 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -242,11 +242,11 @@ Depends: ceph-base (= ${binary:Version}), @@ -243,11 +243,11 @@ Depends: ceph-base (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
${python:Depends}, ${python:Depends},
${shlibs:Depends}, ${shlibs:Depends},

14
patches/0012-Remove-failing-actions-from-prerm.patch → patches/0008-Remove-failing-actions-from-prerm.patch
View File

@ -11,6 +11,7 @@ fails) and doesn't let us continue to #DEBHELPER#. #DEBHELPER#, however, gets
replaced by a systemd call that successfully stops the ceph services. replaced by a systemd call that successfully stops the ceph services.
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com> Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/ceph-base.prerm | 17 ----------------- debian/ceph-base.prerm | 17 -----------------
debian/ceph-mds.prerm | 17 ----------------- debian/ceph-mds.prerm | 17 -----------------
@ -20,7 +21,7 @@ Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
5 files changed, 85 deletions(-) 5 files changed, 85 deletions(-)
diff --git a/debian/ceph-base.prerm b/debian/ceph-base.prerm diff --git a/debian/ceph-base.prerm b/debian/ceph-base.prerm
index bfd7d3d6f..37460790a 100644 index bfd7d3d6fb2..37460790a09 100644
--- a/debian/ceph-base.prerm --- a/debian/ceph-base.prerm
+++ b/debian/ceph-base.prerm +++ b/debian/ceph-base.prerm
@@ -1,23 +1,6 @@ @@ -1,23 +1,6 @@
@ -48,7 +49,7 @@ index bfd7d3d6f..37460790a 100644
exit 0 exit 0
diff --git a/debian/ceph-mds.prerm b/debian/ceph-mds.prerm diff --git a/debian/ceph-mds.prerm b/debian/ceph-mds.prerm
index 654518a7d..37460790a 100644 index 654518a7d55..37460790a09 100644
--- a/debian/ceph-mds.prerm --- a/debian/ceph-mds.prerm
+++ b/debian/ceph-mds.prerm +++ b/debian/ceph-mds.prerm
@@ -1,23 +1,6 @@ @@ -1,23 +1,6 @@
@ -76,7 +77,7 @@ index 654518a7d..37460790a 100644
exit 0 exit 0
diff --git a/debian/ceph-mgr.prerm b/debian/ceph-mgr.prerm diff --git a/debian/ceph-mgr.prerm b/debian/ceph-mgr.prerm
index 6fb7b245a..37460790a 100644 index 6fb7b245a78..37460790a09 100644
--- a/debian/ceph-mgr.prerm --- a/debian/ceph-mgr.prerm
+++ b/debian/ceph-mgr.prerm +++ b/debian/ceph-mgr.prerm
@@ -1,23 +1,6 @@ @@ -1,23 +1,6 @@
@ -104,7 +105,7 @@ index 6fb7b245a..37460790a 100644
exit 0 exit 0
diff --git a/debian/ceph-mon.prerm b/debian/ceph-mon.prerm diff --git a/debian/ceph-mon.prerm b/debian/ceph-mon.prerm
index 5f64058a5..37460790a 100644 index 5f64058a5da..37460790a09 100644
--- a/debian/ceph-mon.prerm --- a/debian/ceph-mon.prerm
+++ b/debian/ceph-mon.prerm +++ b/debian/ceph-mon.prerm
@@ -1,23 +1,6 @@ @@ -1,23 +1,6 @@
@ -132,7 +133,7 @@ index 5f64058a5..37460790a 100644
exit 0 exit 0
diff --git a/debian/ceph-osd.prerm b/debian/ceph-osd.prerm diff --git a/debian/ceph-osd.prerm b/debian/ceph-osd.prerm
index 40f07b621..37460790a 100644 index 40f07b62152..37460790a09 100644
--- a/debian/ceph-osd.prerm --- a/debian/ceph-osd.prerm
+++ b/debian/ceph-osd.prerm +++ b/debian/ceph-osd.prerm
@@ -1,23 +1,6 @@ @@ -1,23 +1,6 @@
@ -159,6 +160,3 @@ index 40f07b621..37460790a 100644
#DEBHELPER# #DEBHELPER#
exit 0 exit 0
--
2.20.1

34
patches/0013-d-control-move-python-dependencies-over-to-python3.patch → patches/0009-d-control-move-python-dependencies-over-to-python3.patch
View File

@ -5,15 +5,15 @@ Subject: [PATCH] d/control: move python dependencies over to python3
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/control | 24 ++++++++++++------------ debian/control | 23 ++++++++++++-----------
debian/rules | 10 ------------ debian/rules | 10 ----------
2 files changed, 12 insertions(+), 22 deletions(-) 2 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/debian/control b/debian/control diff --git a/debian/control b/debian/control
index c93aa3c21..aa8edb3d2 100644 index 152b56f31c4..5b23b2c78ae 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -137,7 +137,7 @@ Depends: binutils, @@ -138,7 +138,7 @@ Depends: binutils,
parted, parted,
psmisc, psmisc,
${misc:Depends}, ${misc:Depends},
@ -22,7 +22,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends}, ${shlibs:Depends},
Recommends: btrfs-tools, Recommends: btrfs-tools,
ceph-mds (= ${binary:Version}), ceph-mds (= ${binary:Version}),
@@ -185,7 +185,7 @@ Package: cephadm @@ -186,7 +186,7 @@ Package: cephadm
Architecture: linux-any Architecture: linux-any
Recommends: podman (>= 2.0.2) | docker.io Recommends: podman (>= 2.0.2) | docker.io
Depends: lvm2, Depends: lvm2,
@ -31,7 +31,7 @@ index c93aa3c21..aa8edb3d2 100644
Description: cephadm utility to bootstrap ceph daemons with systemd and containers Description: cephadm utility to bootstrap ceph daemons with systemd and containers
Ceph is a massively scalable, open-source, distributed Ceph is a massively scalable, open-source, distributed
storage system that runs on commodity hardware and delivers object, storage system that runs on commodity hardware and delivers object,
@@ -239,8 +239,9 @@ Depends: ceph-base (= ${binary:Version}), @@ -240,8 +240,9 @@ Depends: ceph-base (= ${binary:Version}),
python3-werkzeug, python3-werkzeug,
libsqlite3-mod-ceph (= ${binary:Version}), libsqlite3-mod-ceph (= ${binary:Version}),
librados2 (= ${binary:Version}), librados2 (= ${binary:Version}),
@ -42,7 +42,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends}, ${shlibs:Depends},
Suggests: ceph-mgr-dashboard, Suggests: ceph-mgr-dashboard,
ceph-mgr-diskprediction-local, ceph-mgr-diskprediction-local,
@@ -267,7 +267,7 @@ Depends: ceph-mgr (= ${binary:Version}), @@ -268,7 +269,7 @@ Depends: ceph-mgr (= ${binary:Version}),
python3-werkzeug, python3-werkzeug,
python3-routes, python3-routes,
${misc:Depends}, ${misc:Depends},
@ -51,7 +51,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends}, ${shlibs:Depends},
Description: dashboard module for ceph-mgr Description: dashboard module for ceph-mgr
Ceph is a massively scalable, open-source, distributed Ceph is a massively scalable, open-source, distributed
@@ -288,7 +288,7 @@ Depends: ceph-mgr (= ${binary:Version}), @@ -289,7 +290,7 @@ Depends: ceph-mgr (= ${binary:Version}),
python3-scipy, python3-scipy,
python3-sklearn, python3-sklearn,
${misc:Depends}, ${misc:Depends},
@ -60,7 +60,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends}, ${shlibs:Depends},
Description: diskprediction-local module for ceph-mgr Description: diskprediction-local module for ceph-mgr
Ceph is a massively scalable, open-source, distributed Ceph is a massively scalable, open-source, distributed
@@ -301,7 +301,7 @@ Description: diskprediction-local module for ceph-mgr @@ -302,7 +303,7 @@ Description: diskprediction-local module for ceph-mgr
Package: ceph-mgr-modules-core Package: ceph-mgr-modules-core
Architecture: all Architecture: all
Depends: ${misc:Depends}, Depends: ${misc:Depends},
@ -69,7 +69,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends}, ${shlibs:Depends},
python3-dateutil, python3-dateutil,
python3-openssl, python3-openssl,
@@ -320,7 +320,7 @@ Depends: ceph-mgr (= ${binary:Version}), @@ -322,7 +323,7 @@ Architecture: all
Depends: ceph-mgr (= ${binary:Version}), Depends: ceph-mgr (= ${binary:Version}),
python3-jsonpatch python3-jsonpatch
${misc:Depends}, ${misc:Depends},
@ -78,7 +78,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends}, ${shlibs:Depends},
Description: rook module for ceph-mgr Description: rook module for ceph-mgr
Ceph is a massively scalable, open-source, distributed Ceph is a massively scalable, open-source, distributed
@@ -336,7 +336,7 @@ Architecture: all @@ -338,7 +339,7 @@ Architecture: all
Depends: ceph-mgr (= ${binary:Version}), Depends: ceph-mgr (= ${binary:Version}),
python3-kubernetes, python3-kubernetes,
${misc:Depends}, ${misc:Depends},
@ -87,7 +87,7 @@ index c93aa3c21..aa8edb3d2 100644
Description: kubernetes events module for ceph-mgr Description: kubernetes events module for ceph-mgr
Ceph is a massively scalable, open-source, distributed Ceph is a massively scalable, open-source, distributed
storage system that runs on commodity hardware and delivers object, storage system that runs on commodity hardware and delivers object,
@@ -351,7 +351,7 @@ Depends: ceph-mgr (= ${binary:Version}), @@ -353,7 +354,7 @@ Architecture: all
Depends: ceph-mgr (= ${binary:Version}), Depends: ceph-mgr (= ${binary:Version}),
cephadm, cephadm,
${misc:Depends}, ${misc:Depends},
@ -96,7 +96,7 @@ index c93aa3c21..aa8edb3d2 100644
openssh-client, openssh-client,
python3-jinja2, python3-jinja2,
python3-cherrypy3, python3-cherrypy3,
@@ -413,7 +413,7 @@ Depends: ceph-base (= ${binary:Version}), @@ -415,7 +416,7 @@ Architecture: linux-any
Depends: ceph-base (= ${binary:Version}), Depends: ceph-base (= ${binary:Version}),
sudo, sudo,
${misc:Depends}, ${misc:Depends},
@ -105,7 +105,7 @@ index c93aa3c21..aa8edb3d2 100644
${shlibs:Depends}, ${shlibs:Depends},
Replaces: ceph (<< 10), Replaces: ceph (<< 10),
ceph-test (<< 12.2.2-14), ceph-test (<< 12.2.2-14),
@@ -646,7 +646,7 @@ Depends: librbd1 (= ${binary:Version}), @@ -648,7 +649,7 @@ Depends: librbd1 (= ${binary:Version}),
python3-rbd (= ${binary:Version}), python3-rbd (= ${binary:Version}),
python3-rgw (= ${binary:Version}), python3-rgw (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
@ -115,10 +115,10 @@ index c93aa3c21..aa8edb3d2 100644
Conflicts: ceph-client-tools, Conflicts: ceph-client-tools,
Replaces: ceph (<< 10), Replaces: ceph (<< 10),
diff --git a/debian/rules b/debian/rules diff --git a/debian/rules b/debian/rules
index c93aa3c21..aa8edb3d2 100755 index 1e33397f55b..a2a06f267b5 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -141,16 +141,6 @@ @@ -141,16 +141,6 @@ override_dh_strip:
override_dh_shlibdeps: override_dh_shlibdeps:
dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor --exclude=ceph_crypto dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor --exclude=ceph_crypto

12
patches/0014-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch → patches/0010-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 files changed, 11 insertions(+), 12 deletions(-) 6 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/systemd/ceph-mds@.service.in b/systemd/ceph-mds@.service.in diff --git a/systemd/ceph-mds@.service.in b/systemd/ceph-mds@.service.in
index e47738a27..eeab101b5 100644 index afa36702f9c..03ffbc1fa10 100644
--- a/systemd/ceph-mds@.service.in --- a/systemd/ceph-mds@.service.in
+++ b/systemd/ceph-mds@.service.in +++ b/systemd/ceph-mds@.service.in
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
@ -29,7 +29,7 @@ index e47738a27..eeab101b5 100644
[Service] [Service]
Environment=CLUSTER=ceph Environment=CLUSTER=ceph
diff --git a/systemd/ceph-mgr@.service.in b/systemd/ceph-mgr@.service.in diff --git a/systemd/ceph-mgr@.service.in b/systemd/ceph-mgr@.service.in
index 0ff9db237..aea3af40a 100644 index 8fadc4746b3..79ea740a76c 100644
--- a/systemd/ceph-mgr@.service.in --- a/systemd/ceph-mgr@.service.in
+++ b/systemd/ceph-mgr@.service.in +++ b/systemd/ceph-mgr@.service.in
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
@ -44,7 +44,7 @@ index 0ff9db237..aea3af40a 100644
[Service] [Service]
Environment=CLUSTER=ceph Environment=CLUSTER=ceph
diff --git a/systemd/ceph-mon@.service.in b/systemd/ceph-mon@.service.in diff --git a/systemd/ceph-mon@.service.in b/systemd/ceph-mon@.service.in
index d3121d59d..7992d502a 100644 index 2eba83c3cc9..a2a619d7f36 100644
--- a/systemd/ceph-mon@.service.in --- a/systemd/ceph-mon@.service.in
+++ b/systemd/ceph-mon@.service.in +++ b/systemd/ceph-mon@.service.in
@@ -6,8 +6,8 @@ PartOf=ceph-mon.target @@ -6,8 +6,8 @@ PartOf=ceph-mon.target
@ -59,7 +59,7 @@ index d3121d59d..7992d502a 100644
[Service] [Service]
Environment=CLUSTER=ceph Environment=CLUSTER=ceph
diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in
index 2e5ea6ae4..987656da7 100644 index 046500efb66..c988cf34513 100644
--- a/systemd/ceph-osd@.service.in --- a/systemd/ceph-osd@.service.in
+++ b/systemd/ceph-osd@.service.in +++ b/systemd/ceph-osd@.service.in
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
@ -74,7 +74,7 @@ index 2e5ea6ae4..987656da7 100644
[Service] [Service]
Environment=CLUSTER=ceph Environment=CLUSTER=ceph
diff --git a/systemd/ceph-radosgw@.service.in b/systemd/ceph-radosgw@.service.in diff --git a/systemd/ceph-radosgw@.service.in b/systemd/ceph-radosgw@.service.in
index dee501b47..d1bcf5bb7 100644 index b7474705506..5cccc21ee43 100644
--- a/systemd/ceph-radosgw@.service.in --- a/systemd/ceph-radosgw@.service.in
+++ b/systemd/ceph-radosgw@.service.in +++ b/systemd/ceph-radosgw@.service.in
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
@ -89,7 +89,7 @@ index dee501b47..d1bcf5bb7 100644
[Service] [Service]
Environment=CLUSTER=ceph Environment=CLUSTER=ceph
diff --git a/systemd/rbdmap.service.in b/systemd/rbdmap.service.in diff --git a/systemd/rbdmap.service.in b/systemd/rbdmap.service.in
index 6644508cf..96f7d54e7 100644 index 6644508cf0d..96f7d54e7c7 100644
--- a/systemd/rbdmap.service.in --- a/systemd/rbdmap.service.in
+++ b/systemd/rbdmap.service.in +++ b/systemd/rbdmap.service.in
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@

5
patches/0015-d-control-drop-outdated-build-dependencies-and-bump-.patch → patches/0011-d-control-bump-compat-to-10.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] d/control: bump compat to 10
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/compat | 2 +- debian/compat | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/compat b/debian/compat diff --git a/debian/compat b/debian/compat
index ec635144f60..f599e28b8ab 100644 index ec635144f60..f599e28b8ab 100644
@ -15,6 +15,3 @@ index ec635144f60..f599e28b8ab 100644
@@ -1 +1 @@ @@ -1 +1 @@
-9 -9
+10 +10
--
2.29.2

6
patches/0015-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch → patches/0012-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch
View File

@ -10,12 +10,13 @@ crashing on older CPU architectures. -O1 causes those optimizations to
be implemented manually via runtime dispatch. be implemented manually via runtime dispatch.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
src/erasure-code/jerasure/CMakeLists.txt | 2 +- src/erasure-code/jerasure/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/erasure-code/jerasure/CMakeLists.txt b/src/erasure-code/jerasure/CMakeLists.txt diff --git a/src/erasure-code/jerasure/CMakeLists.txt b/src/erasure-code/jerasure/CMakeLists.txt
index f9cd22e11..b0a355235 100644 index f9cd22e1176..b0a355235d3 100644
--- a/src/erasure-code/jerasure/CMakeLists.txt --- a/src/erasure-code/jerasure/CMakeLists.txt
+++ b/src/erasure-code/jerasure/CMakeLists.txt +++ b/src/erasure-code/jerasure/CMakeLists.txt
@@ -67,7 +67,7 @@ endif() @@ -67,7 +67,7 @@ endif()
@ -27,6 +28,3 @@ index f9cd22e11..b0a355235 100644
set_target_properties(gf-complete_objs PROPERTIES set_target_properties(gf-complete_objs PROPERTIES
COMPILE_DEFINITIONS "${GF_COMPILE_FLAGS}") COMPILE_DEFINITIONS "${GF_COMPILE_FLAGS}")
--
2.39.2

12
patches/0016-d-rules-fix-no-restart-on-upgrade.patch → patches/0013-d-rules-also-add-no-restart-after-upgrade-parameter.patch
View File

@ -1,10 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com> From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Wed, 20 May 2021 15:36:34 +0200 Date: Thu, 20 May 2021 15:36:34 +0200
Subject: [PATCH] d/rules: also add --no-restart-after-upgrade parameter Subject: [PATCH] d/rules: also add --no-restart-after-upgrade parameter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
is only a problem with dh compat >= 10 as that enables the is only a problem with dh compat >= 10 as that enables the
restart-after-upgrade by default. restart-after-upgrade by default.
@ -18,11 +15,11 @@ explicit.
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/rules | 3 +++ debian/rules | 2 +-
1 file changed, 3 insertions(+) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/rules b/debian/rules diff --git a/debian/rules b/debian/rules
index b5ce42c6f3..00e9ac6b16 100755 index a2a06f267b5..9da4c80fcc6 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -104,7 +104,7 @@ override_dh_installinit: @@ -104,7 +104,7 @@ override_dh_installinit:
@ -34,4 +31,3 @@ index b5ce42c6f3..00e9ac6b16 100755
override_dh_systemd_enable: override_dh_systemd_enable:
# systemd enable done as part of dh_installinit # systemd enable done as part of dh_installinit

0
patches/0017-python3.10-pep-620.patch → patches/0013-python3.10-pep-620.patch
View File

2
patches/0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch → patches/0014-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ceph-crash.in b/src/ceph-crash.in diff --git a/src/ceph-crash.in b/src/ceph-crash.in
index 0e02837fa..010d6ea2e 100755 index 0e02837fadd..010d6ea2e82 100755
--- a/src/ceph-crash.in --- a/src/ceph-crash.in
+++ b/src/ceph-crash.in +++ b/src/ceph-crash.in
@@ -97,7 +97,7 @@ def drop_privs(): @@ -97,7 +97,7 @@ def drop_privs():

24
patches/0021-backport-mgr-dashboard-simplify-authentication-proto.patch → patches/0015-backport-mgr-dashboard-simplify-authentication-proto.patch
View File

@ -22,6 +22,7 @@ enabled.
Fixes: https://forum.proxmox.com/threads/ceph-warning-post-upgrade-to-v8.129371 Fixes: https://forum.proxmox.com/threads/ceph-warning-post-upgrade-to-v8.129371
Signed-off-by: Daniel Persson <mailto.woden@gmail.com> Signed-off-by: Daniel Persson <mailto.woden@gmail.com>
Signed-off-by: Max Carrara <m.carrara@proxmox.com> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
ceph.spec.in | 4 -- ceph.spec.in | 4 --
debian/control | 1 - debian/control | 1 -
@ -34,7 +35,7 @@ Signed-off-by: Max Carrara <m.carrara@proxmox.com>
8 files changed, 75 insertions(+), 16 deletions(-) 8 files changed, 75 insertions(+), 16 deletions(-)
diff --git a/ceph.spec.in b/ceph.spec.in diff --git a/ceph.spec.in b/ceph.spec.in
index e4cbbef6943..457d7a6dc56 100644 index 2af66b1d432..447f8249566 100644
--- a/ceph.spec.in --- a/ceph.spec.in
+++ b/ceph.spec.in +++ b/ceph.spec.in
@@ -403,7 +403,6 @@ BuildRequires: xmlsec1-nss @@ -403,7 +403,6 @@ BuildRequires: xmlsec1-nss
@ -53,15 +54,15 @@ index e4cbbef6943..457d7a6dc56 100644
BuildRequires: python%{python3_pkgversion}-Routes BuildRequires: python%{python3_pkgversion}-Routes
BuildRequires: python%{python3_pkgversion}-Werkzeug BuildRequires: python%{python3_pkgversion}-Werkzeug
BuildRequires: python%{python3_pkgversion}-numpy-devel BuildRequires: python%{python3_pkgversion}-numpy-devel
@@ -608,7 +606,6 @@ Requires: ceph-prometheus-alerts = %{_epoch_prefix}%{version}-%{release} @@ -611,7 +609,6 @@ Requires: ceph-prometheus-alerts = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-setuptools Requires: python%{python3_pkgversion}-setuptools
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
Requires: python%{python3_pkgversion}-cherrypy Requires: python%{python3_pkgversion}-cherrypy
-Requires: python%{python3_pkgversion}-jwt -Requires: python%{python3_pkgversion}-jwt
Requires: python%{python3_pkgversion}-routes Requires: python%{python3_pkgversion}-routes
Requires: python%{python3_pkgversion}-werkzeug Requires: python%{python3_pkgversion}-werkzeug
%if 0%{?weak_deps} %if 0%{?weak_deps}
@@ -617,7 +614,6 @@ Recommends: python%{python3_pkgversion}-saml @@ -620,7 +617,6 @@ Recommends: python%{python3_pkgversion}-saml
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: python%{python3_pkgversion}-CherryPy Requires: python%{python3_pkgversion}-CherryPy
@ -70,7 +71,7 @@ index e4cbbef6943..457d7a6dc56 100644
Requires: python%{python3_pkgversion}-Werkzeug Requires: python%{python3_pkgversion}-Werkzeug
Recommends: python%{python3_pkgversion}-python3-saml Recommends: python%{python3_pkgversion}-python3-saml
diff --git a/debian/control b/debian/control diff --git a/debian/control b/debian/control
index e3f2073ce8f..ba34a163f54 100644 index 5b23b2c78ae..61ae922a031 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -87,7 +87,6 @@ Build-Depends: automake, @@ -87,7 +87,6 @@ Build-Depends: automake,
@ -113,25 +114,25 @@ index 96cbc523356..d396a38d2c3 100644
+class InvalidAlgorithmError(Exception): +class InvalidAlgorithmError(Exception):
+ pass + pass
diff --git a/src/pybind/mgr/dashboard/requirements-lint.txt b/src/pybind/mgr/dashboard/requirements-lint.txt diff --git a/src/pybind/mgr/dashboard/requirements-lint.txt b/src/pybind/mgr/dashboard/requirements-lint.txt
index d82fa1ace1d..5fe9957c32a 100644 index 57e51915740..571c92a4ebf 100644
--- a/src/pybind/mgr/dashboard/requirements-lint.txt --- a/src/pybind/mgr/dashboard/requirements-lint.txt
+++ b/src/pybind/mgr/dashboard/requirements-lint.txt +++ b/src/pybind/mgr/dashboard/requirements-lint.txt
@@ -9,3 +9,4 @@ autopep8==1.5.7 @@ -9,3 +9,4 @@ autopep8==1.5.7
pyfakefs==4.5.0 pyfakefs==4.5.0
isort==5.5.3 isort==5.5.3
jsonschema==4.16.0 jsonschema~=4.0
+PyJWT~=2.0 +PyJWT~=2.0
diff --git a/src/pybind/mgr/dashboard/requirements-test.txt b/src/pybind/mgr/dashboard/requirements-test.txt diff --git a/src/pybind/mgr/dashboard/requirements-test.txt b/src/pybind/mgr/dashboard/requirements-test.txt
index 4e925e8616f..78fd1d5b742 100644 index da283d0b64a..aa80b3336b5 100644
--- a/src/pybind/mgr/dashboard/requirements-test.txt --- a/src/pybind/mgr/dashboard/requirements-test.txt
+++ b/src/pybind/mgr/dashboard/requirements-test.txt +++ b/src/pybind/mgr/dashboard/requirements-test.txt
@@ -2,3 +2,4 @@ pytest-cov @@ -2,3 +2,4 @@ pytest-cov
pytest-instafail pytest-instafail
pyfakefs==4.5.0 pyfakefs==4.5.0
jsonschema==4.16.0 jsonschema~=4.0
+PyJWT~=2.0 +PyJWT~=2.0
diff --git a/src/pybind/mgr/dashboard/requirements.txt b/src/pybind/mgr/dashboard/requirements.txt diff --git a/src/pybind/mgr/dashboard/requirements.txt b/src/pybind/mgr/dashboard/requirements.txt
index 8003d62a552..292971819c9 100644 index 01f468afc53..24bb3d3864d 100644
--- a/src/pybind/mgr/dashboard/requirements.txt --- a/src/pybind/mgr/dashboard/requirements.txt
+++ b/src/pybind/mgr/dashboard/requirements.txt +++ b/src/pybind/mgr/dashboard/requirements.txt
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
@ -274,6 +275,3 @@ index f13963abffd..3c600231252 100644
except UserDoesNotExist: except UserDoesNotExist:
cls.logger.debug( # type: ignore cls.logger.debug( # type: ignore
"Invalid token: user %s does not exist", dtoken['username'] "Invalid token: user %s does not exist", dtoken['username']
--
2.39.2

19
patches/0024-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch → patches/0016-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch
View File

@ -1,4 +1,4 @@
From 232b1fa3210a56354b27f9c6154819307412b91c Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Friedrich Weber <f.weber@proxmox.com> From: Friedrich Weber <f.weber@proxmox.com>
Date: Thu, 8 Feb 2024 16:20:08 +0100 Date: Thu, 8 Feb 2024 16:20:08 +0100
Subject: [PATCH] ceph-osd postinst: do not always reload all sysctl settings Subject: [PATCH] ceph-osd postinst: do not always reload all sysctl settings
@ -21,27 +21,24 @@ will need to be adjusted to apply the sysctl settings on upgrade too.
Suggested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> Suggested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Friedrich Weber <f.weber@proxmox.com> Signed-off-by: Friedrich Weber <f.weber@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/ceph-osd.postinst | 6 +++++- debian/ceph-osd.postinst | 5 ++++-
1 file changed, 5 insertions(+), 1 deletion(-) 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst
index 04e33b8601f..2bcd8d4dcb4 100644 index fadd899cd02..dce5335da03 100644
--- a/debian/ceph-osd.postinst --- a/debian/ceph-osd.postinst
+++ b/debian/ceph-osd.postinst +++ b/debian/ceph-osd.postinst
@@ -24,7 +24,11 @@ set -e @@ -23,7 +23,10 @@ set -e
case "$1" in case "$1" in
configure) configure)
- [ -x /etc/init.d/procps ] && invoke-rc.d procps restart || : - [ -x /etc/init.d/procps ] && invoke-rc.d procps restart || :
+ # apply (only) new parameters, but only on fresh install + # apply (only) new parameters, but only on fresh install
+ if [ -z "$2" ]; then + if [ -z "$2" ]; then
+ /lib/systemd/systemd-sysctl /etc/sysctl.d/30-ceph-osd.conf \ + /lib/systemd/systemd-sysctl /etc/sysctl.d/30-ceph-osd.conf >/dev/null || :
+ >/dev/null || :
+ fi + fi
[ -x /sbin/start ] && start ceph-osd-all || : [ -x /sbin/start ] && start ceph-osd-all || :
;;
abort-upgrade|abort-remove|abort-deconfigure)
--
2.39.2
# remove legacy osd activation service, FIXME remove with next ceph >> 14

10
patches/0022-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch → patches/0017-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch
View File

@ -35,12 +35,13 @@ These changes allow the dashboard to launch with TLS enabled again.
[1]: https://docs.ceph.com/en/reef/mgr/dashboard/#ssl-tls-support [1]: https://docs.ceph.com/en/reef/mgr/dashboard/#ssl-tls-support
Signed-off-by: Max Carrara <m.carrara@proxmox.com> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
src/pybind/mgr/dashboard/module.py | 58 ++++++++++++++++++++++-------- src/pybind/mgr/dashboard/module.py | 58 ++++++++++++++++++++++--------
1 file changed, 43 insertions(+), 15 deletions(-) 1 file changed, 43 insertions(+), 15 deletions(-)
diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
index 68725be6e35..c8b263d9786 100644 index 3482663dbfa..46063e3a0c6 100644
--- a/src/pybind/mgr/dashboard/module.py --- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py +++ b/src/pybind/mgr/dashboard/module.py
@@ -23,8 +23,7 @@ if TYPE_CHECKING: @@ -23,8 +23,7 @@ if TYPE_CHECKING:
@ -53,7 +54,7 @@ index 68725be6e35..c8b263d9786 100644
from . import mgr from . import mgr
from .controllers import Router, json_error_page from .controllers import Router, json_error_page
@@ -172,11 +171,29 @@ class CherryPyConfig(object): @@ -168,11 +167,29 @@ class CherryPyConfig(object):
else: else:
pkey_fname = self.get_localized_module_option('key_file') # type: ignore pkey_fname = self.get_localized_module_option('key_file') # type: ignore
@ -87,7 +88,7 @@ index 68725be6e35..c8b263d9786 100644
if sys.version_info >= (3, 7): if sys.version_info >= (3, 7):
if Settings.UNSAFE_TLS_v1_2: if Settings.UNSAFE_TLS_v1_2:
context.minimum_version = ssl.TLSVersion.TLSv1_2 context.minimum_version = ssl.TLSVersion.TLSv1_2
@@ -473,15 +490,26 @@ class Module(MgrModule, CherryPyConfig): @@ -469,15 +486,26 @@ class Module(MgrModule, CherryPyConfig):
@CLIWriteCommand("dashboard create-self-signed-cert") @CLIWriteCommand("dashboard create-self-signed-cert")
def set_mgr_created_self_signed_cert(self): def set_mgr_created_self_signed_cert(self):
@ -123,6 +124,3 @@ index 68725be6e35..c8b263d9786 100644
@CLIWriteCommand("dashboard set-rgw-credentials") @CLIWriteCommand("dashboard set-rgw-credentials")
def set_rgw_credentials(self): def set_rgw_credentials(self):
--
2.39.2

4
patches/0025-debian-recursively-adjust-permissions-of-var-lib-cep.patch → patches/0018-debian-recursively-adjust-permissions-of-var-lib-cep.patch
View File

@ -18,6 +18,7 @@ of `find | xargs`.
[0]: https://github.com/ceph/ceph/pull/48713 [0]: https://github.com/ceph/ceph/pull/48713
Signed-off-by: Max Carrara <m.carrara@proxmox.com> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
debian/ceph-base.postinst | 16 +++++++++------- debian/ceph-base.postinst | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-) 1 file changed, 9 insertions(+), 7 deletions(-)
@ -49,6 +50,3 @@ index 75eeb59c624..424c2c889d5 100644
;; ;;
abort-upgrade|abort-remove|abort-deconfigure) abort-upgrade|abort-remove|abort-deconfigure)
: :
--
2.39.2

6
patches/0026-ceph-crash-change-order-of-client-names.patch → patches/0019-ceph-crash-change-order-of-client-names.patch
View File

@ -6,12 +6,13 @@ Subject: [PATCH] ceph-crash: change order of client names
This simply puts 'client.crash' before 'client.crash.${HOSTNAME}'. This simply puts 'client.crash' before 'client.crash.${HOSTNAME}'.
Signed-off-by: Max Carrara <m.carrara@proxmox.com> Signed-off-by: Max Carrara <m.carrara@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
src/ceph-crash.in | 4 ++-- src/ceph-crash.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ceph-crash.in b/src/ceph-crash.in diff --git a/src/ceph-crash.in b/src/ceph-crash.in
index 0e02837fadd..713080a4dc1 100755 index 010d6ea2e82..d1d9f4123e6 100755
--- a/src/ceph-crash.in --- a/src/ceph-crash.in
+++ b/src/ceph-crash.in +++ b/src/ceph-crash.in
@@ -16,8 +16,8 @@ import time @@ -16,8 +16,8 @@ import time
@ -25,6 +26,3 @@ index 0e02837fadd..713080a4dc1 100755
'client.admin'] 'client.admin']
--
2.39.2

47
patches/0023-rocksb-inherit-parent-cmake-cxx-flags.patch
View File

@ -1,47 +0,0 @@
From 620b68a348f07145c49c12668576a89dee8198cb Mon Sep 17 00:00:00 2001
From: Kefu Chai <tchaikov@gmail.com>
Date: Fri, 15 Dec 2023 19:01:46 +0800
Subject: [PATCH] cmake/modules/BuildRocksDB.cmake: inherit parent's CMAKE_CXX_FLAGS
CMake allows us to customize `CMAKE_CXX_FLAGS` by setting CXXFLAGS
environmental variable. and Debian's debhelper also sets CXXFLAGS
when it builds cmake projects for customizing the building flags.
but we fail to populate this setting down when building external
projects. this is important when it comes to the projects which
is critical to the performance. RocksDB is one of them.
in this change, we pass the `CMAKE_CXX_FLAGS` down in
`BuildRocksDB.cmake` so that its `CMAKE_CXX_FLAGS` contains
the same set of `CMAKE_CXX_FLAGS` used by its parent project.
this should help with the performance in the bluestore, where
RocksDB is used.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry-picked from beb1a624921d7589db63dea066935b3aa9ce2698)
---
cmake/modules/BuildRocksDB.cmake | 4 ++--
cmake/modules/BuildRocksDB.cmake | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake
index f9a28274c40..e0208f6545b 100644
--- a/cmake/modules/BuildRocksDB.cmake
+++ b/cmake/modules/BuildRocksDB.cmake
@@ -57,12 +57,13 @@ function(build_rocksdb)
endif()
include(CheckCXXCompilerFlag)
check_cxx_compiler_flag("-Wno-deprecated-copy" HAS_WARNING_DEPRECATED_COPY)
+ set(rocksdb_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
if(HAS_WARNING_DEPRECATED_COPY)
- set(rocksdb_CXX_FLAGS -Wno-deprecated-copy)
+ string(APPEND rocksdb_CXX_FLAGS " -Wno-deprecated-copy")
endif()
check_cxx_compiler_flag("-Wno-pessimizing-move" HAS_WARNING_PESSIMIZING_MOVE)
if(HAS_WARNING_PESSIMIZING_MOVE)
- set(rocksdb_CXX_FLAGS "${rocksdb_CXX_FLAGS} -Wno-pessimizing-move")
+ string(APPEND rocksdb_CXX_FLAGS " -Wno-pessimizing-move")
endif()
if(rocksdb_CXX_FLAGS)
list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_CXX_FLAGS='${rocksdb_CXX_FLAGS}')

37
patches/series
View File

@ -1,21 +1,20 @@
0001-cmake-disable-version-from-git.patch 0001-cmake-disable-version-from-git.patch
0002-enable-systemd-targets-by-default.patch 0002-enable-systemd-targets-by-default.patch
0006-debian-control-add-break-libpvestorage-perl.patch 0003-debian-control-add-break-libpvestorage-perl.patch
0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch 0004-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch
0009-remove-legacy-pve-ceph-osd-activation-script-in-post.patch 0005-remove-legacy-pve-ceph-osd-activation-script-in-post.patch
0010-remove-legacy-init.d-ceph-script.patch 0006-remove-legacy-init.d-ceph-script.patch
0011-only-suggest-mgr-plugins.patch 0007-ceph-mgr-only-suggest-mgr-plugins.patch
0012-Remove-failing-actions-from-prerm.patch 0008-Remove-failing-actions-from-prerm.patch
0013-d-control-move-python-dependencies-over-to-python3.patch 0009-d-control-move-python-dependencies-over-to-python3.patch
0014-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch 0010-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch
0015-d-control-drop-outdated-build-dependencies-and-bump-.patch 0011-d-control-bump-compat-to-10.patch
0015-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch 0012-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch
0016-d-rules-fix-no-restart-on-upgrade.patch 0013-d-rules-also-add-no-restart-after-upgrade-parameter.patch
0017-python3.10-pep-620.patch 0013-python3.10-pep-620.patch
0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch 0014-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch
0021-backport-mgr-dashboard-simplify-authentication-proto.patch 0015-backport-mgr-dashboard-simplify-authentication-proto.patch
0022-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch 0016-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch
0023-rocksb-inherit-parent-cmake-cxx-flags.patch 0017-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch
0024-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch 0018-debian-recursively-adjust-permissions-of-var-lib-cep.patch
0025-debian-recursively-adjust-permissions-of-var-lib-cep.patch 0019-ceph-crash-change-order-of-client-names.patch
0026-ceph-crash-change-order-of-client-names.patch