X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build%2Fexternal%2FMakefile;h=e5dff3c43e5efd84553feac83eb715207700ae1a;hb=61717cc38;hp=0c2d837aee0711c0154b71c64982d3c766d22252;hpb=60f3e6547aa75a31fad1f78bea11c950cc30d63c;p=vpp.git

diff --git a/build/external/Makefile b/build/external/Makefile
index 0c2d837aee0..e5dff3c43e5 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)
@@ -27,6 +27,12 @@ JOBS := $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo),\
 B := $(BUILD_DIR)
 I := $(INSTALL_DIR)
 
+ifneq ($(shell which cmake3),)
+CMAKE?=cmake3
+else
+CMAKE?=cmake
+endif
+
 include packages.mk
 include packages/nasm.mk
 include packages/ipsec-mb.mk
@@ -64,7 +70,7 @@ deb/debian/changelog: Makefile
 
 $(DEV_DEB): deb/debian/changelog
 	@cd deb && dpkg-buildpackage -b -uc -us
-	@git clean -ffdx deb
+	git clean -fdx deb
 
 build-deb: $(DEV_DEB)
 
@@ -108,13 +114,14 @@ $(DEV_RPM): Makefile rpm/vpp-ext-deps.spec
 	  --define "_release $(PKG_SUFFIX)" \
 	  $(CURDIR)/rpm/vpp-ext-deps.spec
 	mv rpm/RPMS/$(RPM_ARCH)/*.rpm .
-	@git clean -ffdx rpm
+	@git clean -fdx rpm
 
 build-rpm: $(DEV_RPM)
 
 install-rpm:
 ifneq ($(INSTALLED_RPM_VER),$(RPM_VER)-$(PKG_SUFFIX))
 	@$(MAKE) $(DEV_RPM)
+	sudo rpm -e vpp-ext-deps || true
 	sudo rpm -Uih --force $(DEV_RPM)
 else
 	@echo "=========================================================="