From 639a8566de8fa720d2cb7ab7231e8de105e7859d Mon Sep 17 00:00:00 2001 From: Lionel Debieve Date: Tue, 26 Oct 2021 14:41:33 +0200 Subject: [PATCH] mk: config: allow to use lightweight tags instead of annotated ones Do not use the last annotated tags, use the last available one instead also if it's a lightweight one. Signed-off-by: Lionel Debieve Change-Id: I1d86bfc774cfca7d7e58fef2470ac226663c2c8b Reviewed-on: https://gerrit.st.com/c/mpu/oe/optee/optee_os/+/225703 --- mk/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/config.mk b/mk/config.mk index a14c4f8326d..c92a0edce69 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -111,7 +111,7 @@ CFG_TEE_IMPL_DESCR ?= OPTEE CFG_OS_REV_REPORTS_GIT_SHA1 ?= y # Trusted OS implementation version -TEE_IMPL_VERSION ?= $(shell git describe --always --dirty=-dev 2>/dev/null || echo Unknown) +TEE_IMPL_VERSION ?= $(shell git describe --always --tags --dirty=-dev 2>/dev/null || echo Unknown) ifeq ($(CFG_OS_REV_REPORTS_GIT_SHA1),y) TEE_IMPL_GIT_SHA1 := 0x$(shell git rev-parse --short=8 HEAD 2>/dev/null || echo 0) else