From e868ce26e93317a99526dcf621a38fb583b95454 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 19 Dec 2023 10:30:27 +0100 Subject: [PATCH] refresh patches and drop ones applied upstream Signed-off-by: Thomas Lamprecht --- .../0001-cmake-disable-version-from-git.patch | 4 +- ...ontrol-add-break-libpvestorage-perl.patch} | 7 ++-- ...02-enable-systemd-targets-by-default.patch | 29 --------------- ...ldoc-override-and-ship-upstream-cha.patch} | 9 ++--- ...-ceph-osd-activation-script-in-post.patch} | 9 +++-- ...05-remove-legacy-init.d-ceph-script.patch} | 7 ++-- ...6-ceph-mgr-only-suggest-mgr-plugins.patch} | 6 +-- ...7-Remove-failing-actions-from-prerm.patch} | 4 +- ...ing-avoid-Before-remote-fs-pre.targ.patch} | 10 ++--- ...-crash-daemon-with-www-data-group-f.patch} | 0 ...utdated-build-dependencies-and-bump-.patch | 20 ---------- ...missing-bcrypt-to-manager-.requires.patch} | 2 +- ...11-d-rules-fix-no-restart-on-upgrade.patch | 37 ------------------- ...-with-CPUs-not-supporting-SSE-4.1-i.patch} | 4 +- .../0013-d-rules-compile-with-gcc-12.patch | 23 ------------ patches/series | 24 +++++------- 16 files changed, 40 insertions(+), 155 deletions(-) rename patches/{0003-debian-control-add-break-libpvestorage-perl.patch => 0002-debian-control-add-break-libpvestorage-perl.patch} (84%) delete mode 100644 patches/0002-enable-systemd-targets-by-default.patch rename patches/{0004-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch => 0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch} (81%) rename patches/{0005-remove-legacy-pve-ceph-osd-activation-script-in-post.patch => 0004-remove-legacy-pve-ceph-osd-activation-script-in-post.patch} (86%) rename patches/{0006-remove-legacy-init.d-ceph-script.patch => 0005-remove-legacy-init.d-ceph-script.patch} (83%) rename patches/{0007-only-suggest-mgr-plugins.patch => 0006-ceph-mgr-only-suggest-mgr-plugins.patch} (88%) rename patches/{0008-Remove-failing-actions-from-prerm.patch => 0007-Remove-failing-actions-from-prerm.patch} (98%) rename patches/{0009-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch => 0008-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch} (95%) rename patches/{0012-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch => 0009-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch} (100%) delete mode 100644 patches/0010-d-control-drop-outdated-build-dependencies-and-bump-.patch rename patches/{0014-debian-add-missing-bcrypt-to-manager-.requires.patch => 0010-debian-add-missing-bcrypt-to-manager-.requires.patch} (97%) delete mode 100644 patches/0011-d-rules-fix-no-restart-on-upgrade.patch rename patches/{0015-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch => 0011-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch} (95%) delete mode 100644 patches/0013-d-rules-compile-with-gcc-12.patch diff --git a/patches/0001-cmake-disable-version-from-git.patch b/patches/0001-cmake-disable-version-from-git.patch index f2f8605d4..70603f3ca 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 e1f90f72b..185218554 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,17 +35,10 @@ configure_file(ceph-crash.in diff --git a/patches/0003-debian-control-add-break-libpvestorage-perl.patch b/patches/0002-debian-control-add-break-libpvestorage-perl.patch similarity index 84% rename from patches/0003-debian-control-add-break-libpvestorage-perl.patch rename to patches/0002-debian-control-add-break-libpvestorage-perl.patch index 928e953d4..8743584bb 100644 --- a/patches/0003-debian-control-add-break-libpvestorage-perl.patch +++ b/patches/0002-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 837a55a37..a845ba795 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), +@@ -634,6 +635,7 @@ Breaks: ceph (<< 10), ceph-test (<< 9.0.3-1646), librbd1 (<< 0.92-1238), python-ceph (<< 0.92-1223), diff --git a/patches/0002-enable-systemd-targets-by-default.patch b/patches/0002-enable-systemd-targets-by-default.patch deleted file mode 100644 index 88a66b842..000000000 --- a/patches/0002-enable-systemd-targets-by-default.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= -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 ---- - 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 diff --git a/patches/0004-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch b/patches/0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch similarity index 81% rename from patches/0004-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch rename to patches/0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch index e70f63888..f1d75d203 100644 --- a/patches/0004-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch +++ b/patches/0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch @@ -9,22 +9,21 @@ 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(-) diff --git a/debian/rules b/debian/rules -index 3ac923f71a..d9927b3e0d 100755 +index ed7f4a255..45a624b5a 100755 --- a/debian/rules +++ b/debian/rules -@@ -81,9 +81,7 @@ override_dh_auto_install: +@@ -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 -- --override_dh_installdocs: + 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/0005-remove-legacy-pve-ceph-osd-activation-script-in-post.patch b/patches/0004-remove-legacy-pve-ceph-osd-activation-script-in-post.patch similarity index 86% rename from patches/0005-remove-legacy-pve-ceph-osd-activation-script-in-post.patch rename to patches/0004-remove-legacy-pve-ceph-osd-activation-script-in-post.patch index 2324fd402..03bfd362e 100644 --- a/patches/0005-remove-legacy-pve-ceph-osd-activation-script-in-post.patch +++ b/patches/0004-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,15 +11,16 @@ 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 04e33b860..6c2513d4d 100644 --- a/debian/ceph-osd.postinst +++ b/debian/ceph-osd.postinst -@@ -25,6 +25,19 @@ case "$1" in +@@ -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 || : diff --git a/patches/0006-remove-legacy-init.d-ceph-script.patch b/patches/0005-remove-legacy-init.d-ceph-script.patch similarity index 83% rename from patches/0006-remove-legacy-init.d-ceph-script.patch rename to patches/0005-remove-legacy-init.d-ceph-script.patch index 074bf2190..a3d99edae 100644 --- a/patches/0006-remove-legacy-init.d-ceph-script.patch +++ b/patches/0005-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 a3d7757a5..51fafb6e9 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 196dc0841..180b7dfde 100644 --- a/debian/ceph-base.maintscript +++ b/debian/ceph-base.maintscript @@ -1,2 +1,3 @@ diff --git a/patches/0007-only-suggest-mgr-plugins.patch b/patches/0006-ceph-mgr-only-suggest-mgr-plugins.patch similarity index 88% rename from patches/0007-only-suggest-mgr-plugins.patch rename to patches/0006-ceph-mgr-only-suggest-mgr-plugins.patch index cf6ce7fdc..8d147cac5 100644 --- a/patches/0007-only-suggest-mgr-plugins.patch +++ b/patches/0006-ceph-mgr-only-suggest-mgr-plugins.patch @@ -12,12 +12,12 @@ 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 a845ba795..32e7bb45c 100644 --- a/debian/control +++ b/debian/control -@@ -242,11 +242,11 @@ Depends: ceph-base (= ${binary:Version}), +@@ -235,11 +235,11 @@ Depends: ceph-base (= ${binary:Version}), ${misc:Depends}, - ${python:Depends}, + ${python3:Depends}, ${shlibs:Depends}, -Recommends: ceph-mgr-dashboard, - ceph-mgr-diskprediction-local, diff --git a/patches/0008-Remove-failing-actions-from-prerm.patch b/patches/0007-Remove-failing-actions-from-prerm.patch similarity index 98% rename from patches/0008-Remove-failing-actions-from-prerm.patch rename to patches/0007-Remove-failing-actions-from-prerm.patch index 0a557eda2..4370400a5 100644 --- a/patches/0008-Remove-failing-actions-from-prerm.patch +++ b/patches/0007-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 ----------------- @@ -159,6 +160,3 @@ index 40f07b621..37460790a 100644 #DEBHELPER# exit 0 --- -2.20.1 - diff --git a/patches/0009-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch b/patches/0008-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch similarity index 95% rename from patches/0009-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch rename to patches/0008-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch index b8729d6af..58ffd6ef0 100644 --- a/patches/0009-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch +++ b/patches/0008-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 afa36702f..03ffbc1fa 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 8fadc4746..79ea740a7 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 2eba83c3c..a2a619d7f 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 046500efb..c988cf345 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 b74747055..5cccc21ee 100644 --- a/systemd/ceph-radosgw@.service.in +++ b/systemd/ceph-radosgw@.service.in @@ -2,8 +2,8 @@ diff --git a/patches/0012-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch b/patches/0009-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch similarity index 100% rename from patches/0012-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch rename to patches/0009-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch diff --git a/patches/0010-d-control-drop-outdated-build-dependencies-and-bump-.patch b/patches/0010-d-control-drop-outdated-build-dependencies-and-bump-.patch deleted file mode 100644 index 50335378d..000000000 --- a/patches/0010-d-control-drop-outdated-build-dependencies-and-bump-.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Thomas Lamprecht -Date: Thu, 6 May 2021 18:04:45 +0200 -Subject: [PATCH] d/control: bump compat to 10 - -Signed-off-by: Thomas Lamprecht ---- - 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 - diff --git a/patches/0014-debian-add-missing-bcrypt-to-manager-.requires.patch b/patches/0010-debian-add-missing-bcrypt-to-manager-.requires.patch similarity index 97% rename from patches/0014-debian-add-missing-bcrypt-to-manager-.requires.patch rename to patches/0010-debian-add-missing-bcrypt-to-manager-.requires.patch index 70c50a0f7..7de982629 100644 --- a/patches/0014-debian-add-missing-bcrypt-to-manager-.requires.patch +++ b/patches/0010-debian-add-missing-bcrypt-to-manager-.requires.patch @@ -32,7 +32,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+) diff --git a/debian/ceph-mgr.requires b/debian/ceph-mgr.requires -index bf334fb9bd2..39336330c93 100644 +index bf334fb9b..39336330c 100644 --- a/debian/ceph-mgr.requires +++ b/debian/ceph-mgr.requires @@ -1,3 +1,4 @@ diff --git a/patches/0011-d-rules-fix-no-restart-on-upgrade.patch b/patches/0011-d-rules-fix-no-restart-on-upgrade.patch deleted file mode 100644 index 78106a9ce..000000000 --- a/patches/0011-d-rules-fix-no-restart-on-upgrade.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -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 ---- - 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 - diff --git a/patches/0015-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch b/patches/0011-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch similarity index 95% rename from patches/0015-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch rename to patches/0011-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch index a44aefafb..566400d2b 100644 --- a/patches/0015-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch +++ b/patches/0011-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch @@ -10,6 +10,7 @@ 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(-) @@ -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/0013-d-rules-compile-with-gcc-12.patch b/patches/0013-d-rules-compile-with-gcc-12.patch deleted file mode 100644 index 63b9b7f4c..000000000 --- a/patches/0013-d-rules-compile-with-gcc-12.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Thomas Lamprecht -Date: Tue, 25 Jul 2023 21:05:18 +0200 -Subject: [PATCH] d/rules: compile with gcc 12 - -Signed-off-by: Thomas Lamprecht ---- - 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 diff --git a/patches/series b/patches/series index df9d7baf6..8804134cc 100644 --- a/patches/series +++ b/patches/series @@ -1,15 +1,11 @@ 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