build: remove clang-format-10

- No longer used now that ubuntu-18.04 is deprecated.
- Change default to clang-format-11 in checkstyle.sh

Type: make

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I202244563738417bf4ae5b22fc8e2804bff2d25f

diff --git a/Makefile b/Makefile
index 4ac4c9a..37dbf59 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -84,15 +84,11 @@ ifeq ($(OS_VERSION_ID),20.04)
        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
+       DEB_DEPENDS += clang-11 clang-format-11
        LIBFFI=libffi7
        DEB_DEPENDS += enchant-2  # for docs
 else ifeq ($(OS_VERSION_ID),20.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
+       DEB_DEPENDS += clang-11 clang-format-11
        LIBFFI=libffi8ubuntu1
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10)
        DEB_DEPENDS += virtualenv
@@ -101,9 +97,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-11)
        DEB_DEPENDS += clang-11 clang-format-11
        LIBFFI=libffi7
 else
-       # 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
+       DEB_DEPENDS += clang-11 clang-format-11
        LIBFFI=libffi7
        DEB_DEPENDS += enchant-2  # for docs
 endif

diff --git a/extras/scripts/checkstyle.sh b/extras/scripts/checkstyle.sh
index f26dc23..053342f 100755 (executable)
--- a/extras/scripts/checkstyle.sh
+++ b/extras/scripts/checkstyle.sh
@@ -20,7 +20,7 @@ CLANG_FORMAT_DIFF="/usr/share/clang/clang-format-diff.py"
 
 # TODO: Remove clang-format-${CLANG_FORMAT_VER} from 'make install-deps' when
 #       CLANG_FORMAT_VER default value is upgraded
-CLANG_FORMAT_VER=${CLANG_FORMAT_VER:-10}
+CLANG_FORMAT_VER=${CLANG_FORMAT_VER:-11}
 GIT_DIFF_ARGS="-U0 --no-color --relative HEAD~1"
 CLANG_FORMAT_DIFF_ARGS="-style file -p1"
 SUFFIX="-${CLANG_FORMAT_VER}"