Commit 2866ea14 authored by davidcunado-arm's avatar davidcunado-arm Committed by GitHub
Browse files

Merge pull request #829 from masahir0y/build

Makefile: use git describe for BUILD_STRING
parents 7a1c268f bee71c7a
...@@ -111,7 +111,7 @@ endif ...@@ -111,7 +111,7 @@ endif
# Default build string (git branch and commit) # Default build string (git branch and commit)
ifeq (${BUILD_STRING},) ifeq (${BUILD_STRING},)
BUILD_STRING := $(shell git log -n 1 --pretty=format:"%h") BUILD_STRING := $(shell git describe --always --dirty --tags 2> /dev/null)
endif endif
VERSION_STRING := v${VERSION_MAJOR}.${VERSION_MINOR}(${BUILD_TYPE}):${BUILD_STRING} VERSION_STRING := v${VERSION_MAJOR}.${VERSION_MINOR}(${BUILD_TYPE}):${BUILD_STRING}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment