Remove mbedtls from build requirement for Centos

JIRA: VPP-1228

Although mbedtls is in Fedora and Epel, it is not
in Centos yet. It is not strictly necessary for TLS
which also can use openssl.

Change-Id: Id62d52000f9ecda2fc10d1938f02be1142fa5bdb
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
(cherry picked from commit 5f56c091ce2cccbd3e70096d36492e7996d9d9fc)

diff --git a/Makefile b/Makefile
index 5de9f8e..5cc5849 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -85,19 +85,20 @@ RPM_DEPENDS += numactl-devel
 RPM_DEPENDS += check check-devel
 RPM_DEPENDS += boost boost-devel
 RPM_DEPENDS += selinux-policy selinux-policy-devel
-RPM_DEPENDS += mbedtls-devel
 
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
        RPM_DEPENDS += subunit subunit-devel
        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 += subunit subunit-devel
        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

diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index e2caa98..eb47b1b 100644 (file)
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -54,11 +54,13 @@ BuildRequires: check, check-devel
 BuildRequires: subunit, subunit-devel
 BuildRequires: compat-openssl10-devel
 BuildRequires: python2-devel, python2-virtualenv
+BuildRequires: mbedtls-devel
 %else
 %if 0%{?fedora} == 25
 BuildRequires: subunit, subunit-devel
 BuildRequires: openssl-devel
 BuildRequires: python-devel, python2-virtualenv
+BuildRequires: mbedtls-devel
 %else
 BuildREquires: openssl-devel
 BuildRequires: python-devel, python-virtualenv
@@ -71,7 +73,6 @@ BuildRequires: numactl-devel
 BuildRequires: autoconf automake libtool byacc bison flex
 BuildRequires: boost boost-devel
 BuildRequires: selinux-policy selinux-policy-devel
-BuildRequires: mbedtls-devel
 
 Source: %{name}-%{_version}-%{_release}.tar.xz
 # Source: vpp-latest.tar.xz