X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=37dbf593564463d0a6f0722fe901be1773b9d59c;hb=495c320a7f06c9ddf2693a4ea9dcbce36e6829de;hp=2bc236c53567b0b69966cb8552b3931df8f0bcb2;hpb=9cfbd3b7869db3ca5131c6fd0c0f77b787fa4312;p=vpp.git diff --git a/Makefile b/Makefile index 2bc236c5356..37dbf593564 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -56,50 +56,50 @@ endif ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) PKG=deb -else ifeq ($(filter rhel centos fedora,$(OS_ID)),$(OS_ID)) +else ifeq ($(filter rhel centos fedora opensuse-leap,$(OS_ID)),$(OS_ID)) PKG=rpm 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 dh-python +DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-python DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config DEB_DEPENDS += lcov chrpath autoconf libnuma-dev DEB_DEPENDS += python3-all python3-setuptools check -DEB_DEPENDS += libffi-dev python3-ply libmbedtls-dev +DEB_DEPENDS += libffi-dev python3-ply 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 -DEB_DEPENDS += libnl-3-dev libnl-route-3-dev -# python3.6 on 16.04 requires python36-dev +DEB_DEPENDS += libnl-3-dev libnl-route-3-dev libmnl-dev +# DEB_DEPENDS += enchant # for docs +DEB_DEPENDS += python3-virtualenv +DEB_DEPENDS += libssl-dev +DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) +DEB_DEPENDS += iperf3 # for 'make test TEST=vcl' LIBFFI=libffi6 # works on all but 20.04 and debian-testing -ifeq ($(OS_VERSION_ID),18.04) - DEB_DEPENDS += python-dev python-all python-pip python-virtualenv - DEB_DEPENDS += libssl-dev - DEB_DEPENDS += clang-9 clang-format-10 -else ifeq ($(OS_VERSION_ID),20.04) +ifeq ($(OS_VERSION_ID),20.04) DEB_DEPENDS += python3-virtualenv DEB_DEPENDS += libssl-dev DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) - DEB_DEPENDS += clang-format-10 + DEB_DEPENDS += clang-11 clang-format-11 LIBFFI=libffi7 + DEB_DEPENDS += enchant-2 # for docs else ifeq ($(OS_VERSION_ID),20.10) - DEB_DEPENDS += python3-virtualenv - DEB_DEPENDS += libssl-dev - DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) - DEB_DEPENDS += clang-format-10 - LIBFFI=libffi8ubuntu1 + DEB_DEPENDS += clang-11 clang-format-11 + LIBFFI=libffi8ubuntu1 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10) - DEB_DEPENDS += python3-virtualenv virtualenv - DEB_DEPENDS += libssl-dev - DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) + DEB_DEPENDS += virtualenv +else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-11) + DEB_DEPENDS += virtualenv + DEB_DEPENDS += clang-11 clang-format-11 + LIBFFI=libffi7 else - DEB_DEPENDS += libssl-dev - DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) + DEB_DEPENDS += clang-11 clang-format-11 LIBFFI=libffi7 + DEB_DEPENDS += enchant-2 # for docs endif DEB_DEPENDS += $(LIBFFI) @@ -115,7 +115,7 @@ RPM_DEPENDS += mbedtls-devel RPM_DEPENDS += ccache RPM_DEPENDS += xmlto RPM_DEPENDS += elfutils-libelf-devel -RPM_DEPENDS += libnl3-devel +RPM_DEPENDS += libnl3-devel libmnl-devel ifeq ($(OS_ID),fedora) RPM_DEPENDS += dnf-utils @@ -131,7 +131,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8) RPM_DEPENDS += compat-openssl10 openssl-devel RPM_DEPENDS += python2-devel python36-devel python3-ply RPM_DEPENDS += python3-virtualenv python3-jsonschema - RPM_DEPENDS += cmake + RPM_DEPENDS += libarchive cmake RPM_DEPENDS_GROUPS = 'Development Tools' else RPM_DEPENDS += yum-utils @@ -153,6 +153,32 @@ RPM_DEPENDS_DEBUG += krb5-debuginfo openssl-debuginfo RPM_DEPENDS_DEBUG += zlib-debuginfo nss-softokn-debuginfo RPM_DEPENDS_DEBUG += yum-plugin-auto-update-debug-info +RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath +RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python3-ply + +RPM_SUSE_DEVEL_DEPS = glibc-devel-static libnuma-devel libelf-devel +RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel libuuid-devel + +RPM_SUSE_PYTHON_DEPS = python-devel python3-devel python-pip python3-pip +RPM_SUSE_PYTHON_DEPS += python-rpm-macros python3-rpm-macros + +RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build + +ifeq ($(OS_ID),opensuse-leap) +ifeq ($(OS_VERSION_ID),15.3) + RPM_SUSE_DEVEL_DEPS += curl libstdc++-devel bison gcc-c++ zlib-devel xmlto + RPM_SUSE_DEVEL_DEPS += lsb-release + RPM_SUSE_DEVEL_DEPS += asciidoc git + RPM_SUSE_PYTHON_DEPS += python3 python2-ply +endif +ifeq ($(OS_VERSION_ID),15.0) + RPM_SUSE_DEVEL_DEPS += gcc git curl + RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv +endif +endif + +RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS) + ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),) STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf endif @@ -209,9 +235,9 @@ help: @echo " checkstyle-test-diff - check test framework coding style (only changed files)" @echo " checkstyle-api - check api for incompatible changes" @echo " fixstyle - fix coding style" - @echo " doxygen - (re)generate documentation" - @echo " bootstrap-doxygen - setup Doxygen dependencies" - @echo " wipe-doxygen - wipe all generated documentation" + @echo " doxygen - DEPRECATED - use 'make docs'" + @echo " bootstrap-doxygen - DEPRECATED" + @echo " wipe-doxygen - DEPRECATED" @echo " checkfeaturelist - check FEATURE.yaml according to schema" @echo " featurelist - dump feature list in markdown" @echo " json-api-files - (re)-generate json api files" @@ -230,7 +256,6 @@ help: @echo " startup.conf file is present" @echo " GDB= - gdb binary to use for debugging" @echo " PLATFORM= - target platform. default is vpp" - @echo " TEST= - apply filter to test set, see test-help" @echo " DPDK_CONFIG= - add specified dpdk config commands to" @echo " autogenerated startup.conf" @echo " (e.g. \"no-pci\" )" @@ -293,9 +318,9 @@ ifeq ($(OS_ID),rhel) else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8) @sudo -E dnf install $(CONFIRM) dnf-plugins-core epel-release @sudo -E dnf config-manager --set-enabled \ - $(shell dnf repolist all 2>/dev/null|grep -i powertools|cut -d' ' -f1) + $(shell dnf repolist all 2>/dev/null|grep -i powertools|cut -d' ' -f1|grep -v source) @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) - @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS) + @sudo -E dnf install --skip-broken $(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) @@ -306,8 +331,11 @@ else ifeq ($(OS_ID),fedora) @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS) @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib endif +else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID)) + @sudo -E zypper refresh + @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) else - $(error "This option currently works only on Ubuntu, Debian, RHEL, or CentOS systems") + $(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS or openSUSE-leap systems") endif git config commit.template .git_commit_template.txt @@ -361,7 +389,7 @@ wipedist: .PHONY: wipe wipe: wipedist test-wipe $(BR)/.deps.ok $(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS))) - @find . -type f -name "*.api.json" ! -path "./test/*" -exec rm {} \; + @find . -type f -name "*.api.json" ! -path "./src/*" -exec rm {} \; .PHONY: rebuild rebuild: wipe build @@ -377,50 +405,45 @@ wipe-release: test-wipe $(BR)/.deps.ok .PHONY: rebuild-release 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,) + $(if $(filter-out $(2),retest),make -C $(BR) PLATFORM=vpp TAG=$(1) vpp-install,) $(eval libs:=lib lib64) make -C 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),) \ + VPP_BUILD_DIR=$(BR)/build-$(1)-native/vpp \ + VPP_BIN=$(BR)/install-$(1)-native/vpp/bin/vpp \ + VPP_INSTALL_PATH=$(BR)/install-$(1)-native/ \ EXTENDED_TESTS=$(EXTENDED_TESTS) \ PYTHON=$(PYTHON) \ OS_ID=$(OS_ID) \ RND_SEED=$(RND_SEED) \ CACHE_OUTPUT=$(CACHE_OUTPUT) \ - $(3) + TAG=$(1) \ + $(2) endef .PHONY: test test: - $(call test,vpp,vpp,test) + $(call test,vpp,test) .PHONY: test-debug test-debug: - $(call test,vpp,vpp_debug,test) + $(call test,vpp_debug,test) .PHONY: test-gcov test-gcov: - $(call test,vpp,vpp_gcov,test) + $(call test,vpp_gcov,test) .PHONY: test-all test-all: - $(eval EXTENDED_TESTS=yes) - $(call test,vpp,vpp,test) + $(eval EXTENDED_TESTS=1) + $(call test,vpp,test) .PHONY: test-all-debug test-all-debug: - $(eval EXTENDED_TESTS=yes) - $(call test,vpp,vpp_debug,test) + $(eval EXTENDED_TESTS=1) + $(call test,vpp_debug,test) .PHONY: papi-wipe papi-wipe: test-wipe-papi @@ -440,15 +463,15 @@ test-wipe: .PHONY: test-shell test-shell: - $(call test,vpp,vpp,shell) + $(call test,vpp,shell) .PHONY: test-shell-debug test-shell-debug: - $(call test,vpp,vpp_debug,shell) + $(call test,vpp_debug,shell) .PHONY: test-shell-gcov test-shell-gcov: - $(call test,vpp,vpp_gcov,shell) + $(call test,vpp_gcov,shell) .PHONY: test-dep test-dep: @@ -456,16 +479,18 @@ test-dep: .PHONY: test-doc test-doc: - @make -C test doc + @echo "make test-doc is DEPRECATED: use 'make docs'" + sleep 300 .PHONY: test-wipe-doc test-wipe-doc: - @make -C test wipe-doc + @echo "make test-wipe-doc is DEPRECATED" + sleep 300 .PHONY: test-cov test-cov: - $(eval EXTENDED_TESTS=yes) - $(call test,vpp,vpp_gcov,cov) + $(eval EXTENDED_TESTS=1) + $(call test,vpp_gcov,cov) .PHONY: test-wipe-cov test-wipe-cov: @@ -489,29 +514,29 @@ test-refresh-deps: .PHONY: retest retest: - $(call test,vpp,vpp,retest) + $(call test,vpp,retest) .PHONY: retest-debug retest-debug: - $(call test,vpp,vpp_debug,retest) + $(call test,vpp_debug,retest) .PHONY: retest-all retest-all: - $(eval EXTENDED_TESTS=yes) - $(call test,vpp,vpp,retest) + $(eval EXTENDED_TESTS=1) + $(call test,vpp,retest) .PHONY: retest-all-debug retest-all-debug: - $(eval EXTENDED_TESTS=yes) - $(call test,vpp,vpp_debug,retest) + $(eval EXTENDED_TESTS=1) + $(call test,vpp_debug,retest) .PHONY: test-start-vpp-in-gdb test-start-vpp-in-gdb: - $(call test,vpp,vpp,start-gdb) + $(call test,vpp,start-gdb) .PHONY: test-start-vpp-debug-in-gdb test-start-vpp-debug-in-gdb: - $(call test,vpp,vpp_debug,start-gdb) + $(call test,vpp_debug,start-gdb) ifeq ("$(wildcard $(STARTUP_CONF))","") define run @@ -608,7 +633,7 @@ json-api-files-debug: .PHONY: go-api-files go-api-files: json-api-files - $(WS_ROOT)/src/tools/vppapigen/generate_go.py + $(WS_ROOT)/src/tools/vppapigen/generate_go.py $(ARGS) .PHONY: ctags ctags: ctags.files @@ -672,42 +697,28 @@ checkfeaturelist: centos-pyyaml # Build the documentation # -# Doxygen configuration and our utility scripts -export DOXY_DIR ?= $(WS_ROOT)/doxygen - -define make-doxy - @OS_ID="$(OS_ID)" make -C $(DOXY_DIR) $@ -endef - .PHONY: bootstrap-doxygen bootstrap-doxygen: - $(call make-doxy) + @echo "make bootstrap-doxygen is DEPRECATED" + sleep 300 .PHONY: doxygen -doxygen: bootstrap-doxygen - $(call make-doxy) +doxygen: docs + @echo "make doxygen is DEPRECATED: use 'make docs'" + sleep 300 .PHONY: wipe-doxygen wipe-doxygen: - $(call make-doxy) + @echo "make wipe-doxygen is DEPRECATED" + sleep 300 -# Sphinx Documents -export DOCS_DIR = $(WS_ROOT)/docs -export VENV_DIR = $(WS_ROOT)/sphinx_venv -export SPHINX_SCRIPTS_DIR = $(WS_ROOT)/docs/scripts - -.PHONY: docs-venv -docs-venv: - @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh venv) +.PHONY: docs-% +docs-%: + @make -C $(WS_ROOT)/docs $* .PHONY: docs -docs: $(DOCS_DIR) - @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh html) - -.PHONY: docs-clean -docs-clean: - @rm -rf $(DOCS_DIR)/_build - @rm -rf $(VENV_DIR) +docs: + @make -C $(WS_ROOT)/docs docs .PHONY: pkg-verify pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps @@ -720,7 +731,7 @@ pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps $(call banner,"Building $(PKG) packages") @make pkg-$(PKG) -MAKE_VERIFY_GATE_OS ?= ubuntu-18.04 +MAKE_VERIFY_GATE_OS ?= ubuntu-20.04 .PHONY: verify verify: pkg-verify ifeq ($(OS_ID)-$(OS_VERSION_ID),$(MAKE_VERIFY_GATE_OS))