X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=545ccdb66fed23c9ac7f7eac9a01d020f76941c2;hb=0269fa14d6c24c722473f4fe9a97eacc17657a7a;hp=7bf6b7363fcc5461d70682c89339f87721e7e98d;hpb=c025329bb244952938c8575a1d5602a1e54e5fe7;p=vpp.git

diff --git a/Makefile b/Makefile
index 7bf6b7363fc..545ccdb66fe 100644
--- a/Makefile
+++ b/Makefile
@@ -65,12 +65,19 @@ 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 indent clang-format libnuma-dev
-DEB_DEPENDS += python-all python3-all python3-setuptools python-dev
+DEB_DEPENDS += python-all python3-all python3-setuptools
 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
+DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml
 DEB_DEPENDS += python3-venv  # ensurepip
-ifeq ($(OS_VERSION_ID),14.04)
+DEB_DEPENDS += python3-dev   # needed for python3 -m pip install psutil
+# python3.6 on 16.04 requires python36-dev
+ 
+ifeq ($(OS_VERSION_ID),16.04)
+	DEB_DEPENDS += python-dev
+	DEB_DEPENDS += libssl-dev
+else ifeq ($(OS_VERSION_ID),18.04)
+	DEB_DEPENDS += python-dev
 	DEB_DEPENDS += libssl-dev
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
 	DEB_DEPENDS += libssl-dev
@@ -90,27 +97,27 @@ RPM_DEPENDS += selinux-policy selinux-policy-devel
 RPM_DEPENDS += ninja-build
 RPM_DEPENDS += libuuid-devel
 RPM_DEPENDS += mbedtls-devel
-RPM_DEPENDS += yamllint
 
 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 += dnf-utils
+	RPM_DEPENDS += yum-utils
 	RPM_DEPENDS += compat-openssl10
-	RPM_DEPENDS += python3-devel python3-ply
+	RPM_DEPENDS += 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
@@ -394,6 +401,7 @@ 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,)
@@ -408,6 +416,7 @@ define test
 	  EXTENDED_TESTS=$(EXTENDED_TESTS) \
 	  PYTHON=$(PYTHON) \
 	  OS_ID=$(OS_ID) \
+	  RND_SEED=$(RND_SEED) \
 	  CACHE_OUTPUT=$(CACHE_OUTPUT) \
 	  $(3)
 endef
@@ -623,9 +632,8 @@ cscope: cscope.files
 	@cscope -b -q -v
 
 .PHONY: checkstyle
-checkstyle:
+checkstyle: checkfeaturelist
 	@build-root/scripts/checkstyle.sh
-	yamllint $(WS_ROOT)/src
 
 .PHONY: checkstyle-commit
 checkstyle-commit:
@@ -659,7 +667,7 @@ featurelist: centos-pyyaml
 
 .PHONY: checkfeaturelist
 checkfeaturelist: centos-pyyaml
-	@build-root/scripts/fts.py --validate --git-status
+	@build-root/scripts/fts.py --validate --all
 
 #
 # Build the documentation