From 451058b8cb7b3b60bde87d6a17194323fd42b52c Mon Sep 17 00:00:00 2001 From: Ye Li Date: Mon, 15 Jan 2018 22:42:30 -0800 Subject: 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 (cherry picked from commit c80009f7c58534b257892f0bca168fd187779e58) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 721246d5..2ae12fda 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,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} -- cgit v1.2.3