X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=build%2Fexternal%2FMakefile;h=e5dff3c43e5efd84553feac83eb715207700ae1a;hb=61717cc38;hp=38e8d6346506fede4e0e40f4974e92aaa7bcc804;hpb=561f2730e8b137cd4e7132b05dab49f6e768ae23;p=vpp.git

diff --git a/build/external/Makefile b/build/external/Makefile
index 38e8d634650..e5dff3c43e5 100644
--- a/build/external/Makefile
+++ b/build/external/Makefile
@@ -19,23 +19,37 @@ 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_SUFFIX ?= $(shell git log --oneline $$(git describe --abbrev=0).. . | wc -l)
+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)
 
 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
 
 .PHONY: clean
 clean:
 	@rm -rf $(B) $(I)
 
+.PHONY: install
+install: dpdk-install rdma-core-install quicly-install
+
+.PHONY: config
+config: dpdk-config rdma-core-config
+
 ##############################################################################
 # .deb packaging
 ##############################################################################
@@ -62,11 +76,6 @@ build-deb: $(DEV_DEB)
 
 install-deb:
 ifneq ($(INSTALLED_VER),$(DEB_VER)-$(PKG_SUFFIX))
-	@echo "=========================================================="
-	@echo " Out of date vpp-ext-deps package installed."
-	@echo " Installed: $(INSTALLED_VER)"
-	@echo " Needed: $(DEB_VER)-$(PKG_SUFFIX)"
-	@echo "=========================================================="
 	@make $(DEV_DEB)
 	@sudo dpkg -i $(DEV_DEB)
 else
@@ -78,9 +87,9 @@ endif
 check-deb:
 ifneq ($(INSTALLED_VER),$(DEB_VER)-$(PKG_SUFFIX))
 	@echo "=========================================================="
-	@echo " Outdated DPDK package detected:"
-	@echo "  Installed: vpp-ext-deps $(INSTALLED_VER)"
-	@echo "  Current:   vpp-ext-deps $(DEB_VER)-$(PKG_SUFFIX)"
+	@echo " Out of date vpp-ext-deps package installed."
+	@echo " Installed: $(INSTALLED_VER)"
+	@echo " Needed: $(DEB_VER)-$(PKG_SUFFIX)"
 	@echo ""
 	@echo " Please upgrade by invoking 'make install-ext-deps'"
 	@echo " from the top level directory."
@@ -110,21 +119,22 @@ $(DEV_RPM): Makefile rpm/vpp-ext-deps.spec
 build-rpm: $(DEV_RPM)
 
 install-rpm:
-ifneq ($(INSTALLED_RPM_VER),$(PRM_VER)-$(PKG_SUFFIX))
+ifneq ($(INSTALLED_RPM_VER),$(RPM_VER)-$(PKG_SUFFIX))
 	@$(MAKE) $(DEV_RPM)
-	sudo rpm -Uih $(DEV_RPM)
+	sudo rpm -e vpp-ext-deps || true
+	sudo rpm -Uih --force $(DEV_RPM)
 else
 	@echo "=========================================================="
-	@echo " Up-to-date DPDK package already installed"
+	@echo " Up-to-date vpp-ext-deps package already installed"
 	@echo "=========================================================="
 endif
 
 check-rpm:
 ifneq ($(INSTALLED_RPM_VER),$(RPM_VER)-$(PKG_SUFFIX))
 	@echo "=========================================================="
-	@echo " Outdated DPDK package detected:"
-	@echo "  Installed: vpp-ext-deps $(INSTALLED_RPM_VER)"
-	@echo "  Current:   vpp-ext-deps $(RPM_VER)-$(PKG_SUFFIX)"
+	@echo " Out of date vpp-ext-deps package installed."
+	@echo " Installed: $(INSTALLED_RPM_VER)"
+	@echo " Needed: $(RPM_VER)-$(PKG_SUFFIX)"
 	@echo ""
 	@echo " Please upgrade by invoking 'make install-ext-deps'"
 	@echo " from the top level directory."
@@ -140,9 +150,9 @@ endif
 ebuild-build:
 ifeq ($(INSTALLED_VER)$(INSTALLED_RPM_VER),)
 	@echo "=========================================================="
-	@echo "Building DPDK from source. Consider installing development"
-	@echo "package by invoking 'make install-ext-deps' from the"
-	@echo "top level directory"
+	@echo "Building vpp-ext-deps from source. Consider installing"
+	@echo "development package by invoking 'make install-ext-deps'"
+	@echo "from the top level directory"
 	@echo "=========================================================="
 	make config
 else