X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=1e6f9ecc6e0e48a1f3f25b80b17c8db03da9792c;hb=61717cc38;hp=c13c564195b5d344184a0c124671e8074c1e90db;hpb=47e092733cc049e736abf3f125d144c7922cda81;p=vpp.git diff --git a/Makefile b/Makefile index c13c564195b..1e6f9ecc6e0 100644 --- a/Makefile +++ b/Makefile @@ -59,18 +59,36 @@ else ifeq ($(filter rhel centos fedora opensuse opensuse-leap opensuse-tumblewee PKG=rpm endif +# on ubuntu 18.04 prefer gcc-8 if it is installed and CC is not set +ifeq ($(OS_VERSION_ID)-$(CC)-$(shell which gcc-8 > /dev/null; echo $$?),18.04-cc-0) + CC = gcc-8 +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 += 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 += python-all python3-all python3-setuptools +DEB_DEPENDS += python-virtualenv python-pip 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),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 + DEB_DEPENDS += gcc-8 +else ifeq ($(OS_VERSION_ID),20.04) + LIBFFI=libffi7 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) DEB_DEPENDS += libssl-dev APT_ARGS = -t jessie-backports @@ -80,6 +98,8 @@ else DEB_DEPENDS += libssl-dev endif +DEB_DEPENDS += $(LIBFFI) + RPM_DEPENDS = redhat-lsb glibc-static RPM_DEPENDS += apr-devel RPM_DEPENDS += numactl-devel @@ -89,20 +109,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 += yum-utils + RPM_DEPENDS += compat-openssl10 + 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 @@ -187,22 +214,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" @@ -224,13 +242,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" @@ -308,6 +319,9 @@ 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 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) @@ -401,6 +415,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 +430,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 +465,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 +509,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 +592,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) @@ -626,9 +660,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: @@ -662,7 +695,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 @@ -697,7 +730,7 @@ docs-venv: @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh venv) .PHONY: docs -docs: $(DOCS_DIR) docs-venv +docs: $(DOCS_DIR) @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh html) .PHONY: docs-clean