MAP: Use bool type in map.api instead of u8.
[vpp.git] / Makefile
index 36d37bf..e0c710f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,30 @@ export BR=$(WS_ROOT)/build-root
 CCACHE_DIR?=$(BR)/.ccache
 GDB?=gdb
 PLATFORM?=vpp
+SAMPLE_PLUGIN?=no
+STARTUP_DIR?=$(PWD)
+MACHINE=$(shell uname -m)
+SUDO?=sudo
+
+,:=,
+define disable_plugins
+$(if $(1), \
+  "plugins {" \
+  $(patsubst %,"plugin %_plugin.so { disable }",$(subst $(,), ,$(1))) \
+  " }" \
+  ,)
+endef
 
-MINIMAL_STARTUP_CONF="unix { interactive }"
+MINIMAL_STARTUP_CONF="                                                 \
+unix {                                                                         \
+       interactive                                                     \
+       cli-listen /run/vpp/cli.sock                                    \
+       gid $(shell id -g)                                              \
+       $(if $(wildcard startup.vpp),"exec startup.vpp",)               \
+}                                                                      \
+$(if $(DPDK_CONFIG), "dpdk { $(DPDK_CONFIG) }",)                       \
+$(call disable_plugins,$(DISABLED_PLUGINS))                            \
+"
 
 GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
 
@@ -32,27 +54,103 @@ endif
 
 ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
 PKG=deb
-else ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
+else ifeq ($(filter rhel centos fedora opensuse opensuse-leap opensuse-tumbleweed,$(OS_ID)),$(OS_ID))
 PKG=rpm
 endif
 
-DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
-DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
+# +libganglia1-dev if building the gmond plugin
+
+DEB_DEPENDS  = curl build-essential autoconf automake ccache
+DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += lcov chrpath autoconf nasm
-DEB_DEPENDS += python-dev python-virtualenv python-pip libffi6
+DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev
+DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check
+DEB_DEPENDS += libboost-all-dev libffi-dev python-ply libmbedtls-dev
+DEB_DEPENDS += cmake ninja-build
 ifeq ($(OS_VERSION_ID),14.04)
        DEB_DEPENDS += openjdk-8-jdk-headless
+       DEB_DEPENDS += libssl-dev
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
+       DEB_DEPENDS += openjdk-8-jdk-headless
+       DEB_DEPENDS += libssl-dev
+       APT_ARGS = -t jessie-backports
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
+       DEB_DEPENDS += default-jdk-headless
+       DEB_DEPENDS += libssl1.0-dev
 else
        DEB_DEPENDS += default-jdk-headless
+       DEB_DEPENDS += libssl-dev
 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 python-virtualenv lcov chrpath libffi-devel
-RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
-EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros
+RPM_DEPENDS += apr-devel
+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
+       RPM_DEPENDS += openssl-devel
+       RPM_DEPENDS += python-devel python2-ply
+       RPM_DEPENDS += python2-virtualenv
+       RPM_DEPENDS += mbedtls-devel
+       RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
+else ifeq ($(shell if [ "$(OS_ID)" = "fedora" ]; then test $(OS_VERSION_ID) -gt 25; echo $$?; fi),0)
+       RPM_DEPENDS += subunit subunit-devel
+       RPM_DEPENDS += compat-openssl10-devel
+       RPM_DEPENDS += python2-devel python2-ply
+       RPM_DEPENDS += python2-virtualenv
+       RPM_DEPENDS += mbedtls-devel
+       RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
+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
+
+# +ganglia-devel if building the ganglia plugin
+
+RPM_DEPENDS += chrpath libffi-devel rpm-build
+
+SUSE_NAME= $(shell grep '^NAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2)
+SUSE_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2)
+RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath
+RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python-ply
+
+RPM_SUSE_DEVEL_DEPS = glibc-devel-static java-1_8_0-openjdk-devel libnuma-devel
+RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel
+
+RPM_SUSE_PYTHON_DEPS = python-devel python3-devel python-pip python3-pip
+RPM_SUSE_PYTHON_DEPS += python-rpm-macros python3-rpm-macros
+
+RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build
+
+ifeq ($(OS_ID),opensuse)
+ifeq ($(SUSE_NAME),Tumbleweed)
+       RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc
+       RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv
+endif
+ifeq ($(SUSE_ID),15.0)
+       RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6
+       RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv
+else
+       RPM_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6
+       RPM_SUSE_PYTHON_DEPS += python-virtualenv
+endif
+endif
+
+ifeq ($(OS_ID),opensuse-leap)
+ifeq ($(SUSE_ID),15.0)
+       RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6
+       RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv
+endif
+endif
+
+RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS)
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
@@ -63,15 +161,27 @@ CONFIRM=-y
 FORCE=--force-yes
 endif
 
-.PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
+TARGETS = vpp
+
+ifneq ($(SAMPLE_PLUGIN),no)
+TARGETS += sample-plugin
+endif
+
+.PHONY: help wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
 .PHONY: ctags cscope
 .PHONY: test test-debug retest retest-debug test-doc test-wipe-doc test-help test-wipe
 .PHONY: test-cov test-wipe-cov
 
+define banner
+       @echo "========================================================================"
+       @echo " $(1)"
+       @echo "========================================================================"
+       @echo " "
+endef
+
 help:
        @echo "Make Targets:"
-       @echo " bootstrap           - prepare tree for build"
        @echo " install-dep         - install software dependencies"
        @echo " wipe                - wipe all products of debug build "
        @echo " wipe-release        - wipe all products of release build "
@@ -97,7 +207,7 @@ help:
        @echo " run-vat             - run vpp-api-test tool"
        @echo " pkg-deb             - build DEB packages"
        @echo " pkg-rpm             - build RPM packages"
-       @echo " dpdk-install-dev    - install DPDK development packages"
+       @echo " install-ext-deps    - install external development dependencies"
        @echo " ctags               - (re)generate ctags database"
        @echo " gtags               - (re)generate gtags database"
        @echo " cscope              - (re)generate cscope database"
@@ -106,6 +216,9 @@ help:
        @echo " doxygen             - (re)generate documentation"
        @echo " bootstrap-doxygen   - setup Doxygen dependencies"
        @echo " wipe-doxygen        - wipe all generated documentation"
+       @echo " docs                 - Build the Sphinx documentation"
+       @echo " docs-venv         - Build the virtual environment for the Sphinx docs"
+       @echo " docs-clean        - Remove the generated files from the Sphinx docs"
        @echo " test-doc            - generate documentation for test framework"
        @echo " test-wipe-doc       - wipe documentation for test framework"
        @echo " test-cov            - generate code coverage report for test framework"
@@ -113,29 +226,38 @@ help:
        @echo " test-checkstyle     - check PEP8 compliance for test framework"
        @echo ""
        @echo "Make Arguments:"
-       @echo " V=[0|1]             - set build verbosity level"
-       @echo " STARTUP_CONF=<path> - startup configuration file"
-       @echo "                       (e.g. /etc/vpp/startup.conf)"
-       @echo " STARTUP_DIR=<path>  - startup drectory (e.g. /etc/vpp)"
-       @echo "                       It also sets STARTUP_CONF if"
-       @echo "                       startup.conf file is present"
-       @echo " GDB=<path>          - gdb binary to use for debugging"
-       @echo " PLATFORM=<name>     - target platform. default is vpp"
-       @echo " TEST=<filter>       - apply filter to test set, see test-help"
+       @echo " V=[0|1]                  - set build verbosity level"
+       @echo " STARTUP_CONF=<path>      - startup configuration file"
+       @echo "                            (e.g. /etc/vpp/startup.conf)"
+       @echo " STARTUP_DIR=<path>       - startup drectory (e.g. /etc/vpp)"
+       @echo "                            It also sets STARTUP_CONF if"
+       @echo "                            startup.conf file is present"
+       @echo " GDB=<path>               - gdb binary to use for debugging"
+       @echo " PLATFORM=<name>          - target platform. default is vpp"
+       @echo " TEST=<filter>            - apply filter to test set, see test-help"
+       @echo " DPDK_CONFIG=<conf>       - add specified dpdk config commands to"
+       @echo "                            autogenerated startup.conf"
+       @echo "                            (e.g. \"no-pci\" )"
+       @echo " SAMPLE_PLUGIN=yes        - in addition build/run/debug sample plugin"
+       @echo " DISABLED_PLUGINS=<list>  - comma separated list of plugins which"
+       @echo "                            should not be loaded"
        @echo ""
        @echo "Current Argument Values:"
-       @echo " V            = $(V)"
-       @echo " STARTUP_CONF = $(STARTUP_CONF)"
-       @echo " STARTUP_DIR  = $(STARTUP_DIR)"
-       @echo " GDB          = $(GDB)"
-       @echo " PLATFORM     = $(PLATFORM)"
-       @echo " DPDK_VERSION = $(DPDK_VERSION)"
-
-$(BR)/.bootstrap.ok:
+       @echo " V                 = $(V)"
+       @echo " STARTUP_CONF      = $(STARTUP_CONF)"
+       @echo " STARTUP_DIR       = $(STARTUP_DIR)"
+       @echo " GDB               = $(GDB)"
+       @echo " PLATFORM          = $(PLATFORM)"
+       @echo " DPDK_VERSION      = $(DPDK_VERSION)"
+       @echo " DPDK_CONFIG       = $(DPDK_CONFIG)"
+       @echo " SAMPLE_PLUGIN     = $(SAMPLE_PLUGIN)"
+       @echo " DISABLED_PLUGINS  = $(DISABLED_PLUGINS)"
+
+$(BR)/.deps.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" ; \
@@ -143,41 +265,55 @@ ifeq ($(OS_ID),ubuntu)
          exit 1 ; \
        fi ; \
        exit 0
+else ifneq ("$(wildcard /etc/redhat-release)","")
+       @for i in $(RPM_DEPENDS) ; do \
+           RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3)  ;   \
+           MISSING+=$$(rpm -q $$RPM | grep "^package")    ;    \
+       done                                                       ;    \
+       if [ -n "$$MISSING" ] ; then \
+         echo "Please install missing RPMs: \n$$MISSING\n" ; \
+         echo "by executing \"make install-dep\"\n" ; \
+         exit 1 ; \
+       fi ; \
+       exit 0
 endif
-       @echo "SOURCE_PATH = $(WS_ROOT)"                   > $(BR)/build-config.mk
-       @echo "#!/bin/bash\n"                              > $(BR)/path_setup
-       @echo 'export PATH=$(BR)/tools/ccache-bin:$$PATH' >> $(BR)/path_setup
-       @echo 'export PATH=$(BR)/tools/bin:$$PATH'        >> $(BR)/path_setup
-       @echo 'export CCACHE_DIR=$(CCACHE_DIR)'           >> $(BR)/path_setup
-
-ifeq ("$(wildcard /usr/bin/ccache )","")
-       @echo "WARNING: Please install ccache AYEC and re-run this script"
-else
-       @rm -rf $(BR)/tools/ccache-bin
-       @mkdir -p $(BR)/tools/ccache-bin
-       @ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/gcc
-       @ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/g++
-endif
-       @make -C $(BR) V=$(V) is_build_tool=yes tools-install
        @touch $@
 
-bootstrap: $(BR)/.bootstrap.ok
+bootstrap:
+       @echo "'make bootstrap' is not needed anymore"
 
 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)","")
+ifeq ($(OS_ID),rhel)
+       @sudo -E yum-config-manager --enable rhel-server-rhscl-7-rpms
+else ifeq ($(OS_ID),centos)
+       @sudo -E yum install $(CONFIRM) centos-release-scl-rh
+endif
        @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-2.17-106.el7_2.4.x86_64 openssl-libs-1.0.1e-51.el7_2.4.x86_64 zlib-1.2.7-15.el7.x86_64
+       @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
+else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID))
+       @sudo -E zypper refresh
+       @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
+else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID))
+       @sudo -E zypper refresh
+       @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
+else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
+       @sudo -E zypper refresh
+       @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
 else
-       $(error "This option currently works only on Ubuntu or Centos systems")
+       $(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS or openSUSE systems")
 endif
 
 define make
@@ -191,58 +327,83 @@ else
        $(shell $(BR)/scripts/version > $(BR)/scripts/.version)
 endif
 
-dist:  $(BR)/scripts/.version
-       $(MAKE) verstring=$(PLATFORM)-$(shell cat $(BR)/scripts/.version) prefix=$(PLATFORM) distversion
-
-distversion:   $(BR)/scripts/.version
-       $(BR)/scripts/verdist ${BR} ${prefix}-$(shell $(BR)/scripts/version rpm-version) ${verstring}
-       mv $(verstring).tar.gz $(BR)/rpm
-
-build: $(BR)/.bootstrap.ok
-       $(call make,$(PLATFORM)_debug,vpp-install)
+DIST_FILE = $(BR)/vpp-$(shell src/scripts/version).tar
+DIST_SUBDIR = vpp-$(shell src/scripts/version|cut -f1 -d-)
+
+dist:
+       @if git rev-parse 2> /dev/null ; then \
+           git archive \
+             --prefix=$(DIST_SUBDIR)/ \
+             --format=tar \
+             -o $(DIST_FILE) \
+           HEAD ; \
+           git describe > $(BR)/.version ; \
+       else \
+           (cd .. ; tar -cf $(DIST_FILE) $(DIST_SUBDIR) --exclude=*.tar) ; \
+           src/scripts/version > $(BR)/.version ; \
+       fi
+       @tar --append \
+         --file $(DIST_FILE) \
+         --transform='s,.*/.version,$(DIST_SUBDIR)/src/scripts/.version,' \
+         $(BR)/.version
+       @$(RM) $(BR)/.version $(DIST_FILE).xz
+       @xz -v --threads=0 $(DIST_FILE)
+       @$(RM) $(BR)/vpp-latest.tar.xz
+       @ln -rs $(DIST_FILE).xz $(BR)/vpp-latest.tar.xz
+
+build: $(BR)/.deps.ok
+       $(call make,$(PLATFORM)_debug,$(addsuffix -install,$(TARGETS)))
 
 wipedist:
-       $(RM) $(BR)/scripts/.version $(BR)/rpm/*.tar.gz
+       @$(RM) $(BR)/*.tar.xz
 
-wipe: wipedist $(BR)/.bootstrap.ok
-       $(call make,$(PLATFORM)_debug,vpp-wipe)
+wipe: wipedist test-wipe $(BR)/.deps.ok
+       $(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS)))
 
 rebuild: wipe build
 
-build-release: $(BR)/.bootstrap.ok
-       $(call make,$(PLATFORM),vpp-install)
+build-release: $(BR)/.deps.ok
+       $(call make,$(PLATFORM),$(addsuffix -install,$(TARGETS)))
 
-wipe-release: $(BR)/.bootstrap.ok
-       $(call make,$(PLATFORM),vpp-wipe)
+wipe-release: test-wipe $(BR)/.deps.ok
+       $(call make,$(PLATFORM),$(addsuffix -wipe,$(TARGETS)))
 
 rebuild-release: wipe-release build-release
 
-export VPP_PYTHON_PREFIX=$(BR)/python
+export VPP_PYTHON_PREFIX ?= $(BR)/python
+
+libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
 
 define test
        $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
+       $(eval libs:=lib lib64)
        make -C test \
          TEST_DIR=$(WS_ROOT)/test \
          VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
          VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
-         VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
+         VPP_TEST_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_plugins) \
          VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
-         LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
+         LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \
          EXTENDED_TESTS=$(EXTENDED_TESTS) \
+         PYTHON=$(PYTHON) \
+         OS_ID=$(OS_ID) \
+         CACHE_OUTPUT=$(CACHE_OUTPUT) \
          $(3)
 endef
 
-test: bootstrap
+test:
        $(call test,vpp,vpp,test)
 
-test-debug: bootstrap
+test-debug:
        $(call test,vpp,vpp_debug,test)
 
-test-all: bootstrap
+test-all:
+       $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,)
        $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp,test)
 
-test-all-debug: bootstrap
+test-all-debug:
+       $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,)
        $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp_debug,test)
 
@@ -252,19 +413,23 @@ test-help:
 test-wipe:
        @make -C test wipe
 
-test-shell: bootstrap
+test-shell:
        $(call test,vpp,vpp,shell)
 
-test-shell-debug: bootstrap
+test-shell-debug:
        $(call test,vpp,vpp_debug,shell)
 
+test-dep:
+       @make -C test test-dep
+
 test-doc:
        @make -C test doc
 
 test-wipe-doc:
        @make -C test wipe-doc
 
-test-cov: bootstrap
+test-cov:
+       $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp_gcov,cov)
 
 test-wipe-cov:
@@ -279,18 +444,17 @@ retest:
 retest-debug:
        $(call test,vpp,vpp_debug,retest)
 
-STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
        @echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
        @echo "         Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
        @cd $(STARTUP_DIR) && \
-         sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(1)/vpp/lib64/vpp_plugins
+         $(SUDO) $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF)
 endef
 else
 define run
        @cd $(STARTUP_DIR) && \
-         sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(1)/vpp/lib64/vpp_plugins
+         $(SUDO) $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//')
 endef
 endif
 
@@ -310,7 +474,7 @@ run-release:
 debug:
        $(call run, $(BR)/install-$(PLATFORM)_debug-native,$(GDB) $(GDB_ARGS) --args)
 
-build-coverity: 
+build-coverity:
        $(call make,$(PLATFORM)_coverity,install-packages)
 
 debug-release:
@@ -320,16 +484,23 @@ build-vat:
        $(call make,$(PLATFORM)_debug,vpp-api-test-install)
 
 run-vat:
-       @sudo $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test
+       @$(SUDO) $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test
 
 pkg-deb:
        $(call make,$(PLATFORM),install-deb)
 
 pkg-rpm: dist
-       $(call make,$(PLATFORM),install-rpm)
+       make -C extras/rpm
+
+pkg-srpm: dist
+       make -C extras/rpm srpm
 
 dpdk-install-dev:
-       make -C dpdk install-$(PKG)
+       $(call banner,"This command is deprecated. Please use 'make install-ext-deps'")
+       make -C build/external install-$(PKG)
+
+install-ext-deps:
+       make -C build/external install-$(PKG)
 
 ctags: ctags.files
        @ctags --totals --tag-relative -L $<
@@ -369,25 +540,38 @@ doxygen:
 wipe-doxygen:
        $(call make-doxy)
 
-define banner
-       @echo "========================================================================"
-       @echo " $(1)"
-       @echo "========================================================================"
-       @echo " "
-endef
+# Sphinx Documents
+export DOCS_DIR = $(WS_ROOT)/docs
+export VENV_DIR = $(WS_ROOT)/sphinx_venv
+export SPHINX_SCRIPTS_DIR = $(WS_ROOT)/docs/scripts
 
-verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
+.PHONY: docs-venv docs docs-clean
+
+docs-venv:
+       @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh venv)
+
+docs: $(DOCS_DIR)
+       @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh html)
+
+docs-clean:
+       @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh clean)
+
+verify: install-dep $(BR)/.deps.ok install-ext-deps
        $(call banner,"Building for PLATFORM=vpp using gcc")
        @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
-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
-endif
+       $(call banner,"Building sample-plugin")
+       @make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
+       $(call banner,"Building libmemif")
+       @make -C build-root PLATFORM=vpp TAG=vpp libmemif-install
+       $(call banner,"Building JAPI")
+       @make -C build-root PLATFORM=vpp TAG=vpp japi-install
+       $(call banner,"Building VOM")
+       @make -C build-root PLATFORM=vpp TAG=vpp vom-install
        $(call banner,"Building $(PKG) packages")
        @make pkg-$(PKG)
-       @make test-all
+ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-18.04)
+       $(call banner,"Running tests")
+       @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test
+endif