diff --git a/patches/0001-cmake-disable-version-from-git.patch b/patches/0001-cmake-disable-version-from-git.patch index 70603f3ca..6040b9ade 100644 --- a/patches/0001-cmake-disable-version-from-git.patch +++ b/patches/0001-cmake-disable-version-from-git.patch @@ -11,7 +11,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e1f90f72b..185218554 100644 +index f91dd1abe7f..ef2e54b7d71 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,17 +35,10 @@ configure_file(ceph-crash.in diff --git a/patches/0002-debian-control-add-break-libpvestorage-perl.patch b/patches/0002-debian-control-add-break-libpvestorage-perl.patch index 8743584bb..a30527c22 100644 --- a/patches/0002-debian-control-add-break-libpvestorage-perl.patch +++ b/patches/0002-debian-control-add-break-libpvestorage-perl.patch @@ -9,10 +9,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control -index 837a55a37..a845ba795 100644 +index ddba52be7bb..484804f6b7a 100644 --- a/debian/control +++ b/debian/control -@@ -155,6 +155,7 @@ Replaces: ceph (<< 10), +@@ -154,6 +154,7 @@ Replaces: ceph (<< 10), Breaks: ceph (<< 10), ceph-test (<< 12.2.2-14), python-ceph (<< 0.92-1223), @@ -20,7 +20,7 @@ index 837a55a37..a845ba795 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, -@@ -634,6 +635,7 @@ Breaks: ceph (<< 10), +@@ -659,6 +660,7 @@ Breaks: ceph (<< 10), ceph-test (<< 9.0.3-1646), librbd1 (<< 0.92-1238), python-ceph (<< 0.92-1223), diff --git a/patches/0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch b/patches/0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch index f1d75d203..32ae8db22 100644 --- a/patches/0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch +++ b/patches/0003-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch @@ -15,7 +15,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules -index ed7f4a255..45a624b5a 100755 +index 68c69e04474..f821908340e 100755 --- a/debian/rules +++ b/debian/rules @@ -80,7 +80,7 @@ override_dh_auto_install: diff --git a/patches/0004-remove-legacy-pve-ceph-osd-activation-script-in-post.patch b/patches/0004-remove-legacy-pve-ceph-osd-activation-script-in-post.patch index 03bfd362e..98cd46e70 100644 --- a/patches/0004-remove-legacy-pve-ceph-osd-activation-script-in-post.patch +++ b/patches/0004-remove-legacy-pve-ceph-osd-activation-script-in-post.patch @@ -17,7 +17,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 13 insertions(+) diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst -index 04e33b860..6c2513d4d 100644 +index 04e33b8601f..6c2513d4db5 100644 --- a/debian/ceph-osd.postinst +++ b/debian/ceph-osd.postinst @@ -26,6 +26,19 @@ case "$1" in diff --git a/patches/0005-remove-legacy-init.d-ceph-script.patch b/patches/0005-remove-legacy-init.d-ceph-script.patch index a3d99edae..c60f49c5d 100644 --- a/patches/0005-remove-legacy-init.d-ceph-script.patch +++ b/patches/0005-remove-legacy-init.d-ceph-script.patch @@ -11,7 +11,7 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/ceph-base.install b/debian/ceph-base.install -index a3d7757a5..51fafb6e9 100644 +index a3d7757a585..51fafb6e90a 100644 --- a/debian/ceph-base.install +++ b/debian/ceph-base.install @@ -1,4 +1,3 @@ @@ -20,7 +20,7 @@ index a3d7757a5..51fafb6e9 100644 usr/bin/ceph-crash usr/bin/ceph-debugpack diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript -index 196dc0841..180b7dfde 100644 +index 196dc084135..180b7dfde4d 100644 --- a/debian/ceph-base.maintscript +++ b/debian/ceph-base.maintscript @@ -1,2 +1,3 @@ diff --git a/patches/0006-ceph-mgr-only-suggest-mgr-plugins.patch b/patches/0006-ceph-mgr-only-suggest-mgr-plugins.patch index 8d147cac5..499343849 100644 --- a/patches/0006-ceph-mgr-only-suggest-mgr-plugins.patch +++ b/patches/0006-ceph-mgr-only-suggest-mgr-plugins.patch @@ -12,7 +12,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control -index a845ba795..32e7bb45c 100644 +index 484804f6b7a..fa61368ad8b 100644 --- a/debian/control +++ b/debian/control @@ -235,11 +235,11 @@ Depends: ceph-base (= ${binary:Version}), diff --git a/patches/0007-Remove-failing-actions-from-prerm.patch b/patches/0007-Remove-failing-actions-from-prerm.patch index 4370400a5..a8c221774 100644 --- a/patches/0007-Remove-failing-actions-from-prerm.patch +++ b/patches/0007-Remove-failing-actions-from-prerm.patch @@ -21,7 +21,7 @@ Signed-off-by: Thomas Lamprecht 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 @@ @@ -49,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 @@ @@ -77,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 @@ @@ -105,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 @@ @@ -133,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 @@ diff --git a/patches/0008-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch b/patches/0008-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch index 58ffd6ef0..2acadc748 100644 --- a/patches/0008-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 afa36702f..03ffbc1fa 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 afa36702f..03ffbc1fa 100644 [Service] Environment=CLUSTER=ceph diff --git a/systemd/ceph-mgr@.service.in b/systemd/ceph-mgr@.service.in -index 8fadc4746..79ea740a7 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 8fadc4746..79ea740a7 100644 [Service] Environment=CLUSTER=ceph diff --git a/systemd/ceph-mon@.service.in b/systemd/ceph-mon@.service.in -index 2eba83c3c..a2a619d7f 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 2eba83c3c..a2a619d7f 100644 [Service] Environment=CLUSTER=ceph diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in -index 046500efb..c988cf345 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 046500efb..c988cf345 100644 [Service] Environment=CLUSTER=ceph diff --git a/systemd/ceph-radosgw@.service.in b/systemd/ceph-radosgw@.service.in -index b74747055..5cccc21ee 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 b74747055..5cccc21ee 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/0009-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 index 1e9b1a5f6..6b92b34c2 100644 --- a/patches/0009-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 @@ -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/0011-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch b/patches/0010-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch similarity index 96% rename from patches/0011-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch rename to patches/0010-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch index 566400d2b..4f4ef6de8 100644 --- a/patches/0011-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch +++ b/patches/0010-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch @@ -16,7 +16,7 @@ Signed-off-by: Thomas Lamprecht 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() diff --git a/patches/0013-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch b/patches/0011-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch similarity index 99% rename from patches/0013-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch rename to patches/0011-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch index 9cc2889da..fec2ae522 100644 --- a/patches/0013-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch +++ b/patches/0011-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch @@ -40,7 +40,7 @@ Signed-off-by: Max Carrara 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 68725be6e35..0759da05064 100644 --- a/src/pybind/mgr/dashboard/module.py +++ b/src/pybind/mgr/dashboard/module.py @@ -23,8 +23,7 @@ if TYPE_CHECKING: @@ -123,6 +123,3 @@ index 68725be6e35..c8b263d9786 100644 @CLIWriteCommand("dashboard set-rgw-credentials") def set_rgw_credentials(self): --- -2.39.2 - diff --git a/patches/0015-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch b/patches/0012-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch similarity index 89% rename from patches/0015-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch rename to patches/0012-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch index 947175605..6030ba44e 100644 --- a/patches/0015-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch +++ b/patches/0012-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 @@ -26,7 +26,7 @@ Signed-off-by: Friedrich Weber 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst -index 04e33b8601f..2bcd8d4dcb4 100644 +index 6c2513d4db5..95adfd6afb0 100644 --- a/debian/ceph-osd.postinst +++ b/debian/ceph-osd.postinst @@ -24,7 +24,11 @@ set -e @@ -40,8 +40,5 @@ index 04e33b8601f..2bcd8d4dcb4 100644 + >/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/0016-debian-recursively-adjust-permissions-of-var-lib-cep.patch b/patches/0013-debian-recursively-adjust-permissions-of-var-lib-cep.patch similarity index 99% rename from patches/0016-debian-recursively-adjust-permissions-of-var-lib-cep.patch rename to patches/0013-debian-recursively-adjust-permissions-of-var-lib-cep.patch index 36f4df3aa..1feefea08 100644 --- a/patches/0016-debian-recursively-adjust-permissions-of-var-lib-cep.patch +++ b/patches/0013-debian-recursively-adjust-permissions-of-var-lib-cep.patch @@ -49,6 +49,3 @@ index 75eeb59c624..424c2c889d5 100644 ;; abort-upgrade|abort-remove|abort-deconfigure) : --- -2.39.2 - diff --git a/patches/0017-ceph-crash-change-order-of-client-names.patch b/patches/0014-ceph-crash-change-order-of-client-names.patch similarity index 94% rename from patches/0017-ceph-crash-change-order-of-client-names.patch rename to patches/0014-ceph-crash-change-order-of-client-names.patch index 8131fced5..a6638ee59 100644 --- a/patches/0017-ceph-crash-change-order-of-client-names.patch +++ b/patches/0014-ceph-crash-change-order-of-client-names.patch @@ -11,7 +11,7 @@ Signed-off-by: Max Carrara 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 +25,3 @@ index 0e02837fadd..713080a4dc1 100755 'client.admin'] --- -2.39.2 - diff --git a/patches/series b/patches/series index 82af025fb..a52bc4c67 100644 --- a/patches/series +++ b/patches/series @@ -7,8 +7,8 @@ 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 -0011-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch -0013-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch -0015-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch -0016-debian-recursively-adjust-permissions-of-var-lib-cep.patch -0017-ceph-crash-change-order-of-client-names.patch +0010-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch +0011-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch +0012-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch +0013-debian-recursively-adjust-permissions-of-var-lib-cep.patch +0014-ceph-crash-change-order-of-client-names.patch