ip: Router ID included in flow hash

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 44cddc1..1ae1684 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,12 +14,13 @@
 export WS_ROOT=$(CURDIR)
 export BR=$(WS_ROOT)/build-root
 CCACHE_DIR?=$(BR)/.ccache
+SHELL:=/bin/bash
 GDB?=gdb
 PLATFORM?=vpp
 SAMPLE_PLUGIN?=no
 STARTUP_DIR?=$(PWD)
 MACHINE=$(shell uname -m)
-SUDO?=sudo
+SUDO?=sudo -E
 DPDK_CONFIG?=no-pci
 
 ,:=,
@@ -64,7 +65,7 @@ endif
 DEB_DEPENDS  = curl build-essential autoconf automake ccache
 DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd dh-python
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev
+DEB_DEPENDS += lcov chrpath autoconf libnuma-dev
 DEB_DEPENDS += python3-all python3-setuptools check
 DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
 DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml
@@ -77,16 +78,19 @@ 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
+       DEB_DEPENDS += clang-9 clang-format-10
 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-format-10
        LIBFFI=libffi7
-else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
-       DEB_DEPENDS += libssl1.0-dev
-       DEB_DEPENDS += python-all python-pip
-       DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
+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
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10)
        DEB_DEPENDS += libssl-dev
        DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
@@ -122,7 +126,7 @@ ifeq ($(OS_ID),fedora)
        RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
        RPM_DEPENDS += yum-utils
-       RPM_DEPENDS += compat-openssl10
+       RPM_DEPENDS += compat-openssl10 openssl-devel
        RPM_DEPENDS += python2-devel python36-devel python3-ply
        RPM_DEPENDS += python3-virtualenv python3-jsonschema
        RPM_DEPENDS += cmake
@@ -284,7 +288,8 @@ ifeq ($(OS_ID),rhel)
        @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
        @sudo -E dnf install $(CONFIRM) dnf-plugins-core epel-release
-       @sudo -E dnf config-manager --set-enabled PowerTools
+       @sudo -E dnf config-manager --set-enabled \
+          $(shell dnf repolist all 2>/dev/null|grep -i powertools|cut -d' ' -f1)
        @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
        @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS)
 else ifeq ($(OS_ID),centos)
@@ -507,7 +512,7 @@ endef
 endif
 
 %.files: .FORCE
-       @find . \( -name '*\.[chyS]' -o -name '*\.java' -o -name '*\.lex' \) -and \
+       @find . \( -name '*\.[chyS]' -o -name '*\.java' -o -name '*\.lex' -o -name '*\.py' \) -and \
                \( -not -path './build-root*' -o -path \
                './build-root/build-vpp_debug-native/dpdk*' \) > $@
 
@@ -593,7 +598,7 @@ json-api-files-debug:
 
 .PHONY: ctags
 ctags: ctags.files
-       @ctags --totals --tag-relative -L $<
+       @ctags --totals --tag-relative=yes -L $<
        @rm $<
 
 .PHONY: gtags
@@ -606,11 +611,16 @@ cscope: cscope.files
 
 .PHONY: compdb
 compdb:
-       @ninja -C build-root/build-vpp_debug-native/vpp -t compdb > compile_commands.json
+       @ninja -C build-root/build-vpp_debug-native/vpp build.ninja
+       @ninja -C build-root/build-vpp_debug-native/vpp -t compdb | \
+         extras/scripts/compdb_cleanup.py > compile_commands.json
 
 .PHONY: checkstyle
 checkstyle: checkfeaturelist
-       @build-root/scripts/checkstyle.sh
+ifeq ($(shell which clang-format-10),)
+       @sudo apt-get install -y clang-format-10
+endif
+       @extras/scripts/checkstyle.sh
 
 .PHONY: checkstyle-commit
 checkstyle-commit:
@@ -624,7 +634,7 @@ checkstyle-all: checkstyle-commit checkstyle checkstyle-test
 
 .PHONY: fixstyle
 fixstyle:
-       @build-root/scripts/checkstyle.sh --fix
+       @extras/scripts/checkstyle.sh --fix
 
 .PHONY: checkstyle-api
 checkstyle-api:
@@ -635,9 +645,6 @@ checkstyle-api:
 # https://bugzilla.redhat.com/show_bug.cgi?id=1696324
 .PHONY: centos-pyyaml
 centos-pyyaml:
-ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-7)
-       @python3 -m pip install pyyaml
-endif
 ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
        @sudo -E yum install $(CONFIRM) python3-pyyaml
 endif