perfmon: fix coverity warning

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 3d44df1..dc81830 100644 (file)
--- 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:
@@ -76,22 +76,22 @@ DEB_DEPENDS += enchant  # for docs
 
 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
+       # 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
 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 += 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
@@ -452,7 +452,7 @@ test-dep:
 
 .PHONY: test-doc
 test-doc:
-       @echo "make test-doc is DEPRECATED: use 'make doc'"
+       @echo "make test-doc is DEPRECATED: use 'make docs'"
        sleep 300
 
 .PHONY: test-wipe-doc
@@ -704,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))