diff options
author | Ye Li <ye.li@nxp.com> | 2018-01-15 22:42:30 -0800 |
---|---|---|
committer | Anson Huang <Anson.Huang@nxp.com> | 2019-12-13 10:41:29 +0800 |
commit | 451058b8cb7b3b60bde87d6a17194323fd42b52c (patch) | |
tree | b7e1bc547493b811813938809dc88ab2162e5abc /Makefile | |
parent | 2bbeca1c9b89877365c1546d2a3654dc7f52869e (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>
(cherry picked from commit c80009f7c58534b257892f0bca168fd187779e58)
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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} |