4 files changed, 88 insertions, 1 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-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_git.bb b/recipes-extended/ceph/ceph_git.bb
index c0b97e0e..36f4cccd 100644
--- a/recipes-extended/ceph/ceph_git.bb
+++ b/recipes-extended/ceph/ceph_git.bb
@@ -13,6 +13,9 @@ SRC_URI = "gitsm://github.com/ceph/ceph.git;protocol=https;branch=main \
            file://ceph.conf \
            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="103cd8e78bcfe7f69647013187c053c9ccb76685"
@@ -55,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 \
@@ -117,7 +121,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