interface: callback to manage extra MAC addresses

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 290ec50..923b0e8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ SAMPLE_PLUGIN?=no
 STARTUP_DIR?=$(PWD)
 MACHINE=$(shell uname -m)
 SUDO?=sudo
+DPDK_CONFIG?=no-pci
 
 ,:=,
 define disable_plugins
@@ -101,7 +102,7 @@ else
        RPM_DEPENDS += yum-utils
        RPM_DEPENDS += openssl-devel
        RPM_DEPENDS += python-devel python36-ply
-       RPM_DEPENDS += python36-devel python36-pip
+       RPM_DEPENDS += python3-devel python3-pip
        RPM_DEPENDS += python-virtualenv python36-jsonschema
        RPM_DEPENDS += devtoolset-7
        RPM_DEPENDS += cmake3
@@ -218,6 +219,8 @@ help:
        @echo " wipe-doxygen        - wipe all generated documentation"
        @echo " checkfeaturelist    - check FEATURE.yaml according to schema"
        @echo " featurelist         - dump feature list in markdown"
+       @echo " json-api-files      - (re)-generate json api files"
+       @echo " json-api-files-debug - (re)-generate json api files for debug target"
        @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"
@@ -421,6 +424,9 @@ test-all-debug:
        $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp_debug,test)
 
+papi-wipe:
+       @make -C test papi-wipe
+
 test-help:
        @make -C test help
 
@@ -534,6 +540,12 @@ dpdk-install-dev:
 install-ext-deps:
        make -C build/external install-$(PKG)
 
+json-api-files:
+       $(WS_ROOT)/src/tools/vppapigen/generate_json.py
+
+json-api-files-debug:
+       $(WS_ROOT)/src/tools/vppapigen/generate_json.py --debug-target
+
 ctags: ctags.files
        @ctags --totals --tag-relative -L $<
        @rm $<
@@ -594,7 +606,7 @@ docs: $(DOCS_DIR)
 docs-clean:
        @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh clean)
 
-verify: install-dep $(BR)/.deps.ok install-ext-deps
+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
        $(call banner,"Building sample-plugin")
@@ -609,7 +621,11 @@ ifeq ($(OS_ID),ubuntu)
        $(call banner,"Building VOM $(PKG) package")
        @make vom-pkg-deb
 endif
+
+verify: pkg-verify
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-18.04)
+       $(call banner,"Testing vppapigen")
+       @src/tools/vppapigen/test_vppapigen.py
        $(call banner,"Running tests")
        @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test
 endif