From 1dbebfa462e2f0e397579a3f4c24ee1c209a95b4 Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Wed, 27 Mar 2019 15:22:40 +0100 Subject: cmake: fix errors in external when building past point-release Change-Id: I23b4816e4ef2c6a2fa825fbd063ea25ff2024151 Signed-off-by: Andrew Yourtchenko (cherry picked from commit e36f44ad923f4e64266fd3e4dee6e2716e687504) --- build/external/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit 1.2.3-korg