X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=78300e2dfe6e7ce48546e1d137458da16b1fa01f;hb=ffe9a5489499467dfb5a2ee0fed14e397f5f825c;hp=7ecc2c69ed19cdd2353d5b2559c2f630c925a98a;hpb=44db1caefbf5067b0cf0073299c9f21265331412;p=vpp.git diff --git a/Makefile b/Makefile index 7ecc2c69ed1..78300e2dfe6 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ 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 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 @@ -93,6 +93,7 @@ else ifeq ($(OS_VERSION_ID),20.10) 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 @@ -107,7 +108,6 @@ 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 @@ -206,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" @@ -218,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" @@ -477,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 @@ -535,6 +541,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: @@ -619,9 +626,6 @@ compdb: .PHONY: checkstyle checkstyle: checkfeaturelist -ifeq ($(shell which clang-format-10),) - @sudo apt-get install -y clang-format-10 -endif @extras/scripts/checkstyle.sh .PHONY: checkstyle-commit @@ -640,7 +644,7 @@ fixstyle: .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 @@ -659,6 +663,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 #