cmake: fix errors in external when building past point-release 23/18823/1
authorAndrew Yourtchenko <[email protected]>
Wed, 27 Mar 2019 14:22:40 +0000 (15:22 +0100)
committerAndrew Yourtchenko <[email protected]>
Thu, 11 Apr 2019 18:42:48 +0000 (18:42 +0000)
Change-Id: I23b4816e4ef2c6a2fa825fbd063ea25ff2024151
Signed-off-by: Andrew Yourtchenko <[email protected]>
(cherry picked from commit e36f44ad923f4e64266fd3e4dee6e2716e687504)

build/external/Makefile

index a1352a6..90d8e7f 100644 (file)
@@ -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)