5 files changed, 257 insertions, 9 deletions

diff --git a/recipes-extended/ceph/ceph/0001-cepth-node-proxy-specify-entrypoint-executable.patch b/recipes-extended/ceph/ceph/0001-cepth-node-proxy-specify-entrypoint-executable.patch
new file mode 100644
index 00000000..a4135fd1
--- /dev/null
+++ b/recipes-extended/ceph/ceph/0001-cepth-node-proxy-specify-entrypoint-executable.patch
@@ -0,0 +1,27 @@
+From cd7b184bad23a3a80f2ccf8acc7662d0079282d3 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Mon, 22 Jul 2024 20:02:12 +0000
+Subject: [PATCH] cepth-node-proxy: specify entrypoint executable
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ src/ceph-node-proxy/setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ceph-node-proxy/setup.py b/src/ceph-node-proxy/setup.py
+index 7dcc7cdf5bf..f137c2e4307 100644
+--- a/src/ceph-node-proxy/setup.py
++++ b/src/ceph-node-proxy/setup.py
+@@ -25,6 +25,7 @@ setup(
+     entry_points=dict(
+         console_scripts=[
+             'ceph-node-proxy = ceph_node_proxy.main:main',
++            'executable': 'python3',
+         ],
+     ),
+     classifiers=[
+-- 
+2.39.2
+
diff --git a/recipes-extended/ceph/ceph/0001-common-dout-fix-FTBFS-on-GCC-14.patch b/recipes-extended/ceph/ceph/0001-common-dout-fix-FTBFS-on-GCC-14.patch
new file mode 100644
index 00000000..263bcf70
--- /dev/null
+++ b/recipes-extended/ceph/ceph/0001-common-dout-fix-FTBFS-on-GCC-14.patch
@@ -0,0 +1,146 @@
+From 0eace4ea9ea42412d4d6a16d24a8660642e41173 Mon Sep 17 00:00:00 2001
+From: Radoslaw Zarzynski <rzarzyns@redhat.com>
+Date: Wed, 24 Jan 2024 17:22:44 +0000
+Subject: [PATCH] common/dout: fix FTBFS on GCC 14
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The following problem has been reported by Kaleb Keithley:
+
+```
+/builddir/build/BUILD/ceph-18.2.1/src/osd/osd_types.h: In lambda function:
+/builddir/build/BUILD/ceph-18.2.1/src/common/dout.h:184:73: error: call to non-‘constexpr’ function ‘virtual unsigned int DoutPrefixProvider::get_subsys() const’
+  184 |     dout_impl(pdpp->get_cct(), ceph::dout::need_dynamic(pdpp->get_subsys()), v) \
+      |                                                         ~~~~~~~~~~~~~~~~^~
+/builddir/build/BUILD/ceph-18.2.1/src/common/dout.h:155:58: note: in definition of macro ‘dout_impl’
+  155 |       return (cctX->_conf->subsys.template should_gather<sub, v>());    \
+      |                                                          ^~~
+/builddir/build/BUILD/ceph-18.2.1/src/osd/osd_types.h:3617:3: note: in expansion of macro ‘ldpp_dout’
+ 3617 |   ldpp_dout(dpp, 10) << "build_prior all_probe " << all_probe << dendl;
+      |   ^~~~~~~~~
+```
+
+For details of the problem and the idea behind the fix,
+please refer to the comment this commit brings to `dout.h`.
+
+The minimized replicator that the facilitated Goldbot-based
+investigation:
+
+```cpp
+namespace ceph::dout {
+
+template<typename T>
+struct dynamic_marker_t {
+  T value;
+  // constexpr ctor isn't needed as it's an aggregate type
+  constexpr operator T() const { return value; }
+};
+
+template<typename T>
+constexpr dynamic_marker_t<T> need_dynamic(T&& t) {
+  return dynamic_marker_t<T>{ std::forward<T>(t) };
+}
+
+template<typename T>
+struct is_dynamic : public std::false_type {};
+
+template<typename T>
+struct is_dynamic<dynamic_marker_t<T>> : public std::true_type {};
+
+} // ceph::dout
+
+struct subsys_t {
+  template <unsigned SubV, int LvlV>
+  bool should_gather() const {
+    return true;
+  }
+  bool should_gather(const unsigned sub, int level) const {
+    return false;
+  }
+};
+
+static subsys_t subsys;
+
+  do {                                                                  \
+  const bool should_gather = [&](const auto cctX) {                     \
+    if constexpr (ceph::dout::is_dynamic<decltype(sub)>::value ||       \
+                  ceph::dout::is_dynamic<decltype(v)>::value) {         \
+      std::cout << "the dynamic path" << std::endl;                     \
+      return subsys.should_gather(sub, v);                              \
+    } else {                                                            \
+      /* The parentheses are **essential** because commas in angle      \
+       * brackets are NOT ignored on macro expansion! A language's      \
+       * limitation, sorry. */                                          \
+      std::cout << "the static path" << std::endl;                      \
+      /*return subsys.should_gather(sub, v);*/                              \
+      return (subsys.template should_gather<sub, v>());             \
+    }                                                                   \
+  }(cct);                                                               \
+  } while (0)
+
+  if (decltype(auto) pdpp = (dpp); pdpp) /* workaround -Wnonnull-compare for 'this' */ \
+    dout_impl(42, sub, v)
+
+  if (decltype(auto) pdpp = (dpp); pdpp) /* workaround -Wnonnull-compare for 'this' */ \
+    dout_impl(42, ceph::dout::need_dynamic(42), v)
+
+int main() {
+    std::random_device dev;
+    std::mt19937 rng(dev());
+    std::uniform_int_distribution<std::mt19937::result_type> dist6(1,6); // distribution in range [1, 6]
+
+    int sub = dist6(rng);
+    ldpp_dout("mocked out", sub);
+    //ldpp_subdout("mocked out", 4, 3);
+}
+```
+
+Upstream-Status: Backport [commit 0eace4ea9ea42412d4d6a16d24a8660642e41173]
+
+Fixes: https://tracker.ceph.com/issues/64050
+Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
+---
+ src/common/dout.h | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/src/common/dout.h b/src/common/dout.h
+index 4cd60efff8f..6516060c543 100644
+--- a/src/common/dout.h
++++ b/src/common/dout.h
+@@ -144,17 +144,27 @@ struct is_dynamic<dynamic_marker_t<T>> : public std::true_type {};
+ #else
+ #define dout_impl(cct, sub, v)                                         \
+   do {                                                                 \
+-  const bool should_gather = [&](const auto cctX) {                    \
+-    if constexpr (ceph::dout::is_dynamic<decltype(sub)>::value ||      \
+-                 ceph::dout::is_dynamic<decltype(v)>::value) {         \
++  const bool should_gather = [&](const auto cctX, auto sub_, auto v_) {        \
++    /* The check is performed on `sub_` and `v_` to leverage the C++'s         \
++     * guarantee on _discarding_ one of blocks of `if constexpr`, which        \
++     * includes also the checks for ill-formed code (`should_gather<>` \
++     * must not be feed with non-const expresions), BUT ONLY within    \
++     * a template (thus the generic lambda) and under the restriction  \
++     * it's dependant on a parameter of this template).                        \
++     * GCC prior to v14 was not enforcing these restrictions. */       \
++    if constexpr (ceph::dout::is_dynamic<decltype(sub_)>::value ||     \
++                 ceph::dout::is_dynamic<decltype(v_)>::value) {        \
+       return cctX->_conf->subsys.should_gather(sub, v);                        \
+     } else {                                                           \
++      constexpr auto sub_helper = static_cast<decltype(sub_)>(sub);    \
++      constexpr auto v_helper = static_cast<decltype(v_)>(v);          \
+       /* The parentheses are **essential** because commas in angle     \
+        * brackets are NOT ignored on macro expansion! A language's     \
+        * limitation, sorry. */                                         \
+-      return (cctX->_conf->subsys.template should_gather<sub, v>());   \
++      return (cctX->_conf->subsys.template should_gather<sub_helper,   \
++                                                        v_helper>());  \
+     }                                                                  \
+-  }(cct);                                                              \
++  }(cct, sub, v);                                                      \
+                                                                        \
+   if (should_gather) {                                                 \
+     ceph::logging::MutableEntry _dout_e(v, sub);                        \
+-- 
+2.39.2
+
diff --git a/recipes-extended/ceph/ceph/0001-rados-setup.py-allow-incompatible-pointer-types.patch b/recipes-extended/ceph/ceph/0001-rados-setup.py-allow-incompatible-pointer-types.patch
new file mode 100644
index 00000000..a67e45b5
--- /dev/null
+++ b/recipes-extended/ceph/ceph/0001-rados-setup.py-allow-incompatible-pointer-types.patch
@@ -0,0 +1,28 @@
+From 1b64bc536a3ea47c39e631409c833e99820ae7c2 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Mon, 22 Jul 2024 21:01:17 +0000
+Subject: [PATCH] rados: setup.py allow incompatible pointer types
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ src/pybind/rados/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pybind/rados/setup.py b/src/pybind/rados/setup.py
+index 74bf75b6ddc..87126ca8338 100755
+--- a/src/pybind/rados/setup.py
++++ b/src/pybind/rados/setup.py
+@@ -30,7 +30,7 @@ def filter_unsupported_flags(compiler, flags):
+                                 f.startswith('-fcf-protection'),
+                                 flags))
+     else:
+-        return flags
++        return flags + [ "-Wno-error=incompatible-pointer-types" ]
+ 
+ 
+ def monkey_with_compiler(customize):
+-- 
+2.39.2
+
diff --git a/recipes-extended/ceph/ceph/0001-rgw-setup.py-allow-incompatible-pointer-types.patch b/recipes-extended/ceph/ceph/0001-rgw-setup.py-allow-incompatible-pointer-types.patch
new file mode 100644
index 00000000..b21678a9
--- /dev/null
+++ b/recipes-extended/ceph/ceph/0001-rgw-setup.py-allow-incompatible-pointer-types.patch
@@ -0,0 +1,28 @@
+From 84097fe398ee69172d4d9ae978ff0380fd6362cf Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Mon, 22 Jul 2024 20:43:50 +0000
+Subject: [PATCH] rgw: setup.py allow incompatible pointer types
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ src/pybind/rgw/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pybind/rgw/setup.py b/src/pybind/rgw/setup.py
+index 74bf75b6ddc..87126ca8338 100755
+--- a/src/pybind/rgw/setup.py
++++ b/src/pybind/rgw/setup.py
+@@ -30,7 +30,7 @@ def filter_unsupported_flags(compiler, flags):
+                                 f.startswith('-fcf-protection'),
+                                 flags))
+     else:
+-        return flags
++        return flags + [ "-Wno-error=incompatible-pointer-types" ]
+ 
+ 
+ def monkey_with_compiler(customize):
+-- 
+2.39.2
+
diff --git a/recipes-extended/ceph/ceph_18.2.2.bb b/recipes-extended/ceph/ceph_git.bb
index e6c44188..2eaa335a 100644
--- a/recipes-extended/ceph/ceph_18.2.2.bb
+++ b/recipes-extended/ceph/ceph_git.bb
@@ -2,29 +2,35 @@ SUMMARY = "User space components of the Ceph file system"
 LICENSE = "LGPL-2.1-only & GPL-2.0-only & Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://COPYING-LGPL2.1;md5=fbc093901857fcd118f065f900982c24 \
                     file://COPYING-GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYING;md5=5351120989d78252e65dc1a2a92e3617 \
+                    file://COPYING;md5=bf502a28c9b8d6430c8952a583a2c896 \
 "
 inherit cmake pkgconfig python3native python3-dir systemd useradd
 # Disable python pybind support for ceph temporary, when corss compiling pybind,
 # pybind mix cmake and python setup environment, would case a lot of errors.
 
-SRC_URI = "http://download.ceph.com/tarballs/ceph-${PV}.tar.gz \
+SRC_URI = "gitsm://github.com/ceph/ceph.git;protocol=https;branch=main \
            file://0001-fix-host-library-paths-were-used.patch \
            file://ceph.conf \
-           file://0001-avoid-to_string-error.patch \
            file://0001-delete-install-layout-deb.patch \
            file://0001-cephadm-build.py-avoid-using-python3-from-sysroot-wh.patch \
-"
+           file://0001-cepth-node-proxy-specify-entrypoint-executable.patch \
+           file://0001-rados-setup.py-allow-incompatible-pointer-types.patch \
+           file://0001-rgw-setup.py-allow-incompatible-pointer-types.patch \
+           "
+
+SRCREV = "a53e858fd7cc6fd8c04f37d503ce9ed7080f2da6"
+PV = "20.0.0+git"
 
-SRC_URI[sha256sum] = "e70bb5246b4a5d7aa78eb548677a05cc21d0d47945ba2937fddc7511134ffb57"
+S = "${WORKDIR}/git"
 
 DEPENDS = "boost bzip2 curl cryptsetup expat gperf-native \
            keyutils libaio libibverbs lua lz4 \
            nspr nss ninja-native \
            oath openldap openssl \
            python3 python3-native python3-cython-native python3-pyyaml-native \
-           rabbitmq-c rocksdb snappy thrift udev \
+           rabbitmq-c snappy thrift udev \
            valgrind xfsprogs zlib libgcc zstd re2 \
+           lmdb autoconf-native automake-native \
 "
 
 
@@ -52,6 +58,7 @@ SYSTEMD_SERVICE:${PN} = " \
         ceph-mgr@.service \
         ceph-mgr.target \
         ceph-crash.service \
+        ceph-exporter.service \
         rbdmap.service \
         ceph-immutable-object-cache@.service \
         ceph-immutable-object-cache.target \
@@ -71,16 +78,20 @@ EXTRA_OECMAKE += "-DWITH_MANPAGE=OFF \
                  -DWITH_MGR=OFF \
                  -DWITH_MGR_DASHBOARD_FRONTEND=OFF \
                  -DWITH_SYSTEM_BOOST=ON \
-                 -DWITH_SYSTEM_ROCKSDB=ON \
                  -DWITH_RDMA=OFF \
+                 -DWITH_RBD=OFF \
+                 -DWITH_KRBD=OFF \
                  -DWITH_RADOSGW_AMQP_ENDPOINT=OFF \
                  -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \
                  -DWITH_REENTRANT_STRSIGNAL=ON \
-                 -DWITH_PYTHON3=3.12 \
+                 -DWITH_PYTHON3=3.13 \
                  -DPYTHON_DESIRED=3 \
                  -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${WORKDIR}/toolchain.cmake \
+                 -DCEPHADM_BUNDLED_DEPENDENCIES=none \
                  "
 
+# -DWITH_SYSTEM_ROCKSDB=ON
+
 do_configure:prepend () {
         echo "set( CMAKE_SYSROOT \"${RECIPE_SYSROOT}\" )" >> ${WORKDIR}/toolchain.cmake
         echo "set( CMAKE_DESTDIR \"${D}\" )" >> ${WORKDIR}/toolchain.cmake
@@ -88,6 +99,12 @@ do_configure:prepend () {
         # echo "set( CMAKE_C_COMPILER_WORKS TRUE)" >> ${WORKDIR}/toolchain.cmake
         # echo "set( CMAKE_CXX_COMPILER_FORCED TRUE)" >> ${WORKDIR}/toolchain.cmake
         echo "set( CMAKE_C_COMPILER_FORCED TRUE )" >> ${WORKDIR}/toolchain.cmake
+
+        echo "set( WITH_QATDRV OFF )" >> ${WORKDIR}/toolchain.cmake
+        echo "set( WITH_QATZIP OFF )" >> ${WORKDIR}/toolchain.cmake
+        echo "set( WITH_LIBURING OFF )" >> ${WORKDIR}/toolchain.cmake
+        echo "set( WITH_QATLIB OFF )" >> ${WORKDIR}/toolchain.cmake
+        # echo "set( WITH_SYSTEM_ROCKSDB TRUE )" >> ${WORKDIR}/toolchain.cmake
 }
 
 do_compile:prepend() {
@@ -106,7 +123,7 @@ do_install:append () {
                 ${D}${sbindir}/ceph-volume ${D}${sbindir}/ceph-volume-systemd
         find ${D} -name SOURCES.txt | xargs sed -i -e 's:${WORKDIR}::'
         install -d ${D}${sysconfdir}/ceph
-        install -m 644 ${WORKDIR}/ceph.conf ${D}${sysconfdir}/ceph/
+        install -m 644 ${UNPACKDIR}/ceph.conf ${D}${sysconfdir}/ceph/
         install -d ${D}${systemd_unitdir}
         mv ${D}${libexecdir}/ceph/ceph-osd-prestart.sh ${D}${libdir}/ceph
         mv ${D}${libexecdir}/ceph/ceph_common.sh ${D}${libdir}/ceph
@@ -137,6 +154,7 @@ FILES:${PN} += "\
                 ${libdir}/ceph/compressor/*.so \
                 ${libdir}/rados-classes/*.so \
                 ${libdir}/ceph/*.so \
+                ${libdir}/*.so \
                 ${libdir}/libcephsqlite.so \
 "
 
@@ -151,6 +169,7 @@ FILES:${PN}-dev = " \
     ${libdir}/librados*.so \
     ${libdir}/librbd.so \
     ${libdir}/librgw.so \
+    ${libdir}/pkgconfig/cephfs.pc \
 "
 
 FILES:${PN}-python = "\