From 9620912607d5e99650624f74545268bba0f310ca Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Sun, 1 Oct 2017 16:41:35 +0200 Subject: fixup! Convert flashrom to git - make version string generation independent of the actual VCS used by not generating "unknown" in the makefile but letting getrevision do that - make hook installation independent of version string generation since they have nothing to do with each other and there are no synergies anymore Change-Id: Iedc9df4c033a70447b8b1b65c83764c769b02c3f Signed-off-by: Stefan Tauner Reviewed-on: https://review.coreboot.org/21827 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- util/getrevision.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'util') diff --git a/util/getrevision.sh b/util/getrevision.sh index e1580e5e..0f975462 100755 --- a/util/getrevision.sh +++ b/util/getrevision.sh @@ -131,13 +131,14 @@ timestamp() { # Retrieve local revision info. local_revision() { + local r if git_is_file_tracked "$1" ; then - local r=$(git describe $(git_last_commit "$1")) + r=$(git describe $(git_last_commit "$1")) if git_has_local_changes "$1" ; then r="$r-dirty" fi else - return ${EXIT_FAILURE} + r="unknown" fi echo "${r}" -- cgit v1.2.3