X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build%2Fexternal%2FMakefile;h=e5dff3c43e5efd84553feac83eb715207700ae1a;hb=adcfb15fa0b08403c5b5b170149f7d3662e65761;hp=084d694e88c786269f3ba934eb7628914e8d3bfa;hpb=fe750c248be58b76479836639fbd0c4617210aa5;p=vpp.git

diff --git a/build/external/Makefile b/build/external/Makefile
index 084d694e88c..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,9 +27,16 @@ 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
+include packages/quicly.mk
 include packages/dpdk.mk
 include packages/rdma-core.mk
 
@@ -38,7 +45,7 @@ clean:
 	@rm -rf $(B) $(I)
 
 .PHONY: install
-install: dpdk-install rdma-core-install
+install: dpdk-install rdma-core-install quicly-install
 
 .PHONY: config
 config: dpdk-config rdma-core-config
@@ -114,6 +121,7 @@ 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 "=========================================================="