vlib: fix coverity 277203

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 8eb1d54..96db600 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ DEB_DEPENDS += python3-all python3-setuptools check
 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 += python3-dev python3-pip
 DEB_DEPENDS += libnl-3-dev libnl-route-3-dev libmnl-dev
 # DEB_DEPENDS += enchant  # for docs
 DEB_DEPENDS += python3-virtualenv
@@ -81,21 +81,28 @@ DEB_DEPENDS += nasm
 
 LIBFFI=libffi6 # works on all but 20.04 and debian-testing
 
-ifeq ($(OS_VERSION_ID),20.04)
+ifeq ($(OS_VERSION_ID),22.04)
        DEB_DEPENDS += python3-virtualenv
        DEB_DEPENDS += libssl-dev
        DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
-       DEB_DEPENDS += clang-11 clang-format-11
+       DEB_DEPENDS += clang clang-format-11
+       LIBFFI=libffi7
+       DEB_DEPENDS += enchant-2  # for docs
+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 clang-format-11
        LIBFFI=libffi7
        DEB_DEPENDS += enchant-2  # for docs
 else ifeq ($(OS_VERSION_ID),20.10)
-       DEB_DEPENDS += clang-11 clang-format-11
+       DEB_DEPENDS += clang clang-format-11
        LIBFFI=libffi8ubuntu1
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10)
        DEB_DEPENDS += virtualenv
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-11)
        DEB_DEPENDS += virtualenv
-       DEB_DEPENDS += clang-11 clang-format-11
+       DEB_DEPENDS += clang clang-format-11
        LIBFFI=libffi7
 else
        DEB_DEPENDS += clang-11 clang-format-11
@@ -112,7 +119,6 @@ RPM_DEPENDS += check check-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
@@ -159,7 +165,7 @@ 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 nasm
-RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel libuuid-devel
+RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-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
@@ -187,7 +193,7 @@ endif
 
 ifeq ($(findstring y,$(UNATTENDED)),y)
 CONFIRM=-y
-FORCE=--force-yes
+FORCE=--allow-downgrades --allow-remove-essential --allow-change-held-packages
 endif
 
 TARGETS = vpp
@@ -233,10 +239,10 @@ help:
        @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-test-diff - check test framework coding style (only changed files)"
+       @echo " checkstyle-python    - check python coding style using 'black' formatter"
        @echo " checkstyle-api       - check api for incompatible changes"
        @echo " fixstyle             - fix coding style"
+       @echo " fixstyle-python      - fix python coding style using 'black' formatter"
        @echo " doxygen              - DEPRECATED - use 'make docs'"
        @echo " bootstrap-doxygen    - DEPRECATED"
        @echo " wipe-doxygen         - DEPRECATED"
@@ -248,6 +254,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 " docs-rebuild         - Rebuild all of the Sphinx documentation"
        @echo ""
        @echo "Make Arguments:"
        @echo " V=[0|1]                  - set build verbosity level"
@@ -316,7 +323,7 @@ ifeq ($(OS_ID),rhel)
        @sudo -E yum-config-manager --enable rhel-server-rhscl-7-rpms
        @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 debuginfo-install $(CONFIRM) glibc openssl-libs zlib
 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 \
@@ -331,7 +338,7 @@ else ifeq ($(OS_ID),centos)
 else ifeq ($(OS_ID),fedora)
        @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
        @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS)
-       @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
+       @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
 endif
 else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID))
        @sudo -E zypper refresh
@@ -502,13 +509,17 @@ test-wipe-cov:
 test-wipe-all:
        @make -C test wipe-all
 
+# Note: All python venv consolidated in test/Makefile, test/requirements*.txt
 .PHONY: test-checkstyle
 test-checkstyle:
-       @make -C test checkstyle
+       $(warning test-checkstyle is deprecated. Running checkstyle-python.")
+       @make -C test checkstyle-python-all
 
+# Note: All python venv consolidated in test/Makefile, test/requirements*.txt
 .PHONY: test-checkstyle-diff
 test-checkstyle-diff:
-       @make -C test checkstyle-diff
+       $(warning test-checkstyle-diff is deprecated. Running checkstyle-python.")
+       @make -C test checkstyle-python-all
 
 .PHONY: test-refresh-deps
 test-refresh-deps:
@@ -665,15 +676,27 @@ checkstyle-commit:
        @extras/scripts/check_commit_msg.sh
 
 .PHONY: checkstyle-test
-checkstyle-test: test-checkstyle
+checkstyle-test:
+       $(warning test-checkstyle is deprecated. Running checkstyle-python.")
+       @make -C test checkstyle-python-all
+
+# Note: All python venv consolidated in test/Makefile, test/requirements*.txt
+.PHONY: checkstyle-python
+checkstyle-python:
+       @make -C test checkstyle-python-all
 
 .PHONY: checkstyle-all
-checkstyle-all: checkstyle-commit checkstyle checkstyle-test
+checkstyle-all: checkstyle-commit checkstyle checkstyle-python docs-spell
 
 .PHONY: fixstyle
 fixstyle:
        @extras/scripts/checkstyle.sh --fix
 
+# Note: All python venv consolidated in test/Makefile, test/requirements*.txt
+.PHONY: fixstyle-python
+fixstyle-python:
+       @make -C test fixstyle-python-all
+
 .PHONY: checkstyle-api
 checkstyle-api:
        @extras/scripts/crcchecker.py --check-patchset