span: fix wrong next1 feature index in dual loop

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 4e084d4..f6dcfc2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel
+RPM_DEPENDS += python-devel python-virtualenv
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@ -118,6 +118,9 @@ help:
        @echo " DPDK_VERSION = $(DPDK_VERSION)"
 
 $(BR)/.bootstrap.ok:
+ifeq ($(findstring y,$(UNATTENDED)),y)
+       make install-dep
+endif
 ifeq ($(OS_ID),ubuntu)
        @MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
        if [ -n "$$MISSING" ] ; then \
@@ -336,7 +339,12 @@ define banner
        @echo " "
 endef
 
-verify: $(BR)/.bootstrap.ok
+verify: install-dep $(BR)/.bootstrap.ok
+       $(call banner,"Building for PLATFORM=vpp using gcc")
+       @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
+       $(call banner,"Building for PLATFORM=vpp_lite using gcc")
+       @make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
+       @make test
 ifeq ($(OS_ID),ubuntu)
 ifeq ($(OS_VERSION_ID),16.04)
        $(call banner,"Installing dependencies")
@@ -345,8 +353,10 @@ ifeq ($(OS_VERSION_ID),16.04)
        $(call banner,"Building for PLATFORM=vpp using clang")
        @make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
 endif
+       @make pkg-deb
 endif
-       $(call banner,"Building for PLATFORM=vpp using gcc")
-       @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
-       $(call banner,"Building for PLATFORM=vpp_lite using gcc")
-       @make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
+ifeq ($(OS_ID),centos)
+       @make pkg-rpm
+endif
+
+