common/version: --version to output BUILD_TYPE

```
$ ceph-osd --version
ceph version 20.0.0-514-g7a036c6b017 (7a036c6b01769b300ead54db2a3b42182cc59442) tentacle (dev - Debug)
```

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 2e6ef8740269de40315f9d593d6eacddfdf28f53)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05260ffd2ce6c4e3377832ac3490731f8eba78da..56fca0f0679ad2c865ca7ce5b23db982566ac08a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,7 @@ if(NOT CMAKE_BUILD_TYPE)
   STRING "BUILD_TYPE is ${default_build_type}, other options are: RelWithDebInfo, Release, and MinSizeRel." FORCE)
 endif()
 message(STATUS "BUILD_TYPE is ${CMAKE_BUILD_TYPE}")
+set(CEPH_BUILD_TYPE ${CMAKE_BUILD_TYPE})
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
   set(LINUX ON)

diff --git a/src/ceph_release.h.in.cmake b/src/ceph_release.h.in.cmake
index f622fc565f169c508316abc95b57f65f1d4bd428..0978342893010aa09b306dbe24793bfb31a99c34 100644 (file)
--- a/src/ceph_release.h.in.cmake
+++ b/src/ceph_release.h.in.cmake
@@ -4,5 +4,6 @@
 #define CEPH_RELEASE @CEPH_RELEASE@
 #define CEPH_RELEASE_NAME "@CEPH_RELEASE_NAME@"
 #define CEPH_RELEASE_TYPE "@CEPH_RELEASE_TYPE@"
+#define CEPH_BUILD_TYPE "@CEPH_BUILD_TYPE@"
 
 #endif

diff --git a/src/common/version.cc b/src/common/version.cc
index e6939541713b9094f881cea81855f3a1bdbf4f54..b6cf7a976c14b58ab2e0607041a930751417b7fc 100644 (file)
--- a/src/common/version.cc
+++ b/src/common/version.cc
@@ -49,7 +49,8 @@ std::string const pretty_version_to_str(void)
   oss << "ceph version " << CEPH_GIT_NICE_VER
       << " (" << STRINGIFY(CEPH_GIT_VER) << ") "
       << ceph_release_name(CEPH_RELEASE)
-      << " (" << CEPH_RELEASE_TYPE << ")"
+      << " (" << CEPH_RELEASE_TYPE << " - "
+      << CEPH_BUILD_TYPE << ")"
 #ifdef WITH_CRIMSON
       << " (crimson)"
 #endif