map: fix translation of icmp4 error messages

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index e580a31..545ccdb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,15 +65,19 @@ DEB_DEPENDS  = curl build-essential autoconf automake ccache
 DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev
-DEB_DEPENDS += python-all python3-all python3-setuptools python-dev
+DEB_DEPENDS += python-all python3-all python3-setuptools
 DEB_DEPENDS += python-virtualenv python-pip libffi6 check
 DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
-DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml yamllint
+DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml
 DEB_DEPENDS += python3-venv  # ensurepip
 DEB_DEPENDS += python3-dev   # needed for python3 -m pip install psutil
 # python3.6 on 16.04 requires python36-dev
  
-ifeq ($(OS_VERSION_ID),14.04)
+ifeq ($(OS_VERSION_ID),16.04)
+       DEB_DEPENDS += python-dev
+       DEB_DEPENDS += libssl-dev
+else ifeq ($(OS_VERSION_ID),18.04)
+       DEB_DEPENDS += python-dev
        DEB_DEPENDS += libssl-dev
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
        DEB_DEPENDS += libssl-dev
@@ -93,21 +97,20 @@ RPM_DEPENDS += selinux-policy selinux-policy-devel
 RPM_DEPENDS += ninja-build
 RPM_DEPENDS += libuuid-devel
 RPM_DEPENDS += mbedtls-devel
-RPM_DEPENDS += yamllint
-RPM_DEPENDS += python3-devel  # needed for python3 -m pip install psutil
 
 ifeq ($(OS_ID),fedora)
        RPM_DEPENDS += dnf-utils
        RPM_DEPENDS += subunit subunit-devel
        RPM_DEPENDS += compat-openssl10-devel
+       RPM_DEPENDS += python3-devel  # needed for python3 -m pip install psutil
        RPM_DEPENDS += python3-ply  # for vppapigen
        RPM_DEPENDS += python3-virtualenv python3-jsonschema
        RPM_DEPENDS += cmake
        RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
-       RPM_DEPENDS += dnf-utils
+       RPM_DEPENDS += yum-utils
        RPM_DEPENDS += compat-openssl10
-       RPM_DEPENDS += python3-devel python3-ply
+       RPM_DEPENDS += python36-devel python3-ply
        RPM_DEPENDS += python3-virtualenv python3-jsonschema
        RPM_DEPENDS += cmake
        RPM_DEPENDS_GROUPS = 'Development Tools'
@@ -629,9 +632,8 @@ cscope: cscope.files
        @cscope -b -q -v
 
 .PHONY: checkstyle
-checkstyle:
+checkstyle: checkfeaturelist
        @build-root/scripts/checkstyle.sh
-       yamllint $(WS_ROOT)/src
 
 .PHONY: checkstyle-commit
 checkstyle-commit:
@@ -665,7 +667,7 @@ featurelist: centos-pyyaml
 
 .PHONY: checkfeaturelist
 checkfeaturelist: centos-pyyaml
-       @build-root/scripts/fts.py --validate --git-status
+       @build-root/scripts/fts.py --validate --all
 
 #
 # Build the documentation