Skip to content

Commit

Permalink
mk: config: allow to use lightweight tags instead of annotated ones
Browse files Browse the repository at this point in the history
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 <[email protected]>
Change-Id: I1d86bfc774cfca7d7e58fef2470ac226663c2c8b
Reviewed-on: https://gerrit.st.com/c/mpu/oe/optee/optee_os/+/225703
  • Loading branch information
Lionel Debieve committed Oct 28, 2021
1 parent 91e7f01 commit 639a856
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mk/config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 639a856

Please sign in to comment.