From 53208f6324904cc0b0114f532a534ab1664e3ffc Mon Sep 17 00:00:00 2001 From: Konstantin Kondrashov Date: Wed, 13 Mar 2019 20:01:28 +0800 Subject: [PATCH] make: Trim IDF_VER to fit a 32-bit field Closes: https://github.com/espressif/esp-idf/issues/3131 --- make/project.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/project.mk b/make/project.mk index a1307b0454..d9729c7194 100644 --- a/make/project.mk +++ b/make/project.mk @@ -270,10 +270,11 @@ endif # If we have `version.txt` then prefer that for extracting IDF version ifeq ("$(wildcard ${IDF_PATH}/version.txt)","") -IDF_VER := $(shell cd ${IDF_PATH} && git describe --always --tags --dirty) +IDF_VER_T := $(shell cd ${IDF_PATH} && git describe --always --tags --dirty) else -IDF_VER := `cat ${IDF_PATH}/version.txt` +IDF_VER_T := `cat ${IDF_PATH}/version.txt` endif +IDF_VER := $(shell echo "$(IDF_VER_T)" | cut -c 1-31) # Set default LDFLAGS EXTRA_LDFLAGS ?= -- 2.40.0