From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 8CA6D1FF13F for ; Thu, 18 Jun 2026 15:08:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 708D218B7E; Thu, 18 Jun 2026 15:08:06 +0200 (CEST) From: Kefu Chai To: pve-devel@lists.proxmox.com Subject: [PATCH ceph] refresh patches and drop applied ones for 20.2.2 Date: Thu, 18 Jun 2026 21:07:16 +0800 Message-ID: <20260618130716.1810096-1-k.chai@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1781787989511 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.277 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 42LJIJJMEIEQCLR2NDMZCVVQRC6WA4ZI X-Message-ID-Hash: 42LJIJJMEIEQCLR2NDMZCVVQRC6WA4ZI X-MailFrom: k.chai@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Drop patches that have been merged upstream in Tentacle 20.2.2: - Remove-failing-actions-from-prerm (*.prerm files removed upstream) - d-py3dist-drop-python3-distutils (distutils already absent upstream) Refresh remaining patches so that they apply cleanly. Signed-off-by: Kefu Chai --- ...04-Remove-failing-actions-from-prerm.patch | 158 ------------------ ...ing-avoid-Before-remote-fs-pre.targ.patch} | 0 ...-crash-daemon-with-www-data-group-f.patch} | 0 ...-with-CPUs-not-supporting-SSE-4.1-i.patch} | 0 ...-do-not-always-reload-all-sysctl-se.patch} | 0 ...-crash-change-order-of-client-names.patch} | 0 ...hared_blob-to-prevent-crashing-OSDs.patch} | 4 +- ...10-d-rules-disable-jaeger-telemetry.patch} | 0 ...p-legacy-init.d-ceph-script-anymore.patch} | 0 ...ython3-distutils-not-available-in-De.patch | 28 ---- ...port-by-making-NOTIFY_TYPES-in-py-m.patch} | 4 +- ...e-on_progress-callbacks-to-prevent-.patch} | 0 patches/series | 22 ++- 13 files changed, 14 insertions(+), 202 deletions(-) delete mode 100644 patches/0004-Remove-failing-actions-from-prerm.patch rename patches/{0005-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch => 0004-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch} (100%) rename patches/{0006-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch => 0005-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch} (100%) rename patches/{0007-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch => 0006-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch} (100%) rename patches/{0008-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch => 0007-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch} (100%) rename patches/{0009-ceph-crash-change-order-of-client-names.patch => 0008-ceph-crash-change-order-of-client-names.patch} (100%) rename patches/{0010-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch => 0009-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch} (94%) rename patches/{0011-d-rules-disable-jaeger-telemetry.patch => 0010-d-rules-disable-jaeger-telemetry.patch} (100%) rename patches/{0013-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch => 0011-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch} (100%) delete mode 100644 patches/0012-d-py3dist-drop-python3-distutils-not-available-in-De.patch rename patches/{0014-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch => 0012-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch} (95%) rename patches/{0015-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch => 0013-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch} (100%) diff --git a/patches/0004-Remove-failing-actions-from-prerm.patch b/patches/0004-Remove-failing-actions-from-prerm.patch deleted file mode 100644 index 5ce1a30360b..00000000000 --- a/patches/0004-Remove-failing-actions-from-prerm.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dominic=20J=C3=A4ger?= -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 -Signed-off-by: Thomas Lamprecht -Signed-off-by: Max R. Carrara ---- - debian/ceph-base.prerm | 16 ---------------- - debian/ceph-mds.prerm | 16 ---------------- - debian/ceph-mgr.prerm | 16 ---------------- - debian/ceph-mon.prerm | 16 ---------------- - debian/ceph-osd.prerm | 16 ---------------- - 5 files changed, 80 deletions(-) - -diff --git a/debian/ceph-base.prerm b/debian/ceph-base.prerm -index 12e5da7d633..37460790a09 100644 ---- a/debian/ceph-base.prerm -+++ b/debian/ceph-base.prerm -@@ -1,22 +1,6 @@ - #!/bin/sh - # vim: set noet ts=8: - --set -e -- --case "$1" in -- remove) -- 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 51f30d7f98e..37460790a09 100644 ---- a/debian/ceph-mds.prerm -+++ b/debian/ceph-mds.prerm -@@ -1,22 +1,6 @@ - #!/bin/sh - # vim: set noet ts=8: - --set -e -- --case "$1" in -- remove) -- 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 5e4bf42c2dd..37460790a09 100644 ---- a/debian/ceph-mgr.prerm -+++ b/debian/ceph-mgr.prerm -@@ -1,22 +1,6 @@ - #!/bin/sh - # vim: set noet ts=8: - --set -e -- --case "$1" in -- remove) -- 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 a31fc3c2184..37460790a09 100644 ---- a/debian/ceph-mon.prerm -+++ b/debian/ceph-mon.prerm -@@ -1,22 +1,6 @@ - #!/bin/sh - # vim: set noet ts=8: - --set -e -- --case "$1" in -- remove) -- 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 93c459614e4..37460790a09 100644 ---- a/debian/ceph-osd.prerm -+++ b/debian/ceph-osd.prerm -@@ -1,22 +1,6 @@ - #!/bin/sh - # vim: set noet ts=8: - --set -e -- --case "$1" in -- remove) -- invoke-rc.d ceph stop osd || { -- RESULT=$? -- if [ $RESULT != 100 ]; then -- exit $RESULT -- fi -- } -- ;; -- -- *) -- ;; --esac -- - #DEBHELPER# - - exit 0 diff --git a/patches/0005-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch b/patches/0004-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch similarity index 100% rename from patches/0005-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch rename to patches/0004-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch diff --git a/patches/0006-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch b/patches/0005-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch similarity index 100% rename from patches/0006-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch rename to patches/0005-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch diff --git a/patches/0007-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch b/patches/0006-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch similarity index 100% rename from patches/0007-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch rename to patches/0006-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch diff --git a/patches/0008-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch b/patches/0007-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch similarity index 100% rename from patches/0008-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch rename to patches/0007-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch diff --git a/patches/0009-ceph-crash-change-order-of-client-names.patch b/patches/0008-ceph-crash-change-order-of-client-names.patch similarity index 100% rename from patches/0009-ceph-crash-change-order-of-client-names.patch rename to patches/0008-ceph-crash-change-order-of-client-names.patch diff --git a/patches/0010-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch b/patches/0009-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch similarity index 94% rename from patches/0010-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch rename to patches/0009-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch index d8fc5e86787..7180b2c4fc8 100644 --- a/patches/0010-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch +++ b/patches/0009-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch @@ -19,10 +19,10 @@ Signed-off-by: Max R. Carrara 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/options/global.yaml.in b/src/common/options/global.yaml.in -index 99cadcdf35e..f2148e936f8 100644 +index da1ff5a1009..23e878fed65 100644 --- a/src/common/options/global.yaml.in +++ b/src/common/options/global.yaml.in -@@ -5140,7 +5140,7 @@ options: +@@ -5152,7 +5152,7 @@ options: long_desc: Overwrites on snapped objects cause shared blob count to grow. It has a very negative performance effect. When enabled shared blob count is significantly reduced. diff --git a/patches/0011-d-rules-disable-jaeger-telemetry.patch b/patches/0010-d-rules-disable-jaeger-telemetry.patch similarity index 100% rename from patches/0011-d-rules-disable-jaeger-telemetry.patch rename to patches/0010-d-rules-disable-jaeger-telemetry.patch diff --git a/patches/0013-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch b/patches/0011-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch similarity index 100% rename from patches/0013-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch rename to patches/0011-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch diff --git a/patches/0012-d-py3dist-drop-python3-distutils-not-available-in-De.patch b/patches/0012-d-py3dist-drop-python3-distutils-not-available-in-De.patch deleted file mode 100644 index 719bffc4a93..00000000000 --- a/patches/0012-d-py3dist-drop-python3-distutils-not-available-in-De.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Thomas Lamprecht -Date: Tue, 3 Jun 2025 21:33:31 +0200 -Subject: [PATCH] d/py3dist: drop python3-distutils, not available in Debian - Trixie anymore - -It was simply removed [0] without any comment or rationale at all -(always really great ... -.-), anyhow, just drop it here for now, -we're not even in a beta state so we can always reverse/adapt this if -it becomes clear that wasn't the correct choice. - -[0]: https://salsa.debian.org/cpython-team/python3-stdlib/-/commit/974943cee10b348c971084f5ef3c78e9b8d293b6 - -Signed-off-by: Thomas Lamprecht -Signed-off-by: Max R. Carrara ---- - debian/py3dist-overrides | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/debian/py3dist-overrides b/debian/py3dist-overrides -index b6358cf123e..73c20633a7d 100644 ---- a/debian/py3dist-overrides -+++ b/debian/py3dist-overrides -@@ -1,4 +1,3 @@ - cephfs python3-cephfs; PEP386 - ceph_argparse python3-ceph-argparse - ceph_common python3-ceph-common --distutils python3-distutils diff --git a/patches/0014-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch b/patches/0012-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch similarity index 95% rename from patches/0014-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch rename to patches/0012-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch index aa0e580f90c..a81049b2e8d 100644 --- a/patches/0014-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch +++ b/patches/0012-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch @@ -34,10 +34,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mgr/PyModule.cc b/src/mgr/PyModule.cc -index 4f996489ba0..ecbf810661b 100644 +index a25c45c2645..bc173ecc223 100644 --- a/src/mgr/PyModule.cc +++ b/src/mgr/PyModule.cc -@@ -447,11 +447,13 @@ int PyModule::register_options(PyObject *cls) +@@ -513,11 +513,13 @@ int PyModule::register_options(PyObject *cls) int PyModule::load_notify_types() { diff --git a/patches/0015-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch b/patches/0013-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch similarity index 100% rename from patches/0015-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch rename to patches/0013-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch diff --git a/patches/series b/patches/series index 7734bdd102e..db38f90574a 100644 --- a/patches/series +++ b/patches/series @@ -1,15 +1,13 @@ 0001-cmake-disable-version-from-git.patch 0002-d-rules-fix-instaldoc-override-and-ship-upstream-cha.patch 0003-ceph-mgr-only-suggest-mgr-plugins.patch -0004-Remove-failing-actions-from-prerm.patch -0005-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch -0006-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch -0007-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch -0008-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch -0009-ceph-crash-change-order-of-client-names.patch -0010-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch -0011-d-rules-disable-jaeger-telemetry.patch -0012-d-py3dist-drop-python3-distutils-not-available-in-De.patch -0013-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch -0014-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch -0015-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch +0004-fix-service-ordering-avoid-Before-remote-fs-pre.targ.patch +0005-fix-4759-run-ceph-crash-daemon-with-www-data-group-f.patch +0006-fix-compatibility-with-CPUs-not-supporting-SSE-4.1-i.patch +0007-ceph-osd-postinst-do-not-always-reload-all-sysctl-se.patch +0008-ceph-crash-change-order-of-client-names.patch +0009-disable-elastic_shared_blob-to-prevent-crashing-OSDs.patch +0010-d-rules-disable-jaeger-telemetry.patch +0011-debian-do-not-ship-legacy-init.d-ceph-script-anymore.patch +0012-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch +0013-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch -- 2.47.3