X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=0f0af4af0082121428b384223fd7a6f0e2d4affa;hb=91f102ed8;hp=cac1ed770d9b019506934de7ab30c3125d8ad887;hpb=3f0ae664faf33578515ffa1fd5287ad692f16c6f;p=vpp.git diff --git a/Makefile b/Makefile index cac1ed770d9..0f0af4af008 100644 --- a/Makefile +++ b/Makefile @@ -14,12 +14,13 @@ export WS_ROOT=$(CURDIR) export BR=$(WS_ROOT)/build-root CCACHE_DIR?=$(BR)/.ccache +SHELL:=/bin/bash GDB?=gdb PLATFORM?=vpp SAMPLE_PLUGIN?=no STARTUP_DIR?=$(PWD) MACHINE=$(shell uname -m) -SUDO?=sudo +SUDO?=sudo -E DPDK_CONFIG?=no-pci ,:=, @@ -55,46 +56,50 @@ endif ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) PKG=deb -else ifeq ($(filter rhel centos fedora opensuse opensuse-leap opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) +else ifeq ($(filter rhel centos fedora,$(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 +DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd dh-python DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config -DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev +DEB_DEPENDS += lcov chrpath autoconf libnuma-dev DEB_DEPENDS += python3-all python3-setuptools check -DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev +DEB_DEPENDS += libffi-dev python3-ply libmbedtls-dev 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 -LIBFFI=libffi6 # works on all but 20.04 +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 + DEB_DEPENDS += clang-9 clang-format-10 else 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 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_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 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) else DEB_DEPENDS += libssl-dev + DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) + LIBFFI=libffi7 endif DEB_DEPENDS += $(LIBFFI) @@ -103,13 +108,14 @@ RPM_DEPENDS = redhat-lsb glibc-static RPM_DEPENDS += apr-devel RPM_DEPENDS += numactl-devel RPM_DEPENDS += check check-devel -RPM_DEPENDS += boost boost-devel RPM_DEPENDS += selinux-policy selinux-policy-devel RPM_DEPENDS += ninja-build RPM_DEPENDS += libuuid-devel RPM_DEPENDS += mbedtls-devel RPM_DEPENDS += ccache RPM_DEPENDS += xmlto +RPM_DEPENDS += elfutils-libelf-devel +RPM_DEPENDS += libnl3-devel ifeq ($(OS_ID),fedora) RPM_DEPENDS += dnf-utils @@ -122,7 +128,7 @@ ifeq ($(OS_ID),fedora) 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 += compat-openssl10 openssl-devel RPM_DEPENDS += python2-devel python36-devel python3-ply RPM_DEPENDS += python3-virtualenv python3-jsonschema RPM_DEPENDS += cmake @@ -146,42 +152,6 @@ 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) -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 -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) -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 -ifeq ($(SUSE_ID),15.0) - RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel gcc - RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv -else - RPM_SUSE_DEVEL_DEPS += libboost_headers1_68_0-devel-1.68.0 gcc6 - RPM_SUSE_PYTHON_DEPS += python-virtualenv -endif -endif - -ifeq ($(OS_ID),opensuse-leap) -ifeq ($(SUSE_ID),15.0) - RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel 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 @@ -227,8 +197,6 @@ help: @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" @echo " install-ext-dep[s] - install external development dependencies" @echo " ctags - (re)generate ctags database" @@ -238,6 +206,7 @@ help: @echo " checkstyle - check coding style" @echo " checkstyle-commit - check commit message format" @echo " checkstyle-test - check test framework coding style" + @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" @@ -250,6 +219,7 @@ 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 " stats-fs-help - Help to build the stats segment file system" @echo "" @echo "Make Arguments:" @echo " V=[0|1] - set build verbosity level" @@ -312,13 +282,6 @@ bootstrap: .PHONY: install-dep install-dep: ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) -ifeq ($(OS_VERSION_ID),14.04) - @sudo -E apt-get $(CONFIRM) $(FORCE) install software-properties-common -endif -ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) - @grep -q jessie-backports /etc/apt/sources.list /etc/apt/sources.list.d/* 2> /dev/null \ - || ( echo "Please install jessie-backports" ; exit 1 ) -endif @sudo -E apt-get update @sudo -E apt-get $(APT_ARGS) $(CONFIRM) $(FORCE) install $(DEB_DEPENDS) else ifneq ("$(wildcard /etc/redhat-release)","") @@ -328,8 +291,9 @@ ifeq ($(OS_ID),rhel) @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 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) @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS) else ifeq ($(OS_ID),centos) @@ -342,17 +306,8 @@ 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-tumbleweed,$(OS_ID)),$(OS_ID)) - @sudo -E zypper refresh - @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) -else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID)) - @sudo -E zypper refresh - @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) -else ifeq ($(filter opensuse,$(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, CentOS or openSUSE systems") + $(error "This option currently works only on Ubuntu, Debian, RHEL, or CentOS systems") endif git config commit.template .git_commit_template.txt @@ -459,13 +414,11 @@ test-gcov: .PHONY: test-all test-all: - $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp vom-install,) $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp,test) .PHONY: test-all-debug test-all-debug: - $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install,) $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp_debug,test) @@ -511,7 +464,6 @@ test-wipe-doc: .PHONY: test-cov test-cov: - @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp_gcov,cov) @@ -527,6 +479,10 @@ test-wipe-all: test-checkstyle: @make -C test checkstyle +.PHONY: test-checkstyle-diff +test-checkstyle-diff: + @make -C test checkstyle-diff + .PHONY: test-refresh-deps test-refresh-deps: @make -C test refresh-deps @@ -549,6 +505,14 @@ retest-all-debug: $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp_debug,retest) +.PHONY: test-start-vpp-in-gdb +test-start-vpp-in-gdb: + $(call test,vpp,vpp,start-gdb) + +.PHONY: test-start-vpp-debug-in-gdb +test-start-vpp-debug-in-gdb: + $(call test,vpp,vpp_debug,start-gdb) + ifeq ("$(wildcard $(STARTUP_CONF))","") define run @echo "WARNING: STARTUP_CONF not defined or file doesn't exist." @@ -564,7 +528,7 @@ endef endif %.files: .FORCE - @find . \( -name '*\.[chyS]' -o -name '*\.java' -o -name '*\.lex' \) -and \ + @find . \( -name '*\.[chyS]' -o -name '*\.java' -o -name '*\.lex' -o -name '*\.py' \) -and \ \( -not -path './build-root*' -o -path \ './build-root/build-vpp_debug-native/dpdk*' \) > $@ @@ -585,6 +549,7 @@ debug: .PHONY: build-coverity build-coverity: $(call make,$(PLATFORM)_coverity,install-packages) + @make -C build-root PLATFORM=vpp TAG=vpp_coverity libmemif-install .PHONY: debug-release debug-release: @@ -616,18 +581,10 @@ snap-clean: snapcraft clean ; \ rm -f *.snap *.tgz -.PHONY: vom-pkg-deb -vom-pkg-deb: pkg-deb - $(call make,$(PLATFORM),vom-package-deb) - .PHONY: pkg-deb-debug pkg-deb-debug: $(call make,$(PLATFORM)_debug,vpp-package-deb) -.PHONY: vom-pkg-deb-debug -vom-pkg-deb-debug: pkg-deb-debug - $(call make,$(PLATFORM)_debug,vom-package-deb) - .PHONY: pkg-rpm pkg-rpm: dist make -C extras/rpm @@ -658,7 +615,7 @@ json-api-files-debug: .PHONY: ctags ctags: ctags.files - @ctags --totals --tag-relative -L $< + @ctags --totals --tag-relative=yes -L $< @rm $< .PHONY: gtags @@ -671,11 +628,13 @@ cscope: cscope.files .PHONY: compdb compdb: - @ninja -C build-root/build-vpp_debug-native/vpp -t compdb > compile_commands.json + @ninja -C build-root/build-vpp_debug-native/vpp build.ninja + @ninja -C build-root/build-vpp_debug-native/vpp -t compdb | \ + extras/scripts/compdb_cleanup.py > compile_commands.json .PHONY: checkstyle checkstyle: checkfeaturelist - @build-root/scripts/checkstyle.sh + @extras/scripts/checkstyle.sh .PHONY: checkstyle-commit checkstyle-commit: @@ -689,20 +648,17 @@ checkstyle-all: checkstyle-commit checkstyle checkstyle-test .PHONY: fixstyle fixstyle: - @build-root/scripts/checkstyle.sh --fix + @extras/scripts/checkstyle.sh --fix .PHONY: checkstyle-api checkstyle-api: - @extras/scripts/crcchecker.py --check-patch + @extras/scripts/crcchecker.py --check-patchset # necessary because Bug 1696324 - Update to python3.6 breaks PyYAML dependencies # Status: CLOSED CANTFIX # https://bugzilla.redhat.com/show_bug.cgi?id=1696324 .PHONY: centos-pyyaml centos-pyyaml: -ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-7) - @python3 -m pip install pyyaml -endif ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8) @sudo -E yum install $(CONFIRM) python3-pyyaml endif @@ -715,6 +671,33 @@ featurelist: centos-pyyaml checkfeaturelist: centos-pyyaml @build-root/scripts/fts.py --validate --all + +# Build vpp_stats_fs + +.PHONY: stats-fs-install +stats-fs-install: + @extras/vpp_stats_fs/install.sh install + +.PHONY: stats-fs-start +stats-fs-start: + @extras/vpp_stats_fs/install.sh start + +.PHONY: stats-fs-cleanup +stats-fs-cleanup: + @extras/vpp_stats_fs/install.sh cleanup + +.PHONY: stats-fs-help +stats-fs-help: + @extras/vpp_stats_fs/install.sh help + +.PHONY: stats-fs-force-unmount +stats-fs-force-unmount: + @extras/vpp_stats_fs/install.sh unmount + +.PHONY: stats-fs-stop +stats-fs-stop: + @extras/vpp_stats_fs/install.sh stop + # # Build the documentation # @@ -764,14 +747,8 @@ pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps @make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install $(call banner,"Building libmemif") @make -C build-root PLATFORM=vpp TAG=vpp libmemif-install - $(call banner,"Building VOM") - @make -C build-root PLATFORM=vpp TAG=vpp vom-install $(call banner,"Building $(PKG) packages") @make pkg-$(PKG) -ifeq ($(OS_ID),ubuntu) - $(call banner,"Building VOM $(PKG) package") - @make vom-pkg-deb -endif MAKE_VERIFY_GATE_OS ?= ubuntu-18.04 .PHONY: verify