X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=cf4cfadecc724cc43060a3c19261e9f9370f9b56;hb=00f21fb2f;hp=dc7583eb2a1316996c52719b09cafef9ae5646ef;hpb=e7906906079ca2d67bf67cfa9939523213230b56;p=vpp.git

diff --git a/Makefile b/Makefile
index dc7583eb2a1..cf4cfadecc7 100644
--- a/Makefile
+++ b/Makefile
@@ -65,21 +65,40 @@ 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-virtualenv python-pip libffi6 check
+DEB_DEPENDS += python3-all python3-setuptools 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 += 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
+# python3.6 on 16.04 requires python36-dev
+
+LIBFFI=libffi6 # works on all but 20.04
+
+ifeq ($(OS_VERSION_ID),18.04)
+	DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
 	DEB_DEPENDS += libssl-dev
+	DEB_DEPENDS += clang-9
+else ifeq ($(OS_VERSION_ID),20.04)
+	DEB_DEPENDS += python3-virtualenv
+	DEB_DEPENDS += libssl-dev
+	DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
+	LIBFFI=libffi7
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
 	DEB_DEPENDS += libssl-dev
+	DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
 	APT_ARGS = -t jessie-backports
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
 	DEB_DEPENDS += libssl1.0-dev
+	DEB_DEPENDS += python-all python-pip
+	DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10)
+	DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
 else
 	DEB_DEPENDS += libssl-dev
 endif
 
+DEB_DEPENDS += $(LIBFFI)
+
 RPM_DEPENDS  = redhat-lsb glibc-static
 RPM_DEPENDS += apr-devel
 RPM_DEPENDS += numactl-devel
@@ -89,23 +108,33 @@ 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
 
 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
+	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,6 +142,11 @@ endif
 # +ganglia-devel if building the ganglia plugin
 
 RPM_DEPENDS += chrpath libffi-devel rpm-build
+
+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
 # 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)
@@ -187,22 +221,13 @@ 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-all             - run functional and extended tests"
-	@echo " test-all-debug       - run functional and extended 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 " pkg-snap             - build SNAP package"
+	@echo " snap-clean           - clean up snap build environment"
 	@echo " vom-pkg-deb          - build vom DEB packages"
 	@echo " vom-pkg-deb-debug    - build vom DEB debug packages"
 	@echo " pkg-rpm              - build RPM packages"
@@ -210,9 +235,11 @@ help:
 	@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"
@@ -224,13 +251,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-wipe-papi       - wipe test framework papi test code"
-	@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 +294,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 \
@@ -308,11 +328,16 @@ 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) epel-release
+	@sudo -E dnf config-manager --set-enabled PowerTools
+	@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)
@@ -401,6 +426,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,)
@@ -415,6 +441,7 @@ define test
 	  EXTENDED_TESTS=$(EXTENDED_TESTS) \
 	  PYTHON=$(PYTHON) \
 	  OS_ID=$(OS_ID) \
+	  RND_SEED=$(RND_SEED) \
 	  CACHE_OUTPUT=$(CACHE_OUTPUT) \
 	  $(3)
 endef
@@ -449,7 +476,7 @@ papi-wipe: test-wipe-papi
 
 .PHONY: test-wipe-papi
 test-wipe-papi:
-	@make -C test papi-wipe
+	@make -C test wipe-papi
 
 .PHONY: test-help
 test-help:
@@ -493,6 +520,10 @@ test-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
@@ -572,6 +603,20 @@ run-vat:
 pkg-deb:
 	$(call make,$(PLATFORM),vpp-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: vom-pkg-deb
 vom-pkg-deb: pkg-deb
 	$(call make,$(PLATFORM),vom-package-deb)
@@ -625,10 +670,13 @@ gtags: ctags
 cscope: cscope.files
 	@cscope -b -q -v
 
+.PHONY: compdb
+compdb:
+	@ninja -C build-root/build-vpp_debug-native/vpp -t compdb > compile_commands.json
+
 .PHONY: checkstyle
-checkstyle:
+checkstyle: checkfeaturelist
 	@build-root/scripts/checkstyle.sh
-	yamllint $(WS_ROOT)/src
 
 .PHONY: checkstyle-commit
 checkstyle-commit:
@@ -644,6 +692,10 @@ checkstyle-all: checkstyle-commit checkstyle checkstyle-test
 fixstyle:
 	@build-root/scripts/checkstyle.sh --fix
 
+.PHONY: checkstyle-api
+checkstyle-api:
+	@extras/scripts/crcchecker.py --check-patch
+
 # necessary because Bug 1696324 - Update to python3.6 breaks PyYAML dependencies
 # Status:	CLOSED CANTFIX
 # https://bugzilla.redhat.com/show_bug.cgi?id=1696324
@@ -662,7 +714,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
@@ -680,7 +732,7 @@ bootstrap-doxygen:
 	$(call make-doxy)
 
 .PHONY: doxygen
-doxygen:
+doxygen: bootstrap-doxygen
 	$(call make-doxy)
 
 .PHONY: wipe-doxygen
@@ -702,7 +754,8 @@ docs: $(DOCS_DIR)
 
 .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