From: John Mulligan <jmulligan@redhat.com>
Date: Tue, 10 May 2022 14:30:32 +0000 (-0400)
Subject: pybind/mgr: include object_format.py in CMakeLists.txt for build
X-Git-Tag: v18.0.0~841^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ecbffbea5d6af96be4b360cd30332779e793efc;p=ceph.git

pybind/mgr: include object_format.py in CMakeLists.txt for build

Because ceph uses CMake for building python packages too.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 3042d6e0dc97..5e32c4ce4c34 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1738,6 +1738,7 @@ fi
 %dir %{_datadir}/ceph/mgr
 %{_datadir}/ceph/mgr/mgr_module.*
 %{_datadir}/ceph/mgr/mgr_util.*
+%{_datadir}/ceph/mgr/object_format.*
 %{_unitdir}/ceph-mgr@.service
 %{_unitdir}/ceph-mgr.target
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mgr
diff --git a/src/pybind/mgr/CMakeLists.txt b/src/pybind/mgr/CMakeLists.txt
index 4580ee2b7a74..54aa91420289 100644
--- a/src/pybind/mgr/CMakeLists.txt
+++ b/src/pybind/mgr/CMakeLists.txt
@@ -58,5 +58,5 @@ set(mgr_modules
 install(DIRECTORY ${mgr_modules}
   DESTINATION ${CEPH_INSTALL_DATADIR}/mgr
   ${mgr_module_install_excludes})
-install(FILES mgr_module.py mgr_util.py
+install(FILES mgr_module.py mgr_util.py object_format.py
   DESTINATION ${CEPH_INSTALL_DATADIR}/mgr)