From: Thomas F Herbert <therbert@redhat.com>
Date: Thu, 5 Apr 2018 20:09:58 +0000 (-0400)
Subject: Remove mbedtls from build requirement for Centos
X-Git-Tag: v18.07-rc1~511
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=5f56c091ce2cccbd3e70096d36492e7996d9d9fc;p=vpp.git

Remove mbedtls from build requirement for Centos

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>
---

diff --git a/Makefile b/Makefile
index 6dd2fc2e3fe..1f24c172459 100644
--- 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
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index fe4f3d83999..d4c04835638 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -54,10 +54,12 @@ BuildRequires: subunit, subunit-devel
 %if 0%{?fedora} >= 26
 BuildRequires: compat-openssl10-devel
 BuildRequires: python2-devel, python2-virtualenv
+BuildRequires: mbedtls-devel
 %else
 %if 0%{?fedora} == 25
 BuildRequires: openssl-devel
 BuildRequires: python-devel, python2-virtualenv
+BuildRequires: mbedtls-devel
 %else
 BuildREquires: openssl-devel
 BuildRequires: python-devel, python-virtualenv
@@ -70,7 +72,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