X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=e99cafdd2162538b289a821457d1deb716ab9717;hb=eb1525f1060569cc3dc03aca7696ce05e1401a09;hp=55e2b10a1deba1f6b1866873f6ec9df5362164e8;hpb=3ea2d6c130e5aa97779881ae23441c47852a9aaf;p=vpp.git

diff --git a/Makefile b/Makefile
index 55e2b10a1de..e99cafdd216 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,6 @@ STARTUP_DIR?=$(PWD)
 MACHINE=$(shell uname -m)
 SUDO?=sudo
 
-ifeq ($(findstring $(MAKECMDGOALS),verify pkg-deb pkg-rpm test test-debug),)
-export vpp_uses_cmake?=yes
-endif
-
 ,:=,
 define disable_plugins
 $(if $(1), \
@@ -92,6 +88,7 @@ RPM_DEPENDS += numactl-devel
 RPM_DEPENDS += check check-devel
 RPM_DEPENDS += boost boost-devel
 RPM_DEPENDS += selinux-policy selinux-policy-devel
+RPM_DEPENDS += cmake3 ninja-build
 
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
 	RPM_DEPENDS += subunit subunit-devel
@@ -111,6 +108,7 @@ else
 	RPM_DEPENDS += openssl-devel
 	RPM_DEPENDS += python-devel python-ply
 	RPM_DEPENDS += python-virtualenv
+	RPM_DEPENDS += devtoolset-7
 	RPM_DEPENDS_GROUPS = 'Development Tools'
 endif
 
@@ -289,6 +287,7 @@ endif
 	@sudo -E apt-get $(APT_ARGS) $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
 	@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
+	@sudo -E yum install $(CONFIRM) centos-release-scl-rh
 	@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
 	@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
 else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID))
@@ -548,6 +547,7 @@ verify: install-dep $(BR)/.deps.ok dpdk-install-dev
 	$(call banner,"Building $(PKG) packages")
 	@make pkg-$(PKG)
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
+	$(call banner,"Running tests")
 	@make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test
 endif