ikev2: support responder hostname
[vpp.git] / Makefile
index 7f5092b..149af03 100644 (file)
--- a/Makefile
+++ b/Makefile
 export WS_ROOT=$(CURDIR)
 export BR=$(WS_ROOT)/build-root
 CCACHE_DIR?=$(BR)/.ccache
+SHELL:=/bin/bash
 GDB?=gdb
 PLATFORM?=vpp
 SAMPLE_PLUGIN?=no
 STARTUP_DIR?=$(PWD)
 MACHINE=$(shell uname -m)
-SUDO?=sudo
+SUDO?=sudo -E
 DPDK_CONFIG?=no-pci
 
 ,:=,
@@ -55,57 +56,90 @@ endif
 
 ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
 PKG=deb
-else ifeq ($(filter rhel centos fedora opensuse opensuse-leap opensuse-tumbleweed,$(OS_ID)),$(OS_ID))
+else ifeq ($(filter rhel centos fedora,$(OS_ID)),$(OS_ID))
 PKG=rpm
 endif
 
 # +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 += debhelper dkms git libtool libapr1-dev dh-systemd dh-python
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev
-DEB_DEPENDS += python-all python3-all python3-setuptools python-dev
-DEB_DEPENDS += python-virtualenv python-pip libffi6 check
-DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
-DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml yamllint
-ifeq ($(OS_VERSION_ID),14.04)
+DEB_DEPENDS += lcov chrpath autoconf libnuma-dev
+DEB_DEPENDS += python3-all python3-setuptools check
+DEB_DEPENDS += libffi-dev python3-ply libmbedtls-dev
+DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml
+DEB_DEPENDS += python3-venv  # ensurepip
+DEB_DEPENDS += python3-dev   # needed for python3 -m pip install psutil
+DEB_DEPENDS += libnl-3-dev libnl-route-3-dev
+# python3.6 on 16.04 requires python36-dev
+
+LIBFFI=libffi6 # works on all but 20.04 and debian-testing
+
+ifeq ($(OS_VERSION_ID),18.04)
+       DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
        DEB_DEPENDS += libssl-dev
-else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
+       DEB_DEPENDS += clang-9 clang-format-10
+else ifeq ($(OS_VERSION_ID),20.04)
+       DEB_DEPENDS += python3-virtualenv
        DEB_DEPENDS += libssl-dev
-       APT_ARGS = -t jessie-backports
-else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
-       DEB_DEPENDS += libssl1.0-dev
+       DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
+       DEB_DEPENDS += clang-format-10
+       LIBFFI=libffi7
+else ifeq ($(OS_VERSION_ID),20.10)
+        DEB_DEPENDS += python3-virtualenv
+        DEB_DEPENDS += libssl-dev
+        DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
+        DEB_DEPENDS += clang-format-10
+        LIBFFI=libffi8ubuntu1
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10)
+       DEB_DEPENDS += python3-virtualenv virtualenv
+       DEB_DEPENDS += libssl-dev
+       DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
 else
        DEB_DEPENDS += libssl-dev
+       DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
+       LIBFFI=libffi7
 endif
 
+DEB_DEPENDS += $(LIBFFI)
+
 RPM_DEPENDS  = redhat-lsb glibc-static
 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 += ninja-build
 RPM_DEPENDS += libuuid-devel
 RPM_DEPENDS += mbedtls-devel
-RPM_DEPENDS += yamllint
+RPM_DEPENDS += ccache
+RPM_DEPENDS += xmlto
+RPM_DEPENDS += elfutils-libelf-devel
+RPM_DEPENDS += libnl3-devel
 
 ifeq ($(OS_ID),fedora)
        RPM_DEPENDS += dnf-utils
        RPM_DEPENDS += subunit subunit-devel
        RPM_DEPENDS += compat-openssl10-devel
-       RPM_DEPENDS += python3-devel python3-ply
+       RPM_DEPENDS += python3-devel  # needed for python3 -m pip install psutil
+       RPM_DEPENDS += python3-ply  # for vppapigen
        RPM_DEPENDS += python3-virtualenv python3-jsonschema
        RPM_DEPENDS += cmake
        RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
+       RPM_DEPENDS += yum-utils
+       RPM_DEPENDS += compat-openssl10 openssl-devel
+       RPM_DEPENDS += python2-devel python36-devel python3-ply
+       RPM_DEPENDS += python3-virtualenv python3-jsonschema
+       RPM_DEPENDS += cmake
+       RPM_DEPENDS_GROUPS = 'Development Tools'
 else
        RPM_DEPENDS += yum-utils
        RPM_DEPENDS += openssl-devel
-       RPM_DEPENDS += python-devel python36-ply
+       RPM_DEPENDS += python36-ply  # for vppapigen
        RPM_DEPENDS += python3-devel python3-pip
        RPM_DEPENDS += python-virtualenv python36-jsonschema
-       RPM_DEPENDS += devtoolset-7
+       RPM_DEPENDS += devtoolset-9 devtoolset-9-libasan-devel
        RPM_DEPENDS += cmake3
        RPM_DEPENDS_GROUPS = 'Development Tools'
 endif
@@ -113,42 +147,11 @@ endif
 # +ganglia-devel if building the ganglia plugin
 
 RPM_DEPENDS += chrpath libffi-devel rpm-build
-# lowercase- replace spaces with dashes.
-SUSE_NAME= $(shell grep '^NAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | sed -e 's/ /-/' | awk '{print tolower($$0)}')
-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 python3-ply
-
-RPM_SUSE_DEVEL_DEPS = glibc-devel-static libnuma-devel
-RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel libuuid-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_headers1_68_0-devel-1.68.0  libboost_thread1_68_0-devel-1.68.0 gcc
-       RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv
-endif
-ifeq ($(SUSE_ID),15.0)
-       RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel gcc
-       RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv
-else
-       RPM_SUSE_DEVEL_DEPS += libboost_headers1_68_0-devel-1.68.0 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 gcc git curl
-       RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv
-endif
-endif
 
-RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS)
+RPM_DEPENDS_DEBUG  = glibc-debuginfo e2fsprogs-debuginfo
+RPM_DEPENDS_DEBUG += krb5-debuginfo openssl-debuginfo
+RPM_DEPENDS_DEBUG += zlib-debuginfo nss-softokn-debuginfo
+RPM_DEPENDS_DEBUG += yum-plugin-auto-update-debug-info
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
@@ -165,12 +168,6 @@ 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)"
@@ -178,9 +175,10 @@ define banner
        @echo " "
 endef
 
+.PHONY: help
 help:
        @echo "Make Targets:"
-       @echo " install-dep          - install software dependencies"
+       @echo " install-dep[s]       - install software dependencies"
        @echo " wipe                 - wipe all products of debug build "
        @echo " wipe-release         - wipe all products of release build "
        @echo " build                - build debug binaries"
@@ -192,28 +190,23 @@ help:
        @echo " run-release          - run release binary"
        @echo " debug                - run debug binary with debugger"
        @echo " debug-release        - run release binary with debugger"
-       @echo " test                 - build and run (basic) functional tests"
-       @echo " test-debug           - build and run (basic) functional tests (debug build)"
-       @echo " test-all             - build and run functional and extended tests"
-       @echo " test-all-debug       - build and run functional and extended tests (debug build)"
-       @echo " test-gcov            - build and run functional tests (gcov build)"
-       @echo " test-shell           - enter shell with test environment"
-       @echo " test-shell-debug     - enter shell with test environment (debug build)"
-       @echo " test-wipe            - wipe files generated by unit tests"
-       @echo " retest               - run functional tests"
-       @echo " retest-debug         - run functional tests (debug build)"
+       @echo " test                 - build and run tests"
        @echo " test-help            - show help on test framework"
        @echo " run-vat              - run vpp-api-test tool"
        @echo " pkg-deb              - build DEB packages"
        @echo " pkg-deb-debug        - build DEB debug packages"
-       @echo " vom-pkg-deb          - build vom DEB packages"
-       @echo " vom-pkg-deb-debug    - build vom DEB debug packages"
+       @echo " pkg-snap             - build SNAP package"
+       @echo " snap-clean           - clean up snap build environment"
        @echo " pkg-rpm              - build RPM packages"
-       @echo " install-ext-deps     - install external development dependencies"
+       @echo " install-ext-dep[s]   - install external development dependencies"
        @echo " ctags                - (re)generate ctags database"
        @echo " gtags                - (re)generate gtags database"
        @echo " cscope               - (re)generate cscope database"
+       @echo " compdb               - (re)generate compile_commands.json"
        @echo " checkstyle           - check coding style"
+       @echo " checkstyle-commit    - check commit message format"
+       @echo " checkstyle-test      - check test framework coding style"
+       @echo " checkstyle-api       - check api for incompatible changes"
        @echo " fixstyle             - fix coding style"
        @echo " doxygen              - (re)generate documentation"
        @echo " bootstrap-doxygen    - setup Doxygen dependencies"
@@ -225,12 +218,6 @@ help:
        @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"
-       @echo " test-wipe-cov        - wipe code coverage report for test framework"
-       @echo " test-checkstyle      - check PEP8 compliance for test framework"
-       @echo " test-refresh-deps    - refresh the Python dependencies for the tests"
        @echo ""
        @echo "Make Arguments:"
        @echo " V=[0|1]                  - set build verbosity level"
@@ -274,7 +261,7 @@ ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
        exit 0
 else ifneq ("$(wildcard /etc/redhat-release)","")
        @for i in $(RPM_DEPENDS) ; do \
-           RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3)  ;   \
+           RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3,4)  ; \
            MISSING+=$$(rpm -q $$RPM | grep "^package")    ;    \
        done                                                       ;    \
        if [ -n "$$MISSING" ] ; then \
@@ -286,18 +273,13 @@ else ifneq ("$(wildcard /etc/redhat-release)","")
 endif
        @touch $@
 
+.PHONY: bootstrap
 bootstrap:
        @echo "'make bootstrap' is not needed anymore"
 
+.PHONY: install-dep
 install-dep:
 ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
-ifeq ($(OS_VERSION_ID),14.04)
-       @sudo -E apt-get $(CONFIRM) $(FORCE) install software-properties-common
-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 $(APT_ARGS) $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
@@ -306,30 +288,30 @@ ifeq ($(OS_ID),rhel)
        @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
        @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
        @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
+       @sudo -E dnf install $(CONFIRM) dnf-plugins-core epel-release
+       @sudo -E dnf config-manager --set-enabled \
+          $(shell dnf repolist all 2>/dev/null|grep -i powertools|cut -d' ' -f1)
+       @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
+       @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS)
 else ifeq ($(OS_ID),centos)
        @sudo -E yum install $(CONFIRM) centos-release-scl-rh epel-release
        @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
        @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
-       @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
+       @sudo -E yum install $(CONFIRM) --enablerepo=base-debuginfo $(RPM_DEPENDS_DEBUG)
 else ifeq ($(OS_ID),fedora)
        @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
        @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS)
        @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
 endif
-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, Debian, RHEL, CentOS or openSUSE systems")
+       $(error "This option currently works only on Ubuntu, Debian, RHEL, or CentOS systems")
 endif
        git config commit.template .git_commit_template.txt
 
+.PHONY: install-deps
+install-deps: install-dep
+
 define make
        @make -C $(BR) PLATFORM=$(PLATFORM) TAG=$(1) $(2)
 endef
@@ -344,6 +326,7 @@ endif
 DIST_FILE = $(BR)/vpp-$(shell src/scripts/version).tar
 DIST_SUBDIR = vpp-$(shell src/scripts/version|cut -f1 -d-)
 
+.PHONY: dist
 dist:
        @if git rev-parse 2> /dev/null ; then \
            git archive \
@@ -365,29 +348,37 @@ dist:
        @$(RM) $(BR)/vpp-latest.tar.xz
        @ln -rs $(DIST_FILE).xz $(BR)/vpp-latest.tar.xz
 
+.PHONY: build
 build: $(BR)/.deps.ok
        $(call make,$(PLATFORM)_debug,$(addsuffix -install,$(TARGETS)))
 
+.PHONY: wipedist
 wipedist:
        @$(RM) $(BR)/*.tar.xz
 
+.PHONY: wipe
 wipe: wipedist test-wipe $(BR)/.deps.ok
        $(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS)))
        @find . -type f -name "*.api.json" ! -path "./test/*" -exec rm {} \;
 
+.PHONY: rebuild
 rebuild: wipe build
 
+.PHONY: build-release
 build-release: $(BR)/.deps.ok
        $(call make,$(PLATFORM),$(addsuffix -install,$(TARGETS)))
 
+.PHONY: wipe-release
 wipe-release: test-wipe $(BR)/.deps.ok
        $(call make,$(PLATFORM),$(addsuffix -wipe,$(TARGETS)))
 
+.PHONY: rebuild-release
 rebuild-release: wipe-release build-release
 
 libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
 
 export TEST_DIR ?= $(WS_ROOT)/test
+export RND_SEED ?= $(shell python3 -c 'import time; print(time.time())')
 
 define test
        $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
@@ -402,76 +393,112 @@ define test
          EXTENDED_TESTS=$(EXTENDED_TESTS) \
          PYTHON=$(PYTHON) \
          OS_ID=$(OS_ID) \
+         RND_SEED=$(RND_SEED) \
          CACHE_OUTPUT=$(CACHE_OUTPUT) \
          $(3)
 endef
 
+.PHONY: test
 test:
        $(call test,vpp,vpp,test)
 
+.PHONY: test-debug
 test-debug:
        $(call test,vpp,vpp_debug,test)
 
+.PHONY: test-gcov
 test-gcov:
        $(call test,vpp,vpp_gcov,test)
 
+.PHONY: test-all
 test-all:
-       $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp vom-install,)
        $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp,test)
 
+.PHONY: test-all-debug
 test-all-debug:
-       $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install,)
        $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp_debug,test)
 
-papi-wipe:
-       @make -C test papi-wipe
+.PHONY: papi-wipe
+papi-wipe: test-wipe-papi
+       $(call banner,"This command is deprecated. Please use 'test-wipe-papi'")
 
+.PHONY: test-wipe-papi
+test-wipe-papi:
+       @make -C test wipe-papi
+
+.PHONY: test-help
 test-help:
        @make -C test help
 
+.PHONY: test-wipe
 test-wipe:
        @make -C test wipe
 
+.PHONY: test-shell
 test-shell:
        $(call test,vpp,vpp,shell)
 
+.PHONY: test-shell-debug
 test-shell-debug:
        $(call test,vpp,vpp_debug,shell)
 
+.PHONY: test-shell-gcov
 test-shell-gcov:
        $(call test,vpp,vpp_gcov,shell)
 
+.PHONY: test-dep
 test-dep:
        @make -C test test-dep
 
+.PHONY: test-doc
 test-doc:
        @make -C test doc
 
+.PHONY: test-wipe-doc
 test-wipe-doc:
        @make -C test wipe-doc
 
+.PHONY: test-cov
 test-cov:
-       @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install
        $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp_gcov,cov)
 
+.PHONY: test-wipe-cov
 test-wipe-cov:
        @make -C test wipe-cov
 
+.PHONY: test-wipe-all
+test-wipe-all:
+       @make -C test wipe-all
+
+.PHONY: test-checkstyle
 test-checkstyle:
        @make -C test checkstyle
 
+.PHONY: test-refresh-deps
 test-refresh-deps:
        @make -C test refresh-deps
 
+.PHONY: retest
 retest:
        $(call test,vpp,vpp,retest)
 
+.PHONY: retest-debug
 retest-debug:
        $(call test,vpp,vpp_debug,retest)
 
+.PHONY: retest-all
+retest-all:
+       $(eval EXTENDED_TESTS=yes)
+       $(call test,vpp,vpp,retest)
+
+.PHONY: retest-all-debug
+retest-all-debug:
+       $(eval EXTENDED_TESTS=yes)
+       $(call test,vpp,vpp_debug,retest)
+
 ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
        @echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
@@ -487,99 +514,151 @@ endef
 endif
 
 %.files: .FORCE
-       @find . \( -name '*\.[chyS]' -o -name '*\.java' -o -name '*\.lex' \) -and \
+       @find . \( -name '*\.[chyS]' -o -name '*\.java' -o -name '*\.lex' -o -name '*\.py' \) -and \
                \( -not -path './build-root*' -o -path \
                './build-root/build-vpp_debug-native/dpdk*' \) > $@
 
 .FORCE:
 
+.PHONY: run
 run:
        $(call run, $(BR)/install-$(PLATFORM)_debug-native)
 
+.PHONY: run-release
 run-release:
        $(call run, $(BR)/install-$(PLATFORM)-native)
 
+.PHONY: debug
 debug:
        $(call run, $(BR)/install-$(PLATFORM)_debug-native,$(GDB) $(GDB_ARGS) --args)
 
+.PHONY: build-coverity
 build-coverity:
        $(call make,$(PLATFORM)_coverity,install-packages)
+       @make -C build-root PLATFORM=vpp TAG=vpp_coverity libmemif-install
 
+.PHONY: debug-release
 debug-release:
        $(call run, $(BR)/install-$(PLATFORM)-native,$(GDB) $(GDB_ARGS) --args)
 
+.PHONY: build-vat
 build-vat:
        $(call make,$(PLATFORM)_debug,vpp-api-test-install)
 
+.PHONY: run-vat
 run-vat:
        @$(SUDO) $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test
 
+.PHONY: pkg-deb
 pkg-deb:
        $(call make,$(PLATFORM),vpp-package-deb)
 
-vom-pkg-deb:
-       $(call make,$(PLATFORM),vpp-package-deb)
-       $(call make,$(PLATFORM),vom-package-deb)
-
+.PHONY: pkg-snap
+pkg-snap:
+       cd extras/snap ;                        \
+        ./prep ;                               \
+       SNAPCRAFT_BUILD_ENVIRONMENT_MEMORY=8G   \
+       SNAPCRAFT_BUILD_ENVIRONMENT_CPU=6       \
+       snapcraft --debug
+
+.PHONY: snap-clean
+snap-clean:
+       cd extras/snap ;                        \
+        snapcraft clean ;                      \
+       rm -f *.snap *.tgz
+
+.PHONY: pkg-deb-debug
 pkg-deb-debug:
        $(call make,$(PLATFORM)_debug,vpp-package-deb)
 
-vom-pkg-deb-debug:
-       $(call make,$(PLATFORM)_debug,vpp-package-deb)
-       $(call make,$(PLATFORM)_debug,vom-package-deb)
-
+.PHONY: pkg-rpm
 pkg-rpm: dist
        make -C extras/rpm
 
+.PHONY: pkg-srpm
 pkg-srpm: dist
        make -C extras/rpm srpm
 
+.PHONY: dpdk-install-dev
 dpdk-install-dev:
        $(call banner,"This command is deprecated. Please use 'make install-ext-deps'")
        make -C build/external install-$(PKG)
 
+.PHONY: install-ext-deps
 install-ext-deps:
        make -C build/external install-$(PKG)
 
+.PHONY: install-ext-dep
+install-ext-dep: install-ext-deps
+
+.PHONY: json-api-files
 json-api-files:
        $(WS_ROOT)/src/tools/vppapigen/generate_json.py
 
+.PHONY: json-api-files-debug
 json-api-files-debug:
        $(WS_ROOT)/src/tools/vppapigen/generate_json.py --debug-target
 
+.PHONY: ctags
 ctags: ctags.files
-       @ctags --totals --tag-relative -L $<
+       @ctags --totals --tag-relative=yes -L $<
        @rm $<
 
+.PHONY: gtags
 gtags: ctags
        @gtags --gtagslabel=ctags
 
+.PHONY: cscope
 cscope: cscope.files
        @cscope -b -q -v
 
-checkstyle:
-       @build-root/scripts/checkstyle.sh
-       yamllint $(WS_ROOT)/src
+.PHONY: compdb
+compdb:
+       @ninja -C build-root/build-vpp_debug-native/vpp build.ninja
+       @ninja -C build-root/build-vpp_debug-native/vpp -t compdb | \
+         extras/scripts/compdb_cleanup.py > compile_commands.json
+
+.PHONY: checkstyle
+checkstyle: checkfeaturelist
+ifeq ($(shell which clang-format-10),)
+       @sudo apt-get install -y clang-format-10
+endif
+       @extras/scripts/checkstyle.sh
+
+.PHONY: checkstyle-commit
+checkstyle-commit:
+       @extras/scripts/check_commit_msg.sh
+
+.PHONY: checkstyle-test
+checkstyle-test: test-checkstyle
+
+.PHONY: checkstyle-all
+checkstyle-all: checkstyle-commit checkstyle checkstyle-test
 
+.PHONY: fixstyle
 fixstyle:
-       @build-root/scripts/checkstyle.sh --fix
+       @extras/scripts/checkstyle.sh --fix
+
+.PHONY: checkstyle-api
+checkstyle-api:
+       @extras/scripts/crcchecker.py --check-patchset
 
 # necessary because Bug 1696324 - Update to python3.6 breaks PyYAML dependencies
 # Status:      CLOSED CANTFIX
 # https://bugzilla.redhat.com/show_bug.cgi?id=1696324
+.PHONY: centos-pyyaml
 centos-pyyaml:
-ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-7)
-       @python3 -m pip install pyyaml
-endif
 ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
        @sudo -E yum install $(CONFIRM) python3-pyyaml
 endif
 
+.PHONY: featurelist
 featurelist: centos-pyyaml
        @build-root/scripts/fts.py --all --markdown
 
+.PHONY: checkfeaturelist
 checkfeaturelist: centos-pyyaml
-       @build-root/scripts/fts.py --validate --git-status
+       @build-root/scripts/fts.py --validate --all
 
 #
 # Build the documentation
@@ -592,14 +671,15 @@ define make-doxy
        @OS_ID="$(OS_ID)" make -C $(DOXY_DIR) $@
 endef
 
-.PHONY: bootstrap-doxygen doxygen wipe-doxygen
-
+.PHONY: bootstrap-doxygen
 bootstrap-doxygen:
        $(call make-doxy)
 
-doxygen:
+.PHONY: doxygen
+doxygen: bootstrap-doxygen
        $(call make-doxy)
 
+.PHONY: wipe-doxygen
 wipe-doxygen:
        $(call make-doxy)
 
@@ -608,17 +688,20 @@ export DOCS_DIR = $(WS_ROOT)/docs
 export VENV_DIR = $(WS_ROOT)/sphinx_venv
 export SPHINX_SCRIPTS_DIR = $(WS_ROOT)/docs/scripts
 
-.PHONY: docs-venv docs docs-clean
-
+.PHONY: docs-venv
 docs-venv:
        @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh venv)
 
+.PHONY: docs
 docs: $(DOCS_DIR)
        @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh html)
 
+.PHONY: docs-clean
 docs-clean:
-       @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh clean)
+       @rm -rf $(DOCS_DIR)/_build
+       @rm -rf $(VENV_DIR)
 
+.PHONY: pkg-verify
 pkg-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
@@ -626,16 +709,11 @@ pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps
        @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 VOM")
-       @make -C build-root PLATFORM=vpp TAG=vpp vom-install
        $(call banner,"Building $(PKG) packages")
        @make pkg-$(PKG)
-ifeq ($(OS_ID),ubuntu)
-       $(call banner,"Building VOM $(PKG) package")
-       @make vom-pkg-deb
-endif
 
 MAKE_VERIFY_GATE_OS ?= ubuntu-18.04
+.PHONY: verify
 verify: pkg-verify
 ifeq ($(OS_ID)-$(OS_VERSION_ID),$(MAKE_VERIFY_GATE_OS))
        $(call banner,"Testing vppapigen")