Flowprobe: Stateful flows and IPv6, L4 recording

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 41e3e71..f78549f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,9 @@ DEB_DEPENDS += lcov chrpath autoconf nasm indent
 DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
 ifeq ($(OS_VERSION_ID),14.04)
        DEB_DEPENDS += openjdk-8-jdk-headless
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
+       DEB_DEPENDS += openjdk-8-jdk-headless
+       APT_ARGS = -t jessie-backports
 else
        DEB_DEPENDS += default-jdk-headless
 endif
@@ -147,7 +150,7 @@ $(BR)/.bootstrap.ok:
 ifeq ($(findstring y,$(UNATTENDED)),y)
        make install-dep
 endif
-ifeq ($(OS_ID),ubuntu)
+ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
        @MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
        if [ -n "$$MISSING" ] ; then \
          echo "\nPlease install missing packages: \n$$MISSING\n" ; \
@@ -191,20 +194,24 @@ endif
 bootstrap: $(BR)/.bootstrap.ok
 
 install-dep:
-ifeq ($(OS_ID),ubuntu)
+ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
 ifeq ($(OS_VERSION_ID),14.04)
        @sudo -E apt-get $(CONFIRM) $(FORCE) install software-properties-common
        @sudo -E add-apt-repository ppa:openjdk-r/ppa $(CONFIRM)
+endif
+ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
+       @grep -q jessie-backports /etc/apt/sources.list /etc/apt/sources.list.d/* 2> /dev/null \
+           || ( echo "Please install jessie-backports" ; exit 1 )
 endif
        @sudo -E apt-get update
-       @sudo -E apt-get $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
+       @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) $(RPM_DEPENDS)
        @sudo -E yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS)
        @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
 else
-       $(error "This option currently works only on Ubuntu or Centos systems")
+       $(error "This option currently works only on Ubuntu, Debian or Centos systems")
 endif
 
 define make
@@ -420,20 +427,24 @@ define banner
        @echo " "
 endef
 
-verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
+verify: install-dep $(BR)/.bootstrap.ok
+       make -C dpdk install-$(PKG) DPDK_CRYPTO_SW_PMD=y
        $(call banner,"Building for PLATFORM=vpp using gcc")
-       @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
+       @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages \
+             vpp_uses_dpdk_cryptodev_sw=yes
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
        $(call banner,"Installing dependencies")
        @sudo -E apt-get update
        @sudo -E apt-get $(CONFIRM) $(FORCE) install clang
        $(call banner,"Building for PLATFORM=vpp using clang")
-       @make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
+       @make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang \
+             wipe-all install-packages vpp_uses_dpdk_cryptodev_sw=yes
 endif
        $(call banner,"Building sample-plugin")
        @make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
        $(call banner,"Building $(PKG) packages")
-       @make pkg-$(PKG)
+       @make pkg-$(PKG) vpp_uses_dpdk_cryptodev_sw=yes
+ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
        @make test
-
+endif