Comment 23 for bug 2043336

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

From https://launchpadlibrarian.net/713408703/ceph_17.2.6-0ubuntu0.22.04.2_17.2.7-0ubuntu0.22.04.1.diff.gz. a debian/ceph.patch file is being added:

diff -Nru ceph-17.2.6/debian/ceph.patch ceph-17.2.7/debian/ceph.patch
--- ceph-17.2.6/debian/ceph.patch 1970-01-01 00:00:00.000000000 +0000
+++ ceph-17.2.7/debian/ceph.patch 2024-01-31 17:10:43.000000000 +0000
@@ -0,0 +1,58 @@
+diff --git a/debian/control b/debian/control
+index 683ad2df6c..469a1bb1c3 100644
+--- a/debian/control
++++ b/debian/control
+@@ -13,7 +13,7 @@ Vcs-Browser: https://salsa.debian.org/ceph-team/ceph
+ Build-Depends:
+ clang [armhf mipsel armel m68k sh4],
+ cmake,
+- cython3-legacy,
++ cython3,
+ debhelper (>= 10~),
+ default-jdk,
+ dh-exec,
+@@ -26,21 +26,6 @@ Build-Depends:
+ libbabeltrace-ctf-dev,
+ libbabeltrace-dev,
+ libblkid-dev (>= 2.17),
+- libboost-atomic-dev (>= 1.74.0),
+- libboost-chrono-dev (>= 1.74.0),
+- libboost-context-dev (>= 1.74.0) [!mips64el !ia64 !m68k !ppc64 !sh4 !sparc64 !x32],
+- libboost-coroutine-dev (>= 1.74.0) [!mips64el !ia64 !m68k !ppc64 !sh4 !sparc64 !x32],
+- libboost-date-time-dev (>= 1.74.0),
+- libboost-filesystem-dev (>= 1.74.0),
+- libboost-iostreams-dev (>= 1.74.0),
+- libboost-program-options-dev (>= 1.74.0),
+- libboost-python-dev (>= 1.74.0),
+- libboost-random-dev (>= 1.74.0),
+- libboost-regex-dev (>= 1.74.0),
+- libboost-system-dev (>= 1.74.0),
+- libboost-test-dev (>= 1.74.0),
+- libboost-thread-dev (>= 1.74.0),
+- libboost-timer-dev (>= 1.74.0),
+ libbz2-dev,
+ libc-ares-dev,
+ libcap-dev,
+diff --git a/debian/patches/series b/debian/patches/series
+index 608f0eb491..c8a98c3f0d 100644
+--- a/debian/patches/series
++++ b/debian/patches/series
+@@ -16,4 +16,4 @@ fix-CheckCxxAtomic-riscv64.patch
+ patch-out-exporter.patch
+ fix-mantic-misc.patch
+ cmake-allow-empty-submodules.patch
+-fix-boost-1.82-build.patch
++#fix-boost-1.82-build.patch
+diff --git a/debian/rules b/debian/rules
+index 5babc6c9fc..e56e2ca829 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -63,7 +63,7 @@ extraopts += -DWITH_PYTHON3=3
+ extraopts += -DWITH_CEPHFS_JAVA=ON
+ extraopts += -DWITH_CEPHFS_SHELL=ON
+ extraopts += -DWITH_TESTS=OFF
+-extraopts += -DWITH_SYSTEM_BOOST=ON
++extraopts += -DWITH_SYSTEM_BOOST=OFF
+ extraopts += -DWITH_LTTNG=OFF -DWITH_EMBEDDED=OFF
+ extraopts += -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib
+ extraopts += -DWITH_MGR_DASHBOARD_FRONTEND=OFF
diff -Nru ceph-17.2.6/debian/changelog ceph-17.2.7/debian/changelog
--- ceph-17.2.6/debian/changelog 2023-08-31 22:44:27.000000000 +0000
+++ ceph-17.2.7/debian/changelog 2024-02-08 11:33:49.000000000 +0000
@@ -1,3 +1,12 @@
+ceph (17.2.7-0ubuntu0.22.04.1) jammy; urgency=medium
+
+ * New upstream point release (LP: #2043336):
+ - d/p/fix-lvm-devices.patch: Cherry pick committed fix for issues
+ using LVM PV/LV for OSDs introduced in 17.2.7 release.
+ - d/p/patch-out-exporter.patch: Refresh for new release.
+
+ -- Luciano Lo Giudice <email address hidden> Thu, 08 Feb 2024 11:33:49 +0000
+
 ceph (17.2.6-0ubuntu0.22.04.2) jammy; urgency=medium

   [ Peter Sabaini]