]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cephadm: configure cmake to pass versioning values to build.py
authorJohn Mulligan <jmulligan@redhat.com>
Tue, 27 Sep 2022 20:53:52 +0000 (16:53 -0400)
committerAdam King <adking@redhat.com>
Thu, 31 Aug 2023 17:35:12 +0000 (13:35 -0400)
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)

src/cephadm/CMakeLists.txt

index fdb7c9881fa1dcf27df93172b228d95fb33f06d9..8b969bc33e7b7c4a3969b66c4fe7b254cb9ee32c 100644 (file)
@@ -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