cmake: fix out-of-git-tree build

Cherry picked from master: 6077c97a

JIRA: VPP-1577

Change-Id: Ib94637ec09799c23f3179599b54a2be6e2768425
Signed-off-by: Damjan Marion <damarion@cisco.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fedf931..3aae5cd 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -87,16 +87,6 @@ foreach(DIR ${SUBDIRS})
   add_subdirectory(${DIR})
 endforeach()
 
-##############################################################################
-# packaging
-##############################################################################
-include(cmake/pack.cmake)
-add_vpp_packaging(
-  NAME "vpp"
-  VENDOR "fd.io"
-  DESCRIPTION "Vector Packet Processor"
-)
-
 ##############################################################################
 # detect if we are inside git repo and add configure dependency
 ##############################################################################
@@ -105,6 +95,7 @@ execute_process(
   COMMAND git rev-parse --show-toplevel
   OUTPUT_VARIABLE VPP_GIT_TOPLEVEL_DIR
   OUTPUT_STRIP_TRAILING_WHITESPACE
+  ERROR_QUIET
 )
 
 if (VPP_GIT_TOPLEVEL_DIR)

diff --git a/src/scripts/generate_version_h b/src/scripts/generate_version_h
index 993a682..f470548 100755 (executable)
--- a/src/scripts/generate_version_h
+++ b/src/scripts/generate_version_h
@@ -22,7 +22,7 @@ cat > ${1} << __EOF__
 #define VPP_BUILD_DATE "$(date)"
 #define VPP_BUILD_USER "$(whoami)"
 #define VPP_BUILD_HOST "$(hostname)"
-#define VPP_BUILD_TOPDIR "$(git rev-parse --show-toplevel)"
+#define VPP_BUILD_TOPDIR "$(git rev-parse --show-toplevel 2> /dev/null)"
 #define VPP_BUILD_VER "$(scripts/version)"
 #endif
 __EOF__