summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile12
-rwxr-xr-xextras/scripts/checkstyle.sh2
2 files changed, 4 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 4ac4c9aa9c3..37dbf593564 100644
--- 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 f26dc234690..053342f8787 100755
--- 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}"