summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Yourtchenko <ayourtch@gmail.com>2019-03-27 15:22:40 +0100
committerAndrew Yourtchenko <ayourtch@gmail.com>2019-04-11 18:42:48 +0000
commit1dbebfa462e2f0e397579a3f4c24ee1c209a95b4 (patch)
tree125bff95ede7f540e4c00fe3ef545b84490acca2
parent2f4c7ec46fe1f88aa58c2cde3dd4c97f65b4264b (diff)
cmake: fix errors in external when building past point-release
Change-Id: I23b4816e4ef2c6a2fa825fbd063ea25ff2024151 Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com> (cherry picked from commit e36f44ad923f4e64266fd3e4dee6e2716e687504)
-rw-r--r--build/external/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/external/Makefile b/build/external/Makefile
index a1352a69cbf..90d8e7ffff2 100644
--- a/build/external/Makefile
+++ b/build/external/Makefile
@@ -19,7 +19,7 @@ MAKE ?= make
MAKE_ARGS ?= -j
BUILD_DIR ?= $(CURDIR)/_build
INSTALL_DIR ?= $(CURDIR)/_install
-PKG_VERSION ?= $(shell git describe --abbrev=0 | cut -d- -f1 | cut -dv -f2)
+PKG_VERSION ?= $(shell git describe --abbrev=0 | cut -d- -f1 | cut -dv -f2 | cut -d. -f1,2)
PKG_SUFFIX ?= $(shell git log --oneline v$(PKG_VERSION)-rc0.. . | wc -l)
JOBS := $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo),\
$(shell grep -c ^processor /proc/cpuinfo), 2)