summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2018-01-15 22:42:30 -0800
committerAbel Vesa <abel.vesa@nxp.com>2018-06-11 10:33:02 +0300
commitc80009f7c58534b257892f0bca168fd187779e58 (patch)
tree5f376115adf4ad78a5e41bc9ef73a1988d441369 /Makefile
parentbde8a0686cb63527e121d88e2e7bf7958eee0d2b (diff)
MLK-17373 Fix ATF version string generation
Since we use ATF version string to provide commit id, we must ensure the commit id is in this string. But when a commit is tagged, the git describe will default output the tag string. Add the '--long' option to output a full string with commit id contained. Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 94ae63ea..57c4a90c 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ endif
# Default build string (git branch and commit)
ifeq (${BUILD_STRING},)
- BUILD_STRING := $(shell git describe --always --dirty --tags 2> /dev/null)
+ BUILD_STRING := $(shell git describe --long --always --dirty --tags 2> /dev/null)
endif
VERSION_STRING := v${VERSION_MAJOR}.${VERSION_MINOR}(${BUILD_TYPE}):${BUILD_STRING}