Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- 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 e1f90f72b..185218554 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,17 +35,10 @@ configure_file(ceph-crash.in
--- /dev/null
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alwin Antreich <a.antreich@proxmox.com>
+Date: Wed, 24 Oct 2018 10:38:19 +0200
+Subject: [PATCH] debian/control: add break libpvestorage-perl
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ debian/control | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/debian/control b/debian/control
+index 837a55a37..a845ba795 100644
+--- a/debian/control
++++ b/debian/control
+@@ -155,6 +155,7 @@ Replaces: ceph (<< 10),
+ Breaks: ceph (<< 10),
+ ceph-test (<< 12.2.2-14),
+ python-ceph (<< 0.92-1223),
++ libpve-storage-perl (<= 5.0-25),
+ 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,
+@@ -634,6 +635,7 @@ Breaks: ceph (<< 10),
+ ceph-test (<< 9.0.3-1646),
+ librbd1 (<< 0.92-1238),
+ python-ceph (<< 0.92-1223),
++ libpve-storage-perl (<= 5.0-25),
+ radosgw (<< 12.0.3)
+ Suggests: ceph-base (= ${binary:Version}),
+ ceph-mds (= ${binary:Version}),
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 22 Mar 2017 09:00:34 +0100
-Subject: [PATCH] enable systemd targets by default
-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/rules | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/debian/rules b/debian/rules
-index b5ce42c6f3..00e9ac6b16 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -98,6 +98,11 @@ override_dh_installinit:
-
- dh_installinit -p ceph-base --name ceph --no-start
- dh_installinit -p radosgw --no-start
-+ dh_systemd_enable -p ceph-common ceph.target
-+ dh_systemd_enable -p ceph-mon ceph-mon.target
-+ dh_systemd_enable -p ceph-mgr ceph-mgr.target
-+ dh_systemd_enable -p ceph-mds ceph-mds.target
-+ dh_systemd_enable -p ceph-osd ceph-osd.target
-
- # NOTE: execute systemd helpers so they pickup dh_install'ed units and targets
- dh_systemd_enable
--- /dev/null
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alwin Antreich <a.antreich@proxmox.com>
+Date: Wed, 6 Feb 2019 10:16:22 +0100
+Subject: [PATCH] d/rules: fix instaldoc override and ship upstream changelog
+
+since we replace it with our own.
+
+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 <t.lamprecht@proxmox.com>
+---
+ debian/rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/debian/rules b/debian/rules
+index ed7f4a255..45a624b5a 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -80,7 +80,7 @@ override_dh_auto_install:
+
+ # doc/changelog is a directory, which confuses dh_installchangelogs
+ override_dh_installchangelogs:
+- dh_installchangelogs --exclude doc/changelog
++ dh_installchangelogs --exclude doc/changelog changelog.upstream
+
+ override_dh_installlogrotate:
+ cp src/logrotate.conf debian/ceph-common.logrotate
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alwin Antreich <a.antreich@proxmox.com>
-Date: Wed, 24 Oct 2018 10:38:19 +0200
-Subject: [PATCH] debian/control: add break libpvestorage-perl
-
----
- debian/control | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/debian/control b/debian/control
-index 83dc414788..1cfa2250de 100644
---- a/debian/control
-+++ b/debian/control
-@@ -154,6 +154,7 @@ Replaces: ceph (<< 10),
- Breaks: ceph (<< 10),
- ceph-test (<< 12.2.2-14),
- python-ceph (<< 0.92-1223),
-+ libpve-storage-perl (<= 5.0-25),
- 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),
- ceph-test (<< 9.0.3-1646),
- librbd1 (<< 0.92-1238),
- python-ceph (<< 0.92-1223),
-+ libpve-storage-perl (<= 5.0-25),
- radosgw (<< 12.0.3)
- Suggests: ceph-base (= ${binary:Version}),
- ceph-mds (= ${binary:Version}),
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alwin Antreich <a.antreich@proxmox.com>
-Date: Wed, 6 Feb 2019 10:16:22 +0100
-Subject: [PATCH] d/rules: fix instaldoc override and ship upstream changelog
-
-since we replace it with our own.
-
-The `override_dh_installdocs` target was left over as empty override
-by MISTAKE in uptream commit c3a53010af432e77f74bcb46e7205c5500b6af77,
-fix that by just dropping it completely.
-
----
- debian/rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/debian/rules b/debian/rules
-index 3ac923f71a..d9927b3e0d 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -81,9 +81,7 @@ override_dh_auto_install:
-
- # doc/changelog is a directory, which confuses dh_installchangelogs
- override_dh_installchangelogs:
-- dh_installchangelogs --exclude doc/changelog
--
--override_dh_installdocs:
-+ dh_installchangelogs --exclude doc/changelog changelog.upstream
-
- override_dh_installlogrotate:
- cp src/logrotate.conf debian/ceph-common.logrotate
--- /dev/null
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Dominik Csapak <d.csapak@proxmox.com>
+Date: Thu, 27 Jun 2019 14:37:06 +0200
+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
+
+this fails on nautilus and has to be removed when upgrading from
+luminous
+
+Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ debian/ceph-osd.postinst | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst
+index 04e33b860..6c2513d4d 100644
+--- a/debian/ceph-osd.postinst
++++ b/debian/ceph-osd.postinst
+@@ -26,6 +26,19 @@ case "$1" in
+ configure)
+ [ -x /etc/init.d/procps ] && invoke-rc.d procps restart || :
+ [ -x /sbin/start ] && start ceph-osd-all || :
++
++ # remove legacy osd activation service, FIXME remove with next ceph >> 14
++ if [ ! -z "$2" ] && dpkg --compare-versions "$2" lt '14.2.1-pve2'; then
++ CEPHSERVICE="/etc/systemd/system/ceph.service"
++ MD5SUM="f716952fcc5dda4ecdb153c02627da52 $CEPHSERVICE"
++ if [ -e "$CEPHSERVICE" ] && [ "$(md5sum $CEPHSERVICE)" = "$MD5SUM" ]; then
++ if [ -e /etc/systemd/system/multi-user.target.wants/ceph.service ]; then
++ deb-systemd-invoke disable ceph.service >/dev/null || :
++ fi
++ rm "$CEPHSERVICE" || :
++ systemctl --system daemon-reload >/dev/null || :
++ fi
++ fi
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ :
--- /dev/null
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Dominik Csapak <d.csapak@proxmox.com>
+Date: Fri, 28 Jun 2019 16:31:34 +0200
+Subject: [PATCH] remove legacy init.d ceph script
+
+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.maintscript | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/debian/ceph-base.install b/debian/ceph-base.install
+index a3d7757a5..51fafb6e9 100644
+--- a/debian/ceph-base.install
++++ b/debian/ceph-base.install
+@@ -1,4 +1,3 @@
+-etc/init.d/ceph
+ lib/systemd/system/ceph-crash.service
+ usr/bin/ceph-crash
+ usr/bin/ceph-debugpack
+diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript
+index 196dc0841..180b7dfde 100644
+--- a/debian/ceph-base.maintscript
++++ b/debian/ceph-base.maintscript
+@@ -1,2 +1,3 @@
++rm_conffile /etc/init.d/ceph 14.2.1-pve1 ceph-base
+ rm_conffile /etc/logrotate.d/ceph
+ rm_conffile /etc/logrotate.d/ceph.logrotate
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dominik Csapak <d.csapak@proxmox.com>
-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
-
-that service was distributed by pve-manager (but not in a regular way)
-and only executed ceph-disk activate-all
-
-this fails on nautilus and has to be removed when upgrading from
-luminous
-
-Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
----
- 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
---- a/debian/ceph-osd.postinst
-+++ b/debian/ceph-osd.postinst
-@@ -25,6 +25,19 @@ case "$1" in
- configure)
- [ -x /etc/init.d/procps ] && invoke-rc.d procps restart || :
- [ -x /sbin/start ] && start ceph-osd-all || :
-+
-+ # remove legacy osd activation service, FIXME remove with next ceph >> 14
-+ if [ ! -z "$2" ] && dpkg --compare-versions "$2" lt '14.2.1-pve2'; then
-+ CEPHSERVICE="/etc/systemd/system/ceph.service"
-+ MD5SUM="f716952fcc5dda4ecdb153c02627da52 $CEPHSERVICE"
-+ if [ -e "$CEPHSERVICE" ] && [ "$(md5sum $CEPHSERVICE)" = "$MD5SUM" ]; then
-+ if [ -e /etc/systemd/system/multi-user.target.wants/ceph.service ]; then
-+ deb-systemd-invoke disable ceph.service >/dev/null || :
-+ fi
-+ rm "$CEPHSERVICE" || :
-+ systemctl --system daemon-reload >/dev/null || :
-+ fi
-+ fi
- ;;
- abort-upgrade|abort-remove|abort-deconfigure)
- :
--- /dev/null
+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] 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 | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/debian/control b/debian/control
+index a845ba795..32e7bb45c 100644
+--- a/debian/control
++++ b/debian/control
+@@ -235,11 +235,11 @@ Depends: ceph-base (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends},
+-Recommends: ceph-mgr-dashboard,
+- ceph-mgr-diskprediction-local,
+- ceph-mgr-k8sevents,
+- ceph-mgr-cephadm
+-Suggests: python3-influxdb
++Suggests: ceph-mgr-dashboard,
++ ceph-mgr-diskprediction-local,
++ ceph-mgr-k8sevents,
++ ceph-mgr-cephadm,
++ python3-influxdb
+ Replaces: ceph (<< 0.93-417),
+ Breaks: ceph (<< 0.93-417),
+ Description: manager for the ceph distributed storage system
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dominik Csapak <d.csapak@proxmox.com>
-Date: Fri, 28 Jun 2019 16:31:34 +0200
-Subject: [PATCH 10/10] remove legacy init.d ceph script
-
-Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
----
- 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
---- a/debian/ceph-base.install
-+++ b/debian/ceph-base.install
-@@ -1,4 +1,3 @@
--etc/init.d/ceph
- lib/systemd/system/ceph-crash.service
- usr/bin/ceph-crash
- usr/bin/ceph-debugpack
-diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript
-index 196dc08413..180b7dfde4 100644
---- a/debian/ceph-base.maintscript
-+++ b/debian/ceph-base.maintscript
-@@ -1,2 +1,3 @@
-+rm_conffile /etc/init.d/ceph 14.2.1-pve1 ceph-base
- rm_conffile /etc/logrotate.d/ceph
- rm_conffile /etc/logrotate.d/ceph.logrotate
--- /dev/null
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dominic=20J=C3=A4ger?= <d.jaeger@proxmox.com>
+Date: Mon, 3 Feb 2020 11:57:22 +0100
+Subject: [PATCH] Remove failing actions from prerm
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The first part of the script fails (/sbin/stop doesn't exist and invoke-rc.d
+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 <d.jaeger@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ debian/ceph-base.prerm | 17 -----------------
+ debian/ceph-mds.prerm | 17 -----------------
+ debian/ceph-mgr.prerm | 17 -----------------
+ debian/ceph-mon.prerm | 17 -----------------
+ debian/ceph-osd.prerm | 17 -----------------
+ 5 files changed, 85 deletions(-)
+
+diff --git a/debian/ceph-base.prerm b/debian/ceph-base.prerm
+index bfd7d3d6f..37460790a 100644
+--- a/debian/ceph-base.prerm
++++ b/debian/ceph-base.prerm
+@@ -1,23 +1,6 @@
+ #!/bin/sh
+ # vim: set noet ts=8:
+
+-set -e
+-
+-case "$1" in
+- remove)
+- [ -x /sbin/stop ] && stop ceph-all || true
+- invoke-rc.d ceph stop || {
+- RESULT=$?
+- if [ $RESULT != 100 ]; then
+- exit $RESULT
+- fi
+- }
+- ;;
+-
+- *)
+- ;;
+-esac
+-
+ #DEBHELPER#
+
+ exit 0
+diff --git a/debian/ceph-mds.prerm b/debian/ceph-mds.prerm
+index 654518a7d..37460790a 100644
+--- a/debian/ceph-mds.prerm
++++ b/debian/ceph-mds.prerm
+@@ -1,23 +1,6 @@
+ #!/bin/sh
+ # vim: set noet ts=8:
+
+-set -e
+-
+-case "$1" in
+- remove)
+- [ -x /sbin/stop ] && stop ceph-mds-all || :
+- invoke-rc.d ceph stop mds || {
+- RESULT=$?
+- if [ $RESULT != 100 ]; then
+- exit $RESULT
+- fi
+- }
+- ;;
+-
+- *)
+- ;;
+-esac
+-
+ #DEBHELPER#
+
+ exit 0
+diff --git a/debian/ceph-mgr.prerm b/debian/ceph-mgr.prerm
+index 6fb7b245a..37460790a 100644
+--- a/debian/ceph-mgr.prerm
++++ b/debian/ceph-mgr.prerm
+@@ -1,23 +1,6 @@
+ #!/bin/sh
+ # vim: set noet ts=8:
+
+-set -e
+-
+-case "$1" in
+- remove)
+- [ -x /sbin/stop ] && stop ceph-mgr-all || :
+- invoke-rc.d ceph stop mgr || {
+- RESULT=$?
+- if [ $RESULT != 100 ]; then
+- exit $RESULT
+- fi
+- }
+- ;;
+-
+- *)
+- ;;
+-esac
+-
+ #DEBHELPER#
+
+ exit 0
+diff --git a/debian/ceph-mon.prerm b/debian/ceph-mon.prerm
+index 5f64058a5..37460790a 100644
+--- a/debian/ceph-mon.prerm
++++ b/debian/ceph-mon.prerm
+@@ -1,23 +1,6 @@
+ #!/bin/sh
+ # vim: set noet ts=8:
+
+-set -e
+-
+-case "$1" in
+- remove)
+- [ -x /sbin/stop ] && stop ceph-mon-all || true
+- invoke-rc.d ceph stop mon || {
+- RESULT=$?
+- if [ $RESULT != 100 ]; then
+- exit $RESULT
+- fi
+- }
+- ;;
+-
+- *)
+- ;;
+-esac
+-
+ #DEBHELPER#
+
+ exit 0
+diff --git a/debian/ceph-osd.prerm b/debian/ceph-osd.prerm
+index 40f07b621..37460790a 100644
+--- a/debian/ceph-osd.prerm
++++ b/debian/ceph-osd.prerm
+@@ -1,23 +1,6 @@
+ #!/bin/sh
+ # vim: set noet ts=8:
+
+-set -e
+-
+-case "$1" in
+- remove)
+- [ -x /sbin/stop ] && stop ceph-osd-all || true
+- invoke-rc.d ceph stop osd || {
+- RESULT=$?
+- if [ $RESULT != 100 ]; then
+- exit $RESULT
+- fi
+- }
+- ;;
+-
+- *)
+- ;;
+-esac
+-
+ #DEBHELPER#
+
+ exit 0
+++ /dev/null
-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] 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 | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/debian/control b/debian/control
-index e7a01c6ff8..692705c4c4 100644
---- a/debian/control
-+++ b/debian/control
-@@ -242,11 +242,11 @@ Depends: ceph-base (= ${binary:Version}),
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends},
--Recommends: ceph-mgr-dashboard,
-- ceph-mgr-diskprediction-local,
-- ceph-mgr-k8sevents,
-- ceph-mgr-cephadm
--Suggests: python3-influxdb
-+Suggests: ceph-mgr-dashboard,
-+ ceph-mgr-diskprediction-local,
-+ ceph-mgr-k8sevents,
-+ ceph-mgr-cephadm,
-+ python3-influxdb
- Replaces: ceph (<< 0.93-417),
- Breaks: ceph (<< 0.93-417),
- Description: manager for the ceph distributed storage system
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dominic=20J=C3=A4ger?= <d.jaeger@proxmox.com>
-Date: Mon, 3 Feb 2020 11:57:22 +0100
-Subject: [PATCH] Remove failing actions from prerm
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The first part of the script fails (/sbin/stop doesn't exist and invoke-rc.d
-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 <d.jaeger@proxmox.com>
----
- debian/ceph-base.prerm | 17 -----------------
- debian/ceph-mds.prerm | 17 -----------------
- debian/ceph-mgr.prerm | 17 -----------------
- debian/ceph-mon.prerm | 17 -----------------
- debian/ceph-osd.prerm | 17 -----------------
- 5 files changed, 85 deletions(-)
-
-diff --git a/debian/ceph-base.prerm b/debian/ceph-base.prerm
-index bfd7d3d6f..37460790a 100644
---- a/debian/ceph-base.prerm
-+++ b/debian/ceph-base.prerm
-@@ -1,23 +1,6 @@
- #!/bin/sh
- # vim: set noet ts=8:
-
--set -e
--
--case "$1" in
-- remove)
-- [ -x /sbin/stop ] && stop ceph-all || true
-- invoke-rc.d ceph stop || {
-- RESULT=$?
-- if [ $RESULT != 100 ]; then
-- exit $RESULT
-- fi
-- }
-- ;;
--
-- *)
-- ;;
--esac
--
- #DEBHELPER#
-
- exit 0
-diff --git a/debian/ceph-mds.prerm b/debian/ceph-mds.prerm
-index 654518a7d..37460790a 100644
---- a/debian/ceph-mds.prerm
-+++ b/debian/ceph-mds.prerm
-@@ -1,23 +1,6 @@
- #!/bin/sh
- # vim: set noet ts=8:
-
--set -e
--
--case "$1" in
-- remove)
-- [ -x /sbin/stop ] && stop ceph-mds-all || :
-- invoke-rc.d ceph stop mds || {
-- RESULT=$?
-- if [ $RESULT != 100 ]; then
-- exit $RESULT
-- fi
-- }
-- ;;
--
-- *)
-- ;;
--esac
--
- #DEBHELPER#
-
- exit 0
-diff --git a/debian/ceph-mgr.prerm b/debian/ceph-mgr.prerm
-index 6fb7b245a..37460790a 100644
---- a/debian/ceph-mgr.prerm
-+++ b/debian/ceph-mgr.prerm
-@@ -1,23 +1,6 @@
- #!/bin/sh
- # vim: set noet ts=8:
-
--set -e
--
--case "$1" in
-- remove)
-- [ -x /sbin/stop ] && stop ceph-mgr-all || :
-- invoke-rc.d ceph stop mgr || {
-- RESULT=$?
-- if [ $RESULT != 100 ]; then
-- exit $RESULT
-- fi
-- }
-- ;;
--
-- *)
-- ;;
--esac
--
- #DEBHELPER#
-
- exit 0
-diff --git a/debian/ceph-mon.prerm b/debian/ceph-mon.prerm
-index 5f64058a5..37460790a 100644
---- a/debian/ceph-mon.prerm
-+++ b/debian/ceph-mon.prerm
-@@ -1,23 +1,6 @@
- #!/bin/sh
- # vim: set noet ts=8:
-
--set -e
--
--case "$1" in
-- remove)
-- [ -x /sbin/stop ] && stop ceph-mon-all || true
-- invoke-rc.d ceph stop mon || {
-- RESULT=$?
-- if [ $RESULT != 100 ]; then
-- exit $RESULT
-- fi
-- }
-- ;;
--
-- *)
-- ;;
--esac
--
- #DEBHELPER#
-
- exit 0
-diff --git a/debian/ceph-osd.prerm b/debian/ceph-osd.prerm
-index 40f07b621..37460790a 100644
---- a/debian/ceph-osd.prerm
-+++ b/debian/ceph-osd.prerm
-@@ -1,23 +1,6 @@
- #!/bin/sh
- # vim: set noet ts=8:
-
--set -e
--
--case "$1" in
-- remove)
-- [ -x /sbin/stop ] && stop ceph-osd-all || true
-- invoke-rc.d ceph stop osd || {
-- RESULT=$?
-- if [ $RESULT != 100 ]; then
-- exit $RESULT
-- fi
-- }
-- ;;
--
-- *)
-- ;;
--esac
--
- #DEBHELPER#
-
- exit 0
---
-2.20.1
-
--- /dev/null
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Thu, 26 Nov 2020 18:09:42 +0000
+Subject: [PATCH] fix service ordering, avoid Before=remote-fs-pre.target
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ systemd/ceph-mds@.service.in | 4 ++--
+ systemd/ceph-mgr@.service.in | 4 ++--
+ systemd/ceph-mon@.service.in | 4 ++--
+ systemd/ceph-osd@.service.in | 4 ++--
+ systemd/ceph-radosgw@.service.in | 4 ++--
+ systemd/rbdmap.service.in | 3 +--
+ 6 files changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/systemd/ceph-mds@.service.in b/systemd/ceph-mds@.service.in
+index afa36702f..03ffbc1fa 100644
+--- a/systemd/ceph-mds@.service.in
++++ b/systemd/ceph-mds@.service.in
+@@ -2,8 +2,8 @@
+ Description=Ceph metadata server daemon
+ PartOf=ceph-mds.target
+ After=network-online.target local-fs.target time-sync.target
+-Before=remote-fs-pre.target ceph-mds.target
+-Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mds.target
++Before=ceph-mds.target
++Wants=network-online.target local-fs.target time-sync.target ceph-mds.target
+
+ [Service]
+ Environment=CLUSTER=ceph
+diff --git a/systemd/ceph-mgr@.service.in b/systemd/ceph-mgr@.service.in
+index 8fadc4746..79ea740a7 100644
+--- a/systemd/ceph-mgr@.service.in
++++ b/systemd/ceph-mgr@.service.in
+@@ -2,8 +2,8 @@
+ Description=Ceph cluster manager daemon
+ PartOf=ceph-mgr.target
+ After=network-online.target local-fs.target time-sync.target
+-Before=remote-fs-pre.target ceph-mgr.target
+-Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mgr.target
++Before=ceph-mgr.target
++Wants=network-online.target local-fs.target time-sync.target ceph-mgr.target
+
+ [Service]
+ Environment=CLUSTER=ceph
+diff --git a/systemd/ceph-mon@.service.in b/systemd/ceph-mon@.service.in
+index 2eba83c3c..a2a619d7f 100644
+--- a/systemd/ceph-mon@.service.in
++++ b/systemd/ceph-mon@.service.in
+@@ -6,8 +6,8 @@ PartOf=ceph-mon.target
+ # these can be removed once ceph-mon will dynamically change network
+ # configuration.
+ After=network-online.target local-fs.target time-sync.target
+-Before=remote-fs-pre.target ceph-mon.target
+-Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mon.target
++Before=ceph-mon.target
++Wants=network-online.target local-fs.target time-sync.target ceph-mon.target
+
+ [Service]
+ Environment=CLUSTER=ceph
+diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in
+index 046500efb..c988cf345 100644
+--- a/systemd/ceph-osd@.service.in
++++ b/systemd/ceph-osd@.service.in
+@@ -2,8 +2,8 @@
+ Description=Ceph object storage daemon osd.%i
+ PartOf=ceph-osd.target
+ After=network-online.target local-fs.target time-sync.target
+-Before=remote-fs-pre.target ceph-osd.target
+-Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-osd.target
++Before=ceph-osd.target
++Wants=network-online.target local-fs.target time-sync.target ceph-osd.target
+
+ [Service]
+ Environment=CLUSTER=ceph
+diff --git a/systemd/ceph-radosgw@.service.in b/systemd/ceph-radosgw@.service.in
+index b74747055..5cccc21ee 100644
+--- a/systemd/ceph-radosgw@.service.in
++++ b/systemd/ceph-radosgw@.service.in
+@@ -2,8 +2,8 @@
+ Description=Ceph rados gateway
+ PartOf=ceph-radosgw.target
+ After=network-online.target local-fs.target time-sync.target
+-Before=remote-fs-pre.target ceph-radosgw.target
+-Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-radosgw.target
++Before=ceph-radosgw.target
++Wants=network-online.target local-fs.target time-sync.target ceph-radosgw.target
+
+ [Service]
+ Environment=CLUSTER=ceph
+diff --git a/systemd/rbdmap.service.in b/systemd/rbdmap.service.in
+index 6644508cf..96f7d54e7 100644
+--- a/systemd/rbdmap.service.in
++++ b/systemd/rbdmap.service.in
+@@ -1,8 +1,7 @@
+ [Unit]
+ Description=Map RBD devices
+ After=network-online.target ceph.target
+-Before=remote-fs-pre.target
+-Wants=network-online.target remote-fs-pre.target ceph.target
++Wants=network-online.target ceph.target
+
+ [Service]
+ EnvironmentFile=-@SYSTEMD_ENV_FILE@
--- /dev/null
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Tue, 6 Jun 2023 13:36:13 +0200
+Subject: [PATCH] fix #4759: run ceph-crash daemon with www-data group for
+ access to conf
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ src/ceph-crash.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ceph-crash.in b/src/ceph-crash.in
+index 0e02837fa..010d6ea2e 100755
+--- a/src/ceph-crash.in
++++ b/src/ceph-crash.in
+@@ -97,7 +97,7 @@ def drop_privs():
+ if os.getuid() == 0:
+ try:
+ ceph_uid = pwd.getpwnam("ceph").pw_uid
+- ceph_gid = grp.getgrnam("ceph").gr_gid
++ ceph_gid = grp.getgrnam("www-data").gr_gid # ensure access to config in pmxcfs
+ os.setgroups([])
+ os.setgid(ceph_gid)
+ os.setuid(ceph_uid)
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Thu, 26 Nov 2020 18:09:42 +0000
-Subject: [PATCH] fix service ordering, avoid Before=remote-fs-pre.target
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- systemd/ceph-mds@.service.in | 4 ++--
- systemd/ceph-mgr@.service.in | 4 ++--
- systemd/ceph-mon@.service.in | 4 ++--
- systemd/ceph-osd@.service.in | 4 ++--
- systemd/ceph-radosgw@.service.in | 4 ++--
- systemd/rbdmap.service.in | 3 +--
- 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
---- a/systemd/ceph-mds@.service.in
-+++ b/systemd/ceph-mds@.service.in
-@@ -2,8 +2,8 @@
- Description=Ceph metadata server daemon
- PartOf=ceph-mds.target
- After=network-online.target local-fs.target time-sync.target
--Before=remote-fs-pre.target ceph-mds.target
--Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mds.target
-+Before=ceph-mds.target
-+Wants=network-online.target local-fs.target time-sync.target ceph-mds.target
-
- [Service]
- Environment=CLUSTER=ceph
-diff --git a/systemd/ceph-mgr@.service.in b/systemd/ceph-mgr@.service.in
-index 0ff9db237..aea3af40a 100644
---- a/systemd/ceph-mgr@.service.in
-+++ b/systemd/ceph-mgr@.service.in
-@@ -2,8 +2,8 @@
- Description=Ceph cluster manager daemon
- PartOf=ceph-mgr.target
- After=network-online.target local-fs.target time-sync.target
--Before=remote-fs-pre.target ceph-mgr.target
--Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mgr.target
-+Before=ceph-mgr.target
-+Wants=network-online.target local-fs.target time-sync.target ceph-mgr.target
-
- [Service]
- Environment=CLUSTER=ceph
-diff --git a/systemd/ceph-mon@.service.in b/systemd/ceph-mon@.service.in
-index d3121d59d..7992d502a 100644
---- a/systemd/ceph-mon@.service.in
-+++ b/systemd/ceph-mon@.service.in
-@@ -6,8 +6,8 @@ PartOf=ceph-mon.target
- # these can be removed once ceph-mon will dynamically change network
- # configuration.
- After=network-online.target local-fs.target time-sync.target
--Before=remote-fs-pre.target ceph-mon.target
--Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-mon.target
-+Before=ceph-mon.target
-+Wants=network-online.target local-fs.target time-sync.target ceph-mon.target
-
- [Service]
- Environment=CLUSTER=ceph
-diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in
-index 2e5ea6ae4..987656da7 100644
---- a/systemd/ceph-osd@.service.in
-+++ b/systemd/ceph-osd@.service.in
-@@ -2,8 +2,8 @@
- Description=Ceph object storage daemon osd.%i
- PartOf=ceph-osd.target
- After=network-online.target local-fs.target time-sync.target
--Before=remote-fs-pre.target ceph-osd.target
--Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-osd.target
-+Before=ceph-osd.target
-+Wants=network-online.target local-fs.target time-sync.target ceph-osd.target
-
- [Service]
- Environment=CLUSTER=ceph
-diff --git a/systemd/ceph-radosgw@.service.in b/systemd/ceph-radosgw@.service.in
-index dee501b47..d1bcf5bb7 100644
---- a/systemd/ceph-radosgw@.service.in
-+++ b/systemd/ceph-radosgw@.service.in
-@@ -2,8 +2,8 @@
- Description=Ceph rados gateway
- PartOf=ceph-radosgw.target
- After=network-online.target local-fs.target time-sync.target
--Before=remote-fs-pre.target ceph-radosgw.target
--Wants=network-online.target local-fs.target time-sync.target remote-fs-pre.target ceph-radosgw.target
-+Before=ceph-radosgw.target
-+Wants=network-online.target local-fs.target time-sync.target ceph-radosgw.target
-
- [Service]
- Environment=CLUSTER=ceph
-diff --git a/systemd/rbdmap.service.in b/systemd/rbdmap.service.in
-index 6644508cf..96f7d54e7 100644
---- a/systemd/rbdmap.service.in
-+++ b/systemd/rbdmap.service.in
-@@ -1,8 +1,7 @@
- [Unit]
- Description=Map RBD devices
- After=network-online.target ceph.target
--Before=remote-fs-pre.target
--Wants=network-online.target remote-fs-pre.target ceph.target
-+Wants=network-online.target ceph.target
-
- [Service]
- EnvironmentFile=-@SYSTEMD_ENV_FILE@
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Thu, 6 May 2021 18:04:45 +0200
-Subject: [PATCH] d/control: bump compat to 10
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- debian/compat | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/debian/compat b/debian/compat
-index ec635144f60..f599e28b8ab 100644
---- a/debian/compat
-+++ b/debian/compat
-@@ -1 +1 @@
--9
-+10
---
-2.29.2
-
--- /dev/null
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Tue, 5 Sep 2023 13:28:07 +0200
+Subject: [PATCH] debian: add missing bcrypt to manager .requires
+
+The `ceph-mgr` package lost its dependency on `python3-bcrypt` when
+the dependencies got moved from d/control to a dh_python3 compatible
+requires file. Add it again as the bcrypt module is still used there.
+
+Otherwise one gets errors when, e.g., calling `ceph -s` after a fresh
+installation:
+
+> 13 mgr modules have failed dependencies
+> Module 'balancer' has failed dependency: No module named 'bcrypt'
+> Module 'crash' has failed dependency: No module named 'bcrypt'
+> Module 'devicehealth' has failed dependency: No module named 'bcrypt'
+> Module 'iostat' has failed dependency: No module named 'bcrypt'
+> Module 'nfs' has failed dependency: No module named 'bcrypt'
+> Module 'orchestrator' has failed dependency: No module named 'bcrypt'
+> Module 'pg_autoscaler' has failed dependency: No module named 'bcrypt'
+> Module 'progress' has failed dependency: No module named 'bcrypt'
+> Module 'rbd_support' has failed dependency: No module named 'bcrypt'
+> Module 'restful' has failed dependency: No module named 'bcrypt'
+> Module 'status' has failed dependency: No module named 'bcrypt'
+> Module 'telemetry' has failed dependency: No module named 'bcrypt'
+> Module 'volumes' has failed dependency: No module named 'bcrypt'
+
+Fixes: ef19547e83e ("debian: add .requires for specifying python3 deps")
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ debian/ceph-mgr.requires | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/debian/ceph-mgr.requires b/debian/ceph-mgr.requires
+index bf334fb9b..39336330c 100644
+--- a/debian/ceph-mgr.requires
++++ b/debian/ceph-mgr.requires
+@@ -1,3 +1,4 @@
++bcrypt
+ pyOpenSSL
+ cephfs
+ ceph-argparse
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 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.
-
-Keep the old --no-restart-on-upgrade one as else debian may just
-think we want the restart but as full stop in prerm and start only in
-postinst.
-
-For ceph we actually want to let the user fully control the restart
-explicit.
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- debian/rules | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/debian/rules b/debian/rules
-index b5ce42c6f3..00e9ac6b16 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -104,7 +104,7 @@ override_dh_installinit:
-
- # NOTE: execute systemd helpers so they pickup dh_install'ed units and targets
- dh_systemd_enable
-- dh_systemd_start --no-restart-on-upgrade
-+ dh_systemd_start --no-restart-on-upgrade --no-restart-after-upgrade
-
- override_dh_systemd_enable:
- # systemd enable done as part of dh_installinit
-
--- /dev/null
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stefan Hanreich <s.hanreich@proxmox.com>
+Date: Fri, 15 Sep 2023 16:55:02 +0200
+Subject: [PATCH] fix compatibility with CPUs not supporting SSE 4.1
+ instructions
+
+Building without -O1 causes gcc-12 to emit SSE 4.1 instructions which
+are not supported on older CPU architectures. This leads to Ceph
+crashing on older CPU architectures. -O1 causes those optimizations to
+be implemented manually via runtime dispatch.
+
+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 +-
+ 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
+--- a/src/erasure-code/jerasure/CMakeLists.txt
++++ b/src/erasure-code/jerasure/CMakeLists.txt
+@@ -67,7 +67,7 @@ endif()
+
+ add_library(gf-complete_objs OBJECT ${gf-complete_srcs})
+ set_target_properties(gf-complete_objs PROPERTIES
+- COMPILE_FLAGS "${SIMD_COMPILE_FLAGS}")
++ COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -O1")
+ set_target_properties(gf-complete_objs PROPERTIES
+ COMPILE_DEFINITIONS "${GF_COMPILE_FLAGS}")
+
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Tue, 6 Jun 2023 13:36:13 +0200
-Subject: [PATCH] fix #4759: run ceph-crash daemon with www-data group for
- access to conf
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- src/ceph-crash.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ceph-crash.in b/src/ceph-crash.in
-index 0e02837fa..010d6ea2e 100755
---- a/src/ceph-crash.in
-+++ b/src/ceph-crash.in
-@@ -97,7 +97,7 @@ def drop_privs():
- if os.getuid() == 0:
- try:
- ceph_uid = pwd.getpwnam("ceph").pw_uid
-- ceph_gid = grp.getgrnam("ceph").gr_gid
-+ ceph_gid = grp.getgrnam("www-data").gr_gid # ensure access to config in pmxcfs
- os.setgroups([])
- os.setgid(ceph_gid)
- os.setuid(ceph_uid)
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Tue, 25 Jul 2023 21:05:18 +0200
-Subject: [PATCH] d/rules: compile with gcc 12
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- debian/rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/debian/rules b/debian/rules
-index c163daad2..a1653cb74 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -5,7 +5,7 @@ export DESTDIR=$(CURDIR)/debian/tmp
-
- include /usr/share/dpkg/default.mk
-
--extraopts += -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11
-+extraopts += -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12
- ifneq (,$(findstring WITH_STATIC_LIBSTDCXX,$(CEPH_EXTRA_CMAKE_ARGS)))
- # dh_auto_build sets LDFLAGS with `dpkg-buildflags --get LDFLAGS` on ubuntu,
- # which makes the application aborts when the shared library throws
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Tue, 5 Sep 2023 13:28:07 +0200
-Subject: [PATCH] debian: add missing bcrypt to manager .requires
-
-The `ceph-mgr` package lost its dependency on `python3-bcrypt` when
-the dependencies got moved from d/control to a dh_python3 compatible
-requires file. Add it again as the bcrypt module is still used there.
-
-Otherwise one gets errors when, e.g., calling `ceph -s` after a fresh
-installation:
-
-> 13 mgr modules have failed dependencies
-> Module 'balancer' has failed dependency: No module named 'bcrypt'
-> Module 'crash' has failed dependency: No module named 'bcrypt'
-> Module 'devicehealth' has failed dependency: No module named 'bcrypt'
-> Module 'iostat' has failed dependency: No module named 'bcrypt'
-> Module 'nfs' has failed dependency: No module named 'bcrypt'
-> Module 'orchestrator' has failed dependency: No module named 'bcrypt'
-> Module 'pg_autoscaler' has failed dependency: No module named 'bcrypt'
-> Module 'progress' has failed dependency: No module named 'bcrypt'
-> Module 'rbd_support' has failed dependency: No module named 'bcrypt'
-> Module 'restful' has failed dependency: No module named 'bcrypt'
-> Module 'status' has failed dependency: No module named 'bcrypt'
-> Module 'telemetry' has failed dependency: No module named 'bcrypt'
-> Module 'volumes' has failed dependency: No module named 'bcrypt'
-
-Fixes: ef19547e83e ("debian: add .requires for specifying python3 deps")
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- debian/ceph-mgr.requires | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/debian/ceph-mgr.requires b/debian/ceph-mgr.requires
-index bf334fb9bd2..39336330c93 100644
---- a/debian/ceph-mgr.requires
-+++ b/debian/ceph-mgr.requires
-@@ -1,3 +1,4 @@
-+bcrypt
- pyOpenSSL
- cephfs
- ceph-argparse
+++ /dev/null
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Stefan Hanreich <s.hanreich@proxmox.com>
-Date: Fri, 15 Sep 2023 16:55:02 +0200
-Subject: [PATCH] fix compatibility with CPUs not supporting SSE 4.1
- instructions
-
-Building without -O1 causes gcc-12 to emit SSE 4.1 instructions which
-are not supported on older CPU architectures. This leads to Ceph
-crashing on older CPU architectures. -O1 causes those optimizations to
-be implemented manually via runtime dispatch.
-
-Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
----
- 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
---- a/src/erasure-code/jerasure/CMakeLists.txt
-+++ b/src/erasure-code/jerasure/CMakeLists.txt
-@@ -67,7 +67,7 @@ endif()
-
- add_library(gf-complete_objs OBJECT ${gf-complete_srcs})
- set_target_properties(gf-complete_objs PROPERTIES
-- COMPILE_FLAGS "${SIMD_COMPILE_FLAGS}")
-+ COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -O1")
- set_target_properties(gf-complete_objs PROPERTIES
- COMPILE_DEFINITIONS "${GF_COMPILE_FLAGS}")
-
---
-2.39.2
-
0001-cmake-disable-version-from-git.patch
-0002-enable-systemd-targets-by-default.patch
-0003-debian-control-add-break-libpvestorage-perl.patch
-0004-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch
-0005-remove-legacy-pve-ceph-osd-activation-script-in-post.patch
-0006-remove-legacy-init.d-ceph-script.patch
-0007-only-suggest-mgr-plugins.patch
-0008-Remove-failing-actions-from-prerm.patch
-0009-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch
-0010-d-control-drop-outdated-build-dependencies-and-bump-.patch
-0011-d-rules-fix-no-restart-on-upgrade.patch
-0012-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch
-0013-d-rules-compile-with-gcc-12.patch
-0014-debian-add-missing-bcrypt-to-manager-.requires.patch
-0015-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch
+0002-debian-control-add-break-libpvestorage-perl.patch
+0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch
+0004-remove-legacy-pve-ceph-osd-activation-script-in-post.patch
+0005-remove-legacy-init.d-ceph-script.patch
+0006-ceph-mgr-only-suggest-mgr-plugins.patch
+0007-Remove-failing-actions-from-prerm.patch
+0008-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch
+0009-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch
+0010-debian-add-missing-bcrypt-to-manager-.requires.patch
+0011-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch
projects / ceph.git / commitdiff