Remove mbedtls from build requirement for Centos

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 0ea903c..1f24c17 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -86,17 +86,18 @@ RPM_DEPENDS += check check-devel
 RPM_DEPENDS += boost boost-devel
 RPM_DEPENDS += subunit subunit-devel
 RPM_DEPENDS += selinux-policy selinux-policy-devel
-RPM_DEPENDS += mbedtls-devel
 
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
        RPM_DEPENDS += openssl-devel
        RPM_DEPENDS += python-devel python2-ply
        RPM_DEPENDS += python2-virtualenv
+       RPM_DEPENDS += mbedtls-devel
        RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else ifeq ($(shell if [ "$(OS_ID)" = "fedora" ]; then test $(OS_VERSION_ID) -gt 25; echo $$?; fi),0)
        RPM_DEPENDS += compat-openssl10-devel
        RPM_DEPENDS += python2-devel python2-ply
        RPM_DEPENDS += python2-virtualenv
+       RPM_DEPENDS += mbedtls-devel
        RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else
        RPM_DEPENDS += openssl-devel
@@ -330,7 +331,7 @@ wipe-release: test-wipe $(BR)/.deps.ok
 
 rebuild-release: wipe-release build-release
 
-export VPP_PYTHON_PREFIX=$(BR)/python
+export VPP_PYTHON_PREFIX ?= $(BR)/python
 
 libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
 
@@ -377,6 +378,9 @@ test-shell:
 test-shell-debug:
        $(call test,vpp,vpp_debug,shell)
 
+test-dep:
+       @make -C test test-dep
+
 test-doc:
        @make -C test doc
 
@@ -513,6 +517,8 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 endif
        $(call banner,"Building sample-plugin")
        @make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
+       $(call banner,"Building libmemif")
+       @make -C build-root PLATFORM=vpp TAG=vpp libmemif-install
        $(call banner,"Building $(PKG) packages")
        @make pkg-$(PKG)
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)