rebase patches

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

diff --git a/patches/0002-cmake-disable-version-from-git.patch b/patches/0002-cmake-disable-version-from-git.patch
index 5f634bf7c6a5eeebd4617e5e312bb2f45b312b73..6829479ae37bd92a28eb6b89ca7d95d0fbd825db 100644 (file)
--- a/patches/0002-cmake-disable-version-from-git.patch
+++ b/patches/0002-cmake-disable-version-from-git.patch
@@ -1,7 +1,7 @@
-From 4df31954840f36329b88478c42408c038e9c706c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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/4] cmake: disable version from git
+Subject: [PATCH] cmake: disable version from git
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  1 file changed, 5 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3cdcb95be4..747a090f96 100644
+index 7aa8a4392e..77a05ad960 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -206,15 +206,10 @@ set(GCOV_PREFIX_STRIP 4)
@@ -35,5 +35,5 @@ index 3cdcb95be4..747a090f96 100644
    string(SUBSTRING ${CEPH_GIT_NICE_VER} 1 -1 CEPH_GIT_NICE_VER)
  else(${ENABLE_GIT_VERSION})
 -- 
-2.14.1
+2.14.2