MAP: Use bool type in map.api instead of u8.

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 1a409f6..e0c710f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -198,7 +198,6 @@ help:
        @echo " test-debug          - build and run (basic) functional tests (debug build)"
        @echo " test-all            - build and run (all) functional tests"
        @echo " test-all-debug      - build and run (all) functional tests (debug build)"
-       @echo " test-ext            - build and run 'extras' functional tests"
        @echo " test-shell          - enter shell with test environment"
        @echo " test-shell-debug    - enter shell with test environment (debug build)"
        @echo " test-wipe           - wipe files generated by unit tests"
@@ -296,8 +295,12 @@ endif
        @sudo -E apt-get update
        @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)
+ifeq ($(OS_ID),rhel)
+       @sudo -E yum-config-manager --enable rhel-server-rhscl-7-rpms
+else ifeq ($(OS_ID),centos)
        @sudo -E yum install $(CONFIRM) centos-release-scl-rh
+endif
+       @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
        @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
        @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
 else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID))
@@ -310,7 +313,7 @@ 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")
+       $(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS or openSUSE systems")
 endif
 
 define make
@@ -395,15 +398,12 @@ test-debug:
        $(call test,vpp,vpp_debug,test)
 
 test-all:
-       $(eval EXTENDED_TESTS=yes)
-       $(call test,vpp,vpp,test)
-
-test-ext:
        $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,)
        $(eval EXTENDED_TESTS=yes)
-       $(call test,vpp,vpp_debug,test-ext)
+       $(call test,vpp,vpp,test)
 
 test-all-debug:
+       $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,)
        $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp_debug,test)
 
@@ -496,7 +496,7 @@ pkg-srpm: dist
        make -C extras/rpm srpm
 
 dpdk-install-dev:
-       $(call banner,"This command is deprecated. Please use 'make install-ext-libs'")
+       $(call banner,"This command is deprecated. Please use 'make install-ext-deps'")
        make -C build/external install-$(PKG)
 
 install-ext-deps: