vlib: fix coverity warning

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 4bd4d6d..cc1c956 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -73,14 +73,13 @@ 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
 DEB_DEPENDS += enchant  # for docs
+DEB_DEPENDS += python3-virtualenv
+DEB_DEPENDS += libssl-dev
+DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
 
 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)
@@ -88,22 +87,20 @@ else ifeq ($(OS_VERSION_ID),20.04)
        #       when clang-format-10 is removed
        DEB_DEPENDS += clang-11 clang-format-11 clang-format-10
        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)
        # TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh
        #       when clang-format-10 is removed
        DEB_DEPENDS += clang-11 clang-format-11 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)
+       DEB_DEPENDS += virtualenv
 else
-       DEB_DEPENDS += libssl-dev
-       DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
+       # TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh
+       #       when clang-format-10 is removed
+       DEB_DEPENDS += clang-11 clang-format-11 clang-format-10
        LIBFFI=libffi7
+       DEB_DEPENDS += enchant-2  # for docs
 endif
 
 DEB_DEPENDS += $(LIBFFI)
@@ -120,7 +117,6 @@ RPM_DEPENDS += ccache
 RPM_DEPENDS += xmlto
 RPM_DEPENDS += elfutils-libelf-devel
 RPM_DEPENDS += libnl3-devel
-RPM_DEPENDS += enchant # for docs
 
 ifeq ($(OS_ID),fedora)
        RPM_DEPENDS += dnf-utils
@@ -708,7 +704,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))