diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2016-04-19 16:42:26 +0200 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2016-04-19 16:42:34 +0200 |
| commit | 59d3088ed11c9cc56303c89739f3ee903dc42a4a (patch) | |
| tree | 24f34d8bfafb4c69c0041cdb3b2143771896dcc5 /community/domoticz/ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch | |
| parent | 270e41f60340a746beba1d94f729fb21386f5b1b (diff) | |
| download | aports-59d3088ed11c9cc56303c89739f3ee903dc42a4a.tar.bz2 aports-59d3088ed11c9cc56303c89739f3ee903dc42a4a.tar.xz | |
community/domoticz: upgrade to 3.4834 and move to community
Diffstat (limited to 'community/domoticz/ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch')
| -rw-r--r-- | community/domoticz/ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/community/domoticz/ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch b/community/domoticz/ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch new file mode 100644 index 0000000000..6787482bb1 --- /dev/null +++ b/community/domoticz/ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70.patch @@ -0,0 +1,60 @@ +From ca371a9c66fb5bc87d942a3c6bcf72213ccd2f70 Mon Sep 17 00:00:00 2001 +From: irimi <irimi@gmx.de> +Date: Mon, 7 Mar 2016 20:28:21 +0100 +Subject: [PATCH] ensure correct git repository path + +--- + CMakeLists.txt | 2 +- + getgit.cmake | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d3113f4..8532ab4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -152,7 +152,7 @@ FIND_PROGRAM(GIT_EXECUTABLE git + DOC "git command line client") + + MACRO(Gitversion_GET_REVISION dir variable) +- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count ++ EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count + WORKING_DIRECTORY ${dir} + OUTPUT_VARIABLE ${variable} + OUTPUT_STRIP_TRAILING_WHITESPACE) +diff --git a/getgit.cmake b/getgit.cmake +index 8d6821f..39af19b 100644 +--- a/getgit.cmake ++++ b/getgit.cmake +@@ -8,28 +8,28 @@ if(NOT GIT_FOUND) + endif() + + MACRO(Gitversion_GET_REVISION dir variable) +- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count ++ EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count + WORKING_DIRECTORY ${dir} + OUTPUT_VARIABLE ${variable} + OUTPUT_STRIP_TRAILING_WHITESPACE) + ENDMACRO(Gitversion_GET_REVISION) + + MACRO(Gitversion_GET_HASH dir variable) +- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD ++ EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-parse --short HEAD + WORKING_DIRECTORY ${dir} + OUTPUT_VARIABLE ${variable} + OUTPUT_STRIP_TRAILING_WHITESPACE) + ENDMACRO(Gitversion_GET_HASH) + + MACRO(Gitversion_GET_DATE dir variable) +- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} show -s --format=%ct ++ EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git show -s --format=%ct + WORKING_DIRECTORY ${dir} + OUTPUT_VARIABLE ${variable} + OUTPUT_STRIP_TRAILING_WHITESPACE) + ENDMACRO(Gitversion_GET_DATE) + + MACRO(Gitversion_CHECK_DIRTY dir variable) +- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} diff-index -m --name-only HEAD ++ EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git diff-index -m --name-only HEAD + WORKING_DIRECTORY ${dir} + OUTPUT_VARIABLE ${variable} + OUTPUT_STRIP_TRAILING_WHITESPACE) |