diff options
| -rw-r--r-- | Makefile | 16 | ||||
| -rwxr-xr-x | extras/scripts/checkstyle.sh | 2 |
2 files changed, 12 insertions, 6 deletions
@@ -84,14 +84,18 @@ 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-11 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-11 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 diff --git a/extras/scripts/checkstyle.sh b/extras/scripts/checkstyle.sh index f8a83f3ec9d..4dcf77874d3 100755 --- a/extras/scripts/checkstyle.sh +++ b/extras/scripts/checkstyle.sh @@ -18,6 +18,8 @@ set -eEo pipefail CLANG_FORMAT_VER_REGEX='([0-9]+)\.[0-9]+\.[0-9]+' 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} GIT_DIFF_ARGS="-U0 --no-color --relative HEAD~1" CLANG_FORMAT_DIFF_ARGS="-style file -p1" |