summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas F Herbert <therbert@redhat.com>2018-04-05 16:09:58 -0400
committerChris Luke <chris_luke@comcast.com>2018-04-07 21:03:31 +0000
commit24c3733f1f91ad04ad3b388cb1b666540d8598db (patch)
treeb0fa156551841e0053304045f6bce1d72c8ee7d1
parentca3c508401df844807f2e7646c545c049c0cbb3b (diff)
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)
-rw-r--r--Makefile3
-rw-r--r--extras/rpm/vpp.spec3
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 5de9f8e9632..5cc584998cf 100644
--- 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 e2caa986fac..eb47b1b892e 100644
--- 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