X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=7f3c4295e884d8df73eeeab6f7ce649db80a9e8c;hb=59fa121f8;hp=8c7f3523f775f0cb6fd784cbd584686d2667382c;hpb=ccf65fbc0ebc2541a58f67d5e57297b7b1429658;p=vpp.git

diff --git a/Makefile b/Makefile
index 8c7f3523f77..7f3c4295e88 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ 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
+DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += libssl-dev
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
@@ -93,8 +93,8 @@ ifeq ($(OS_ID),fedora)
 	RPM_DEPENDS += dnf-utils
 	RPM_DEPENDS += subunit subunit-devel
 	RPM_DEPENDS += compat-openssl10-devel
-	RPM_DEPENDS += python2-devel python34-ply
-	RPM_DEPENDS += python2-virtualenv
+	RPM_DEPENDS += python3-devel python3-ply
+	RPM_DEPENDS += python3-virtualenv python3-jsonschema
 	RPM_DEPENDS += cmake
 	RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else
@@ -102,7 +102,7 @@ else
 	RPM_DEPENDS += openssl-devel
 	RPM_DEPENDS += python-devel python36-ply
 	RPM_DEPENDS += python36-devel python36-pip
-	RPM_DEPENDS += python-virtualenv
+	RPM_DEPENDS += python-virtualenv python36-jsonschema
 	RPM_DEPENDS += devtoolset-7
 	RPM_DEPENDS += cmake3
 	RPM_DEPENDS_GROUPS = 'Development Tools'
@@ -111,8 +111,8 @@ 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)
+# 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
@@ -126,7 +126,7 @@ 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)
+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
@@ -216,6 +216,8 @@ help:
 	@echo " doxygen             - (re)generate documentation"
 	@echo " bootstrap-doxygen   - setup Doxygen dependencies"
 	@echo " wipe-doxygen        - wipe all generated documentation"
+	@echo " checkfeaturelist    - check FEATURE.yaml according to schema"
+	@echo " featurelist         - dump feature list in markdown"
 	@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"
@@ -321,6 +323,7 @@ else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
 else
 	$(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS or openSUSE systems")
 endif
+	git config commit.template .git_commit_template.txt
 
 define make
 	@make -C $(BR) PLATFORM=$(PLATFORM) TAG=$(1) $(2)
@@ -388,6 +391,7 @@ define test
 	  VPP_BUILD_DIR=$(BR)/build-$(2)-native \
 	  VPP_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
 	  VPP_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_plugins) \
+	  VPP_TEST_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_api_test_plugins) \
 	  VPP_INSTALL_PATH=$(BR)/install-$(2)-native/ \
 	  LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \
 	  EXTENDED_TESTS=$(EXTENDED_TESTS) \
@@ -428,6 +432,9 @@ test-shell:
 test-shell-debug:
 	$(call test,vpp,vpp_debug,shell)
 
+test-shell-gcov:
+	$(call test,vpp,vpp_gcov,shell)
+
 test-dep:
 	@make -C test test-dep
 
@@ -539,6 +546,12 @@ checkstyle:
 fixstyle:
 	@build-root/scripts/checkstyle.sh --fix
 
+featurelist:
+	@build-root/scripts/fts.py --all --markdown
+
+checkfeaturelist:
+	@build-root/scripts/fts.py --validate --git-status
+
 #
 # Build the documentation
 #