nat: nat44-ed add session timing out indicator in api

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index f112c2e..5c16b9a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ endif
 # +libganglia1-dev if building the gmond plugin
 
 DEB_DEPENDS  = curl build-essential autoconf automake ccache
-DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd dh-python
+DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-python
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf libnuma-dev
 DEB_DEPENDS += python3-all python3-setuptools check
@@ -93,6 +93,7 @@ else ifeq ($(OS_VERSION_ID),20.10)
         DEB_DEPENDS += clang-format-10
         LIBFFI=libffi8ubuntu1
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10)
+       DEB_DEPENDS += python3-virtualenv virtualenv
        DEB_DEPENDS += libssl-dev
        DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
 else
@@ -130,7 +131,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
        RPM_DEPENDS += compat-openssl10 openssl-devel
        RPM_DEPENDS += python2-devel python36-devel python3-ply
        RPM_DEPENDS += python3-virtualenv python3-jsonschema
-       RPM_DEPENDS += cmake
+       RPM_DEPENDS += libarchive cmake
        RPM_DEPENDS_GROUPS = 'Development Tools'
 else
        RPM_DEPENDS += yum-utils
@@ -205,6 +206,7 @@ help:
        @echo " checkstyle           - check coding style"
        @echo " checkstyle-commit    - check commit message format"
        @echo " checkstyle-test      - check test framework coding style"
+       @echo " checkstyle-test-diff - check test framework coding style (only changed files)"
        @echo " checkstyle-api       - check api for incompatible changes"
        @echo " fixstyle             - fix coding style"
        @echo " doxygen              - (re)generate documentation"
@@ -214,6 +216,7 @@ help:
        @echo " featurelist          - dump feature list in markdown"
        @echo " json-api-files       - (re)-generate json api files"
        @echo " json-api-files-debug - (re)-generate json api files for debug target"
+       @echo " go-api-files         - (re)-generate golang api files"
        @echo " docs                 - Build the Sphinx documentation"
        @echo " docs-venv            - Build the virtual environment for the Sphinx docs"
        @echo " docs-clean           - Remove the generated files from the Sphinx docs"
@@ -292,7 +295,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
        @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)
+       @sudo -E dnf install --skip-broken $(CONFIRM) $(RPM_DEPENDS)
 else ifeq ($(OS_ID),centos)
        @sudo -E yum install $(CONFIRM) centos-release-scl-rh epel-release
        @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
@@ -333,7 +336,7 @@ dist:
              --format=tar \
              -o $(DIST_FILE) \
            HEAD ; \
-           git describe > $(BR)/.version ; \
+           git describe --long > $(BR)/.version ; \
        else \
            (cd .. ; tar -cf $(DIST_FILE) $(DIST_SUBDIR) --exclude=*.tar) ; \
            src/scripts/version > $(BR)/.version ; \
@@ -358,7 +361,7 @@ wipedist:
 .PHONY: wipe
 wipe: wipedist test-wipe $(BR)/.deps.ok
        $(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS)))
-       @find . -type f -name "*.api.json" ! -path "./test/*" -exec rm {} \;
+       @find . -type f -name "*.api.json" ! -path "./src/*" -exec rm {} \;
 
 .PHONY: rebuild
 rebuild: wipe build
@@ -476,6 +479,10 @@ test-wipe-all:
 test-checkstyle:
        @make -C test checkstyle
 
+.PHONY: test-checkstyle-diff
+test-checkstyle-diff:
+       @make -C test checkstyle-diff
+
 .PHONY: test-refresh-deps
 test-refresh-deps:
        @make -C test refresh-deps
@@ -498,6 +505,14 @@ retest-all-debug:
        $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp_debug,retest)
 
+.PHONY: test-start-vpp-in-gdb
+test-start-vpp-in-gdb:
+       $(call test,vpp,vpp,start-gdb)
+
+.PHONY: test-start-vpp-debug-in-gdb
+test-start-vpp-debug-in-gdb:
+       $(call test,vpp,vpp_debug,start-gdb)
+
 ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
        @echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
@@ -513,9 +528,7 @@ endef
 endif
 
 %.files: .FORCE
-       @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*' \) > $@
+       @find src -name '*.[chS]' > $@
 
 .FORCE:
 
@@ -534,6 +547,7 @@ debug:
 .PHONY: build-coverity
 build-coverity:
        $(call make,$(PLATFORM)_coverity,install-packages)
+       @make -C build-root PLATFORM=vpp TAG=vpp_coverity libmemif-install
 
 .PHONY: debug-release
 debug-release:
@@ -577,11 +591,6 @@ pkg-rpm: dist
 pkg-srpm: dist
        make -C extras/rpm srpm
 
-.PHONY: dpdk-install-dev
-dpdk-install-dev:
-       $(call banner,"This command is deprecated. Please use 'make install-ext-deps'")
-       make -C build/external install-$(PKG)
-
 .PHONY: install-ext-deps
 install-ext-deps:
        make -C build/external install-$(PKG)
@@ -597,6 +606,10 @@ json-api-files:
 json-api-files-debug:
        $(WS_ROOT)/src/tools/vppapigen/generate_json.py --debug-target
 
+.PHONY: go-api-files
+go-api-files: json-api-files
+       $(WS_ROOT)/src/tools/vppapigen/generate_go.py
+
 .PHONY: ctags
 ctags: ctags.files
        @ctags --totals --tag-relative=yes -L $<
@@ -614,13 +627,10 @@ cscope: cscope.files
 compdb:
        @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
+         src/scripts/compdb_cleanup.py > compile_commands.json
 
 .PHONY: checkstyle
 checkstyle: checkfeaturelist
-ifeq ($(shell which clang-format-10),)
-       @sudo apt-get install -y clang-format-10
-endif
        @extras/scripts/checkstyle.sh
 
 .PHONY: checkstyle-commit
@@ -639,7 +649,7 @@ fixstyle:
 
 .PHONY: checkstyle-api
 checkstyle-api:
-       @extras/scripts/crcchecker.py --check-patch
+       @extras/scripts/crcchecker.py --check-patchset
 
 # necessary because Bug 1696324 - Update to python3.6 breaks PyYAML dependencies
 # Status:      CLOSED CANTFIX
@@ -652,11 +662,11 @@ endif
 
 .PHONY: featurelist
 featurelist: centos-pyyaml
-       @build-root/scripts/fts.py --all --markdown
+       @extras/scripts/fts.py --all --markdown
 
 .PHONY: checkfeaturelist
 checkfeaturelist: centos-pyyaml
-       @build-root/scripts/fts.py --validate --all
+       @extras/scripts/fts.py --validate --all
 
 #
 # Build the documentation