diff --git a/patches/0001-cmake-disable-version-from-git.patch b/patches/0001-cmake-disable-version-from-git.patch index f2f8605d4..b581168b8 100644 --- a/patches/0001-cmake-disable-version-from-git.patch +++ b/patches/0001-cmake-disable-version-from-git.patch @@ -7,11 +7,11 @@ to avoid that the parent (packaging) git info is used.. Signed-off-by: Thomas Lamprecht --- - ceph/src/CMakeLists.txt | 7 ------- + src/CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index bb4a7812d..ea4789522 100644 +index cdc183d2463..5f92eafd95b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,17 +35,10 @@ configure_file(ceph-crash.in diff --git a/patches/0002-enable-systemd-targets-by-default.patch b/patches/0002-enable-systemd-targets-by-default.patch index 88a66b842..4da78990d 100644 --- a/patches/0002-enable-systemd-targets-by-default.patch +++ b/patches/0002-enable-systemd-targets-by-default.patch @@ -7,12 +7,13 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler +Signed-off-by: Thomas Lamprecht --- - debian/rules | 3 +++ - 1 file changed, 3 insertions(+) + debian/rules | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/debian/rules b/debian/rules -index b5ce42c6f3..00e9ac6b16 100755 +index 9f49deabb0e..b123ae95424 100755 --- a/debian/rules +++ b/debian/rules @@ -98,6 +98,11 @@ override_dh_installinit: diff --git a/patches/0006-debian-control-add-break-libpvestorage-perl.patch b/patches/0003-debian-control-add-break-libpvestorage-perl.patch similarity index 83% rename from patches/0006-debian-control-add-break-libpvestorage-perl.patch rename to patches/0003-debian-control-add-break-libpvestorage-perl.patch index 928e953d4..4b2e75f81 100644 --- a/patches/0006-debian-control-add-break-libpvestorage-perl.patch +++ b/patches/0003-debian-control-add-break-libpvestorage-perl.patch @@ -3,15 +3,16 @@ From: Alwin Antreich Date: Wed, 24 Oct 2018 10:38:19 +0200 Subject: [PATCH] debian/control: add break libpvestorage-perl +Signed-off-by: Thomas Lamprecht --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control -index 83dc414788..1cfa2250de 100644 +index 55eacdd4971..37f480fc530 100644 --- a/debian/control +++ b/debian/control -@@ -154,6 +154,7 @@ Replaces: ceph (<< 10), +@@ -155,6 +155,7 @@ Replaces: ceph (<< 10), Breaks: ceph (<< 10), ceph-test (<< 12.2.2-14), python-ceph (<< 0.92-1223), @@ -19,7 +20,7 @@ index 83dc414788..1cfa2250de 100644 Description: common ceph daemon libraries and management tools Ceph is a massively scalable, open-source, distributed 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), librbd1 (<< 0.92-1238), python-ceph (<< 0.92-1223), diff --git a/patches/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch b/patches/0004-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch similarity index 79% rename from patches/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch rename to patches/0004-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch index e70f63888..d26d93357 100644 --- a/patches/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch +++ b/patches/0004-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch @@ -9,12 +9,13 @@ The `override_dh_installdocs` target was left over as empty override by MISTAKE in uptream commit c3a53010af432e77f74bcb46e7205c5500b6af77, fix that by just dropping it completely. +Signed-off-by: Thomas Lamprecht --- - debian/rules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + debian/rules | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules -index 3ac923f71a..d9927b3e0d 100755 +index b123ae95424..1e33397f55b 100755 --- a/debian/rules +++ b/debian/rules @@ -81,9 +81,7 @@ override_dh_auto_install: @@ -27,4 +28,4 @@ index 3ac923f71a..d9927b3e0d 100755 + dh_installchangelogs --exclude doc/changelog changelog.upstream override_dh_installlogrotate: - cp src/logrotate.conf debian/ceph-common.logrotate + cp src/logrotate.conf debian/ceph-common.logrotate diff --git a/patches/0009-remove-legacy-pve-ceph-osd-activation-script-in-post.patch b/patches/0005-remove-legacy-pve-ceph-osd-activation-script-in-post.patch similarity index 88% rename from patches/0009-remove-legacy-pve-ceph-osd-activation-script-in-post.patch rename to patches/0005-remove-legacy-pve-ceph-osd-activation-script-in-post.patch index 2324fd402..3d68db942 100644 --- a/patches/0009-remove-legacy-pve-ceph-osd-activation-script-in-post.patch +++ b/patches/0005-remove-legacy-pve-ceph-osd-activation-script-in-post.patch @@ -1,8 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Thu, 27 Jun 2019 14:37:06 +0200 -Subject: [PATCH 09/10] remove legacy pve ceph osd activation script in - postinst of ceph-osd +Subject: [PATCH] remove legacy pve ceph osd activation script in postinst of + ceph-osd that service was distributed by pve-manager (but not in a regular way) and only executed ceph-disk activate-all @@ -11,12 +11,13 @@ this fails on nautilus and has to be removed when upgrading from luminous Signed-off-by: Dominik Csapak +Signed-off-by: Thomas Lamprecht --- debian/ceph-osd.postinst | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 +++ b/debian/ceph-osd.postinst @@ -25,6 +25,19 @@ case "$1" in diff --git a/patches/0010-remove-legacy-init.d-ceph-script.patch b/patches/0006-remove-legacy-init.d-ceph-script.patch similarity index 82% rename from patches/0010-remove-legacy-init.d-ceph-script.patch rename to patches/0006-remove-legacy-init.d-ceph-script.patch index 074bf2190..ad0df9225 100644 --- a/patches/0010-remove-legacy-init.d-ceph-script.patch +++ b/patches/0006-remove-legacy-init.d-ceph-script.patch @@ -1,16 +1,17 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dominik Csapak 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 +Signed-off-by: Thomas Lamprecht --- debian/ceph-base.install | 1 - debian/ceph-base.maintscript | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) 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 +++ b/debian/ceph-base.install @@ -1,4 +1,3 @@ @@ -19,7 +20,7 @@ index 24731dc89d..7f7c56c4bc 100644 usr/bin/ceph-crash usr/bin/ceph-debugpack 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 +++ b/debian/ceph-base.maintscript @@ -1,2 +1,3 @@ diff --git a/patches/0011-only-suggest-mgr-plugins.patch b/patches/0007-ceph-mgr-only-suggest-mgr-plugins.patch similarity index 91% rename from patches/0011-only-suggest-mgr-plugins.patch rename to patches/0007-ceph-mgr-only-suggest-mgr-plugins.patch index cf6ce7fdc..a3f9f56db 100644 --- a/patches/0011-only-suggest-mgr-plugins.patch +++ b/patches/0007-ceph-mgr-only-suggest-mgr-plugins.patch @@ -12,10 +12,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control -index e7a01c6ff8..692705c4c4 100644 +index 37f480fc530..152b56f31c4 100644 --- a/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}, ${python:Depends}, ${shlibs:Depends}, diff --git a/patches/0012-Remove-failing-actions-from-prerm.patch b/patches/0008-Remove-failing-actions-from-prerm.patch similarity index 92% rename from patches/0012-Remove-failing-actions-from-prerm.patch rename to patches/0008-Remove-failing-actions-from-prerm.patch index 0a557eda2..a8c221774 100644 --- a/patches/0012-Remove-failing-actions-from-prerm.patch +++ b/patches/0008-Remove-failing-actions-from-prerm.patch @@ -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. Signed-off-by: Dominic Jäger +Signed-off-by: Thomas Lamprecht --- debian/ceph-base.prerm | 17 ----------------- debian/ceph-mds.prerm | 17 ----------------- @@ -20,7 +21,7 @@ Signed-off-by: Dominic Jäger 5 files changed, 85 deletions(-) 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 +++ b/debian/ceph-base.prerm @@ -1,23 +1,6 @@ @@ -48,7 +49,7 @@ index bfd7d3d6f..37460790a 100644 exit 0 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 +++ b/debian/ceph-mds.prerm @@ -1,23 +1,6 @@ @@ -76,7 +77,7 @@ index 654518a7d..37460790a 100644 exit 0 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 +++ b/debian/ceph-mgr.prerm @@ -1,23 +1,6 @@ @@ -104,7 +105,7 @@ index 6fb7b245a..37460790a 100644 exit 0 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 +++ b/debian/ceph-mon.prerm @@ -1,23 +1,6 @@ @@ -132,7 +133,7 @@ index 5f64058a5..37460790a 100644 exit 0 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 +++ b/debian/ceph-osd.prerm @@ -1,23 +1,6 @@ @@ -159,6 +160,3 @@ index 40f07b621..37460790a 100644 #DEBHELPER# exit 0 --- -2.20.1 - diff --git a/patches/0013-d-control-move-python-dependencies-over-to-python3.patch b/patches/0009-d-control-move-python-dependencies-over-to-python3.patch similarity index 82% rename from patches/0013-d-control-move-python-dependencies-over-to-python3.patch rename to patches/0009-d-control-move-python-dependencies-over-to-python3.patch index abf3f8324..e18cf2b88 100644 --- a/patches/0013-d-control-move-python-dependencies-over-to-python3.patch +++ b/patches/0009-d-control-move-python-dependencies-over-to-python3.patch @@ -5,15 +5,15 @@ Subject: [PATCH] d/control: move python dependencies over to python3 Signed-off-by: Thomas Lamprecht --- - debian/control | 24 ++++++++++++------------ - debian/rules | 10 ------------ - 2 files changed, 12 insertions(+), 22 deletions(-) + debian/control | 23 ++++++++++++----------- + debian/rules | 10 ---------- + 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/debian/control b/debian/control -index c93aa3c21..aa8edb3d2 100644 +index 152b56f31c4..5b23b2c78ae 100644 --- a/debian/control +++ b/debian/control -@@ -137,7 +137,7 @@ Depends: binutils, +@@ -138,7 +138,7 @@ Depends: binutils, parted, psmisc, ${misc:Depends}, @@ -22,7 +22,7 @@ index c93aa3c21..aa8edb3d2 100644 ${shlibs:Depends}, Recommends: btrfs-tools, ceph-mds (= ${binary:Version}), -@@ -185,7 +185,7 @@ Package: cephadm +@@ -186,7 +186,7 @@ Package: cephadm Architecture: linux-any Recommends: podman (>= 2.0.2) | docker.io Depends: lvm2, @@ -31,7 +31,7 @@ index c93aa3c21..aa8edb3d2 100644 Description: cephadm utility to bootstrap ceph daemons with systemd and containers Ceph is a massively scalable, open-source, distributed 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, libsqlite3-mod-ceph (= ${binary:Version}), librados2 (= ${binary:Version}), @@ -42,7 +42,7 @@ index c93aa3c21..aa8edb3d2 100644 ${shlibs:Depends}, Suggests: ceph-mgr-dashboard, 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-routes, ${misc:Depends}, @@ -51,7 +51,7 @@ index c93aa3c21..aa8edb3d2 100644 ${shlibs:Depends}, Description: dashboard module for ceph-mgr 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-sklearn, ${misc:Depends}, @@ -60,7 +60,7 @@ index c93aa3c21..aa8edb3d2 100644 ${shlibs:Depends}, Description: diskprediction-local module for ceph-mgr 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 Architecture: all Depends: ${misc:Depends}, @@ -69,7 +69,7 @@ index c93aa3c21..aa8edb3d2 100644 ${shlibs:Depends}, python3-dateutil, python3-openssl, -@@ -320,7 +320,7 @@ Depends: ceph-mgr (= ${binary:Version}), +@@ -322,7 +323,7 @@ Architecture: all Depends: ceph-mgr (= ${binary:Version}), python3-jsonpatch ${misc:Depends}, @@ -78,7 +78,7 @@ index c93aa3c21..aa8edb3d2 100644 ${shlibs:Depends}, Description: rook module for ceph-mgr 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}), python3-kubernetes, ${misc:Depends}, @@ -87,7 +87,7 @@ index c93aa3c21..aa8edb3d2 100644 Description: kubernetes events module for ceph-mgr Ceph is a massively scalable, open-source, distributed 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}), cephadm, ${misc:Depends}, @@ -96,7 +96,7 @@ index c93aa3c21..aa8edb3d2 100644 openssh-client, python3-jinja2, python3-cherrypy3, -@@ -413,7 +413,7 @@ Depends: ceph-base (= ${binary:Version}), +@@ -415,7 +416,7 @@ Architecture: linux-any Depends: ceph-base (= ${binary:Version}), sudo, ${misc:Depends}, @@ -105,7 +105,7 @@ index c93aa3c21..aa8edb3d2 100644 ${shlibs:Depends}, Replaces: ceph (<< 10), 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-rgw (= ${binary:Version}), ${misc:Depends}, @@ -115,10 +115,10 @@ index c93aa3c21..aa8edb3d2 100644 Conflicts: ceph-client-tools, Replaces: ceph (<< 10), diff --git a/debian/rules b/debian/rules -index c93aa3c21..aa8edb3d2 100755 +index 1e33397f55b..a2a06f267b5 100755 --- a/debian/rules +++ b/debian/rules -@@ -141,16 +141,6 @@ +@@ -141,16 +141,6 @@ override_dh_strip: override_dh_shlibdeps: dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor --exclude=ceph_crypto diff --git a/patches/0014-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch b/patches/0010-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch similarity index 94% rename from patches/0014-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch rename to patches/0010-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch index b8729d6af..2acadc748 100644 --- a/patches/0014-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch +++ b/patches/0010-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch @@ -14,7 +14,7 @@ Signed-off-by: Thomas Lamprecht 6 files changed, 11 insertions(+), 12 deletions(-) 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 +++ b/systemd/ceph-mds@.service.in @@ -2,8 +2,8 @@ @@ -29,7 +29,7 @@ index e47738a27..eeab101b5 100644 [Service] Environment=CLUSTER=ceph 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 +++ b/systemd/ceph-mgr@.service.in @@ -2,8 +2,8 @@ @@ -44,7 +44,7 @@ index 0ff9db237..aea3af40a 100644 [Service] Environment=CLUSTER=ceph 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 +++ b/systemd/ceph-mon@.service.in @@ -6,8 +6,8 @@ PartOf=ceph-mon.target @@ -59,7 +59,7 @@ index d3121d59d..7992d502a 100644 [Service] Environment=CLUSTER=ceph 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 +++ b/systemd/ceph-osd@.service.in @@ -2,8 +2,8 @@ @@ -74,7 +74,7 @@ index 2e5ea6ae4..987656da7 100644 [Service] Environment=CLUSTER=ceph 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 +++ b/systemd/ceph-radosgw@.service.in @@ -2,8 +2,8 @@ @@ -89,7 +89,7 @@ index dee501b47..d1bcf5bb7 100644 [Service] Environment=CLUSTER=ceph 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 +++ b/systemd/rbdmap.service.in @@ -1,8 +1,7 @@ diff --git a/patches/0015-d-control-drop-outdated-build-dependencies-and-bump-.patch b/patches/0011-d-control-bump-compat-to-10.patch similarity index 82% rename from patches/0015-d-control-drop-outdated-build-dependencies-and-bump-.patch rename to patches/0011-d-control-bump-compat-to-10.patch index 50335378d..ce487fa31 100644 --- a/patches/0015-d-control-drop-outdated-build-dependencies-and-bump-.patch +++ b/patches/0011-d-control-bump-compat-to-10.patch @@ -5,8 +5,8 @@ Subject: [PATCH] d/control: bump compat to 10 Signed-off-by: Thomas Lamprecht --- - debian/compat | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + debian/compat | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/compat b/debian/compat index ec635144f60..f599e28b8ab 100644 @@ -15,6 +15,3 @@ index ec635144f60..f599e28b8ab 100644 @@ -1 +1 @@ -9 +10 --- -2.29.2 - diff --git a/patches/0015-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch b/patches/0012-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch similarity index 92% rename from patches/0015-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch rename to patches/0012-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch index a44aefafb..4f4ef6de8 100644 --- a/patches/0015-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch +++ b/patches/0012-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch @@ -10,12 +10,13 @@ crashing on older CPU architectures. -O1 causes those optimizations to be implemented manually via runtime dispatch. Signed-off-by: Stefan Hanreich +Signed-off-by: Thomas Lamprecht --- src/erasure-code/jerasure/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 +++ b/src/erasure-code/jerasure/CMakeLists.txt @@ -67,7 +67,7 @@ endif() @@ -27,6 +28,3 @@ index f9cd22e11..b0a355235 100644 set_target_properties(gf-complete_objs PROPERTIES COMPILE_DEFINITIONS "${GF_COMPILE_FLAGS}") --- -2.39.2 - diff --git a/patches/0016-d-rules-fix-no-restart-on-upgrade.patch b/patches/0013-d-rules-also-add-no-restart-after-upgrade-parameter.patch similarity index 82% rename from patches/0016-d-rules-fix-no-restart-on-upgrade.patch rename to patches/0013-d-rules-also-add-no-restart-after-upgrade-parameter.patch index 78106a9ce..a2dab60d6 100644 --- a/patches/0016-d-rules-fix-no-restart-on-upgrade.patch +++ b/patches/0013-d-rules-also-add-no-restart-after-upgrade-parameter.patch @@ -1,10 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= -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 -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 restart-after-upgrade by default. @@ -18,11 +15,11 @@ explicit. Signed-off-by: Thomas Lamprecht --- - debian/rules | 3 +++ - 1 file changed, 3 insertions(+) + debian/rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules -index b5ce42c6f3..00e9ac6b16 100755 +index a2a06f267b5..9da4c80fcc6 100755 --- a/debian/rules +++ b/debian/rules @@ -104,7 +104,7 @@ override_dh_installinit: @@ -34,4 +31,3 @@ index b5ce42c6f3..00e9ac6b16 100755 override_dh_systemd_enable: # systemd enable done as part of dh_installinit - diff --git a/patches/0017-python3.10-pep-620.patch b/patches/0013-python3.10-pep-620.patch similarity index 100% rename from patches/0017-python3.10-pep-620.patch rename to patches/0013-python3.10-pep-620.patch diff --git a/patches/0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch b/patches/0014-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch similarity index 95% rename from patches/0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch rename to patches/0014-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch index 1e9b1a5f6..6b92b34c2 100644 --- a/patches/0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch +++ b/patches/0014-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch @@ -10,7 +10,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) 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 +++ b/src/ceph-crash.in @@ -97,7 +97,7 @@ def drop_privs(): diff --git a/patches/0021-backport-mgr-dashboard-simplify-authentication-proto.patch b/patches/0015-backport-mgr-dashboard-simplify-authentication-proto.patch similarity index 95% rename from patches/0021-backport-mgr-dashboard-simplify-authentication-proto.patch rename to patches/0015-backport-mgr-dashboard-simplify-authentication-proto.patch index 88dbcd04a..32868079e 100644 --- a/patches/0021-backport-mgr-dashboard-simplify-authentication-proto.patch +++ b/patches/0015-backport-mgr-dashboard-simplify-authentication-proto.patch @@ -22,6 +22,7 @@ enabled. Fixes: https://forum.proxmox.com/threads/ceph-warning-post-upgrade-to-v8.129371 Signed-off-by: Daniel Persson Signed-off-by: Max Carrara +Signed-off-by: Thomas Lamprecht --- ceph.spec.in | 4 -- debian/control | 1 - @@ -34,7 +35,7 @@ Signed-off-by: Max Carrara 8 files changed, 75 insertions(+), 16 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in -index e4cbbef6943..457d7a6dc56 100644 +index 2af66b1d432..447f8249566 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -403,7 +403,6 @@ BuildRequires: xmlsec1-nss @@ -53,15 +54,15 @@ index e4cbbef6943..457d7a6dc56 100644 BuildRequires: python%{python3_pkgversion}-Routes BuildRequires: python%{python3_pkgversion}-Werkzeug 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 - %if 0%{?fedora} || 0%{?rhel} + %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Requires: python%{python3_pkgversion}-cherrypy -Requires: python%{python3_pkgversion}-jwt Requires: python%{python3_pkgversion}-routes Requires: python%{python3_pkgversion}-werkzeug %if 0%{?weak_deps} -@@ -617,7 +614,6 @@ Recommends: python%{python3_pkgversion}-saml +@@ -620,7 +617,6 @@ Recommends: python%{python3_pkgversion}-saml %endif %if 0%{?suse_version} Requires: python%{python3_pkgversion}-CherryPy @@ -70,7 +71,7 @@ index e4cbbef6943..457d7a6dc56 100644 Requires: python%{python3_pkgversion}-Werkzeug Recommends: python%{python3_pkgversion}-python3-saml diff --git a/debian/control b/debian/control -index e3f2073ce8f..ba34a163f54 100644 +index 5b23b2c78ae..61ae922a031 100644 --- a/debian/control +++ b/debian/control @@ -87,7 +87,6 @@ Build-Depends: automake, @@ -113,25 +114,25 @@ index 96cbc523356..d396a38d2c3 100644 +class InvalidAlgorithmError(Exception): + pass 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 +++ b/src/pybind/mgr/dashboard/requirements-lint.txt @@ -9,3 +9,4 @@ autopep8==1.5.7 pyfakefs==4.5.0 isort==5.5.3 - jsonschema==4.16.0 + jsonschema~=4.0 +PyJWT~=2.0 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 +++ b/src/pybind/mgr/dashboard/requirements-test.txt @@ -2,3 +2,4 @@ pytest-cov pytest-instafail pyfakefs==4.5.0 - jsonschema==4.16.0 + jsonschema~=4.0 +PyJWT~=2.0 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 +++ b/src/pybind/mgr/dashboard/requirements.txt @@ -1,7 +1,6 @@ @@ -274,6 +275,3 @@ index f13963abffd..3c600231252 100644 except UserDoesNotExist: cls.logger.debug( # type: ignore "Invalid token: user %s does not exist", dtoken['username'] --- -2.39.2 - diff --git a/patches/0024-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch b/patches/0016-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch similarity index 79% rename from patches/0024-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch rename to patches/0016-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch index 947175605..49be4c5a2 100644 --- a/patches/0024-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch +++ b/patches/0016-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch @@ -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 Date: Thu, 8 Feb 2024 16:20:08 +0100 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 Signed-off-by: Friedrich Weber +Signed-off-by: Thomas Lamprecht --- - debian/ceph-osd.postinst | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + debian/ceph-osd.postinst | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) 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 +++ b/debian/ceph-osd.postinst -@@ -24,7 +24,11 @@ set -e +@@ -23,7 +23,10 @@ set -e case "$1" in configure) - [ -x /etc/init.d/procps ] && invoke-rc.d procps restart || : + # apply (only) new parameters, but only on fresh install + if [ -z "$2" ]; then -+ /lib/systemd/systemd-sysctl /etc/sysctl.d/30-ceph-osd.conf \ -+ >/dev/null || : ++ /lib/systemd/systemd-sysctl /etc/sysctl.d/30-ceph-osd.conf >/dev/null || : + fi [ -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 diff --git a/patches/0022-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch b/patches/0017-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch similarity index 96% rename from patches/0022-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch rename to patches/0017-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch index 9cc2889da..f563f1695 100644 --- a/patches/0022-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch +++ b/patches/0017-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch @@ -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 Signed-off-by: Max Carrara +Signed-off-by: Thomas Lamprecht --- src/pybind/mgr/dashboard/module.py | 58 ++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 15 deletions(-) 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 +++ b/src/pybind/mgr/dashboard/module.py @@ -23,8 +23,7 @@ if TYPE_CHECKING: @@ -53,7 +54,7 @@ index 68725be6e35..c8b263d9786 100644 from . import mgr from .controllers import Router, json_error_page -@@ -172,11 +171,29 @@ class CherryPyConfig(object): +@@ -168,11 +167,29 @@ class CherryPyConfig(object): else: 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 Settings.UNSAFE_TLS_v1_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") def set_mgr_created_self_signed_cert(self): @@ -123,6 +124,3 @@ index 68725be6e35..c8b263d9786 100644 @CLIWriteCommand("dashboard set-rgw-credentials") def set_rgw_credentials(self): --- -2.39.2 - diff --git a/patches/0025-debian-recursively-adjust-permissions-of-var-lib-cep.patch b/patches/0018-debian-recursively-adjust-permissions-of-var-lib-cep.patch similarity index 96% rename from patches/0025-debian-recursively-adjust-permissions-of-var-lib-cep.patch rename to patches/0018-debian-recursively-adjust-permissions-of-var-lib-cep.patch index 36f4df3aa..a8c75dfb6 100644 --- a/patches/0025-debian-recursively-adjust-permissions-of-var-lib-cep.patch +++ b/patches/0018-debian-recursively-adjust-permissions-of-var-lib-cep.patch @@ -18,6 +18,7 @@ of `find | xargs`. [0]: https://github.com/ceph/ceph/pull/48713 Signed-off-by: Max Carrara +Signed-off-by: Thomas Lamprecht --- debian/ceph-base.postinst | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) @@ -49,6 +50,3 @@ index 75eeb59c624..424c2c889d5 100644 ;; abort-upgrade|abort-remove|abort-deconfigure) : --- -2.39.2 - diff --git a/patches/0026-ceph-crash-change-order-of-client-names.patch b/patches/0019-ceph-crash-change-order-of-client-names.patch similarity index 89% rename from patches/0026-ceph-crash-change-order-of-client-names.patch rename to patches/0019-ceph-crash-change-order-of-client-names.patch index 8131fced5..dd5d2682b 100644 --- a/patches/0026-ceph-crash-change-order-of-client-names.patch +++ b/patches/0019-ceph-crash-change-order-of-client-names.patch @@ -6,12 +6,13 @@ Subject: [PATCH] ceph-crash: change order of client names This simply puts 'client.crash' before 'client.crash.${HOSTNAME}'. Signed-off-by: Max Carrara +Signed-off-by: Thomas Lamprecht --- src/ceph-crash.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 +++ b/src/ceph-crash.in @@ -16,8 +16,8 @@ import time @@ -25,6 +26,3 @@ index 0e02837fadd..713080a4dc1 100755 'client.admin'] --- -2.39.2 - diff --git a/patches/0023-rocksb-inherit-parent-cmake-cxx-flags.patch b/patches/0023-rocksb-inherit-parent-cmake-cxx-flags.patch deleted file mode 100644 index 2b35fa59b..000000000 --- a/patches/0023-rocksb-inherit-parent-cmake-cxx-flags.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 620b68a348f07145c49c12668576a89dee8198cb Mon Sep 17 00:00:00 2001 -From: Kefu Chai -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 - (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}') diff --git a/patches/series b/patches/series index 406d4624a..b34f6bfe3 100644 --- a/patches/series +++ b/patches/series @@ -1,21 +1,20 @@ 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 -0009-remove-legacy-pve-ceph-osd-activation-script-in-post.patch -0010-remove-legacy-init.d-ceph-script.patch -0011-only-suggest-mgr-plugins.patch -0012-Remove-failing-actions-from-prerm.patch -0013-d-control-move-python-dependencies-over-to-python3.patch -0014-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch -0015-d-control-drop-outdated-build-dependencies-and-bump-.patch -0015-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch -0016-d-rules-fix-no-restart-on-upgrade.patch -0017-python3.10-pep-620.patch -0020-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch -0021-backport-mgr-dashboard-simplify-authentication-proto.patch -0022-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch -0023-rocksb-inherit-parent-cmake-cxx-flags.patch -0024-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch -0025-debian-recursively-adjust-permissions-of-var-lib-cep.patch -0026-ceph-crash-change-order-of-client-names.patch +0003-debian-control-add-break-libpvestorage-perl.patch +0004-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch +0005-remove-legacy-pve-ceph-osd-activation-script-in-post.patch +0006-remove-legacy-init.d-ceph-script.patch +0007-ceph-mgr-only-suggest-mgr-plugins.patch +0008-Remove-failing-actions-from-prerm.patch +0009-d-control-move-python-dependencies-over-to-python3.patch +0010-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch +0011-d-control-bump-compat-to-10.patch +0012-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch +0013-d-rules-also-add-no-restart-after-upgrade-parameter.patch +0013-python3.10-pep-620.patch +0014-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch +0015-backport-mgr-dashboard-simplify-authentication-proto.patch +0016-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch +0017-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch +0018-debian-recursively-adjust-permissions-of-var-lib-cep.patch +0019-ceph-crash-change-order-of-client-names.patch