bump version to 12.1.3-pve1

[ceph.git] / patches / 0002-cmake-disable-version-from-git.patch

From e0d06d15807235f999720b4e8ce0498ddaec4952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Wed, 31 May 2017 14:33:09 +0200
Subject: [PATCH 2/3] cmake: disable version from git
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

as this recurses up the directory tree and gets wrong
information from the parent repository.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/CMakeLists.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 915e10aa66..1ff1423a11 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -206,15 +206,10 @@ set(GCOV_PREFIX_STRIP 4)
 # we pull the git version from .git
 option(ENABLE_GIT_VERSION "build Ceph with git version string" ON)
 if(${ENABLE_GIT_VERSION})
-  get_git_head_revision(GIT_REFSPEC CEPH_GIT_VER)
-  git_describe(CEPH_GIT_NICE_VER --always)
-  #if building from a source tarball via make-dist
-  if(${CEPH_GIT_VER} STREQUAL "GITDIR-NOTFOUND")
     message(STATUS "Ceph/.git directory not found, parsing ${CMAKE_CURRENT_SOURCE_DIR}/.git_version for CEPH_GIT_VER and CEPH_GIT_NICE_VER")
     file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/.git_version CEPH_GIT_SHA_AND_TAG)
     list(GET CEPH_GIT_SHA_AND_TAG 0 CEPH_GIT_VER)
     list(GET CEPH_GIT_SHA_AND_TAG 1 CEPH_GIT_NICE_VER)
-  endif(${CEPH_GIT_VER} STREQUAL "GITDIR-NOTFOUND")
   # remove 'v' prefix from raw git version
   string(SUBSTRING ${CEPH_GIT_NICE_VER} 1 -1 CEPH_GIT_NICE_VER)
 else(${ENABLE_GIT_VERSION})
-- 
2.11.0