From: John Mulligan <jmulligan@redhat.com>
Date: Tue, 27 Sep 2022 20:53:52 +0000 (-0400)
Subject: cephadm: configure cmake to pass versioning values to build.py
X-Git-Tag: v18.2.1~326^2~92
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e516b7dcdf8ae1ba4abd6d25ff6c5a89d7efff2d;p=ceph-ci.git

cephadm: configure cmake to pass versioning values to build.py

These values are copied from the variable names used in `ceph.in` (the
file that becomes the `ceph` command).

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 9a3438a4d23d418c6fd0b6d7fa6cea1d2afac6aa)
---

diff --git a/src/cephadm/CMakeLists.txt b/src/cephadm/CMakeLists.txt
index fdb7c9881fa..8b969bc33e7 100644
--- a/src/cephadm/CMakeLists.txt
+++ b/src/cephadm/CMakeLists.txt
@@ -11,7 +11,13 @@ add_custom_command(
     ${CMAKE_CURRENT_SOURCE_DIR}/cephadm.py
     ${CMAKE_CURRENT_SOURCE_DIR}/build.py
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  COMMAND ${Python3_EXECUTABLE} build.py ${bin_target_file}
+  COMMAND ${Python3_EXECUTABLE} build.py
+    --set-version-var=CEPH_GIT_VER=${CEPH_GIT_VER}
+    --set-version-var=CEPH_GIT_NICE_VER=${CEPH_GIT_NICE_VER}
+    --set-version-var=CEPH_RELEASE=${CEPH_RELEASE}
+    --set-version-var=CEPH_RELEASE_NAME=${CEPH_RELEASE_NAME}
+    --set-version-var=CEPH_RELEASE_TYPE=${CEPH_RELEASE_TYPE}
+    ${bin_target_file}
 )
 
 add_custom_target(cephadm ALL