L2-fib-dump: send 1 or 0 rather than flag value

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index f271811..e99cafd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,7 @@ 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 python-dev python-virtualenv python-pip libffi6 check
 DEB_DEPENDS += libboost-all-dev libffi-dev python-ply libmbedtls-dev
+DEB_DEPENDS += cmake ninja-build
 ifeq ($(OS_VERSION_ID),14.04)
        DEB_DEPENDS += openjdk-8-jdk-headless
        DEB_DEPENDS += libssl-dev
@@ -87,6 +88,7 @@ RPM_DEPENDS += numactl-devel
 RPM_DEPENDS += check check-devel
 RPM_DEPENDS += boost boost-devel
 RPM_DEPENDS += selinux-policy selinux-policy-devel
+RPM_DEPENDS += cmake3 ninja-build
 
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
        RPM_DEPENDS += subunit subunit-devel
@@ -106,6 +108,7 @@ else
        RPM_DEPENDS += openssl-devel
        RPM_DEPENDS += python-devel python-ply
        RPM_DEPENDS += python-virtualenv
+       RPM_DEPENDS += devtoolset-7
        RPM_DEPENDS_GROUPS = 'Development Tools'
 endif
 
@@ -116,7 +119,7 @@ RPM_DEPENDS += chrpath libffi-devel rpm-build
 SUSE_NAME= $(shell grep '^NAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2)
 SUSE_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2)
 RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath
-RPM_SUSE_BUILDTOOLS_DEPS += clang indent libtool make python-ply
+RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python-ply
 
 RPM_SUSE_DEVEL_DEPS = glibc-devel-static java-1_8_0-openjdk-devel libnuma-devel
 RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel
@@ -284,14 +287,18 @@ endif
        @sudo -E apt-get $(APT_ARGS) $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
        @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
+       @sudo -E yum install $(CONFIRM) centos-release-scl-rh
        @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
        @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
-else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
+else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID))
        @sudo -E zypper refresh
        @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
 else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID))
        @sudo -E zypper refresh
        @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
+else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
+       @sudo -E zypper refresh
+       @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
 else
        $(error "This option currently works only on Ubuntu, Debian, Centos or openSUSE systems")
 endif
@@ -540,6 +547,7 @@ verify: install-dep $(BR)/.deps.ok dpdk-install-dev
        $(call banner,"Building $(PKG) packages")
        @make pkg-$(PKG)
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
+       $(call banner,"Running tests")
        @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test
 endif