Merge pull request #1476 from pi-hole/new/git_hash

Add hash printing and restore local compilation
pi-hole · Nov 14, 2022 · b48b3e1 · b48b3e1
2 parents 6075a70 + b63a372
commit b48b3e1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -218,7 +218,8 @@ else()
 endif()
 
 # Do we want to compile an all-in FTL version?
-if($ENV{CI_ARCH} STREQUAL "x86_64_full")
+if(DEFINED ENV{CI_ARCH})
+  if($ENV{CI_ARCH} STREQUAL "x86_64_full")
     add_definitions(-DDNSMASQ_ALL_OPTS)
     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
     find_package(DBus REQUIRED)
@@ -231,6 +232,7 @@ if($ENV{CI_ARCH} STREQUAL "x86_64_full")
     find_library(LIBNFNETLINK nfnetlink)
     find_library(LIBNETFILTER_CONNTRACK netfilter_conntrack)
     target_link_libraries(pihole-FTL ${LIBMNL} ${LIBNFTABLES} ${LIBNFTNL} ${LIBNFNETLINK} ${LIBNETFILTER_CONNTRACK})
+  endif()
 endif()
 
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)

diff --git a/src/args.c b/src/args.c
@@ -285,6 +285,12 @@ void parse_args(int argc, char* argv[])
 			exit(EXIT_SUCCESS);
 		}
 
+		if(strcmp(argv[i], "--hash") == 0)
+		{
+			printf("%s\n",GIT_HASH);
+			exit(EXIT_SUCCESS);
+		}
+
 		// Don't go into background
 		if(strcmp(argv[i], "-f") == 0 ||
 		   strcmp(argv[i], "no-daemon") == 0)

diff --git a/src/gen_version.cmake b/src/gen_version.cmake
@@ -24,7 +24,7 @@ if(DEFINED ENV{GIT_HASH})
     set(GIT_HASH "$ENV{GIT_HASH}")
 else()
     execute_process(
-            COMMAND           git --no-pager describe --always --dirty
+            COMMAND           git --no-pager describe --always --abbrev=8 --dirty
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
             OUTPUT_VARIABLE   GIT_HASH
             ERROR_QUIET
@@ -36,7 +36,7 @@ if(DEFINED ENV{GIT_VERSION})
     set(GIT_VERSION "$ENV{GIT_VERSION}")
 else()
     execute_process(
-            COMMAND           git --no-pager describe --tags --always --dirty
+            COMMAND           git --no-pager describe --tags --always --abbrev=8 --dirty
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
             OUTPUT_VARIABLE   GIT_VERSION
             ERROR_QUIET