Use openssl 1.0 compat RPM for Fedora 26 and newer.
This is just a workaround until VPP is compatible with OpenSSL 1.1. JIRA: VPP-569 Change-Id: I8d2a113dc9400fd7e8e6850de5d91f40380455ce Signed-off-by: Thomas F Herbert <therbert@redhat.com>
This commit is contained in:
committed by
Dave Wallace
parent
609707ea53
commit
440751b918
@@ -74,18 +74,20 @@ endif
|
||||
|
||||
RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
|
||||
RPM_DEPENDS += apr-devel
|
||||
RPM_DEPENDS += openssl-devel
|
||||
RPM_DEPENDS += numactl-devel
|
||||
RPM_DEPENDS += check
|
||||
ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
|
||||
RPM_DEPENDS += openssl-devel
|
||||
RPM_DEPENDS += python-devel
|
||||
RPM_DEPENDS += python2-virtualenv
|
||||
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
|
||||
RPM_DEPENDS += python2-virtualenv
|
||||
RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
|
||||
else
|
||||
RPM_DEPENDS += openssl-devel
|
||||
RPM_DEPENDS += python-devel
|
||||
RPM_DEPENDS += python-virtualenv
|
||||
RPM_DEPENDS_GROUPS = 'Development Tools'
|
||||
|
||||
+4
-1
@@ -30,16 +30,19 @@ Version: %{_version}
|
||||
Release: %{_release}
|
||||
Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python
|
||||
BuildRequires: systemd, chrpath
|
||||
BuildRequires: libffi-devel, openssl-devel
|
||||
%if 0%{?fedora} >= 26
|
||||
BuildRequires: compat-openssl10-devel
|
||||
BuildRequires: python2-devel, python2-virtualenv
|
||||
%else
|
||||
%if 0%{?fedora} == 25
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: python-devel, python2-virtualenv
|
||||
%else
|
||||
BuildREquires: openssl-devel
|
||||
BuildRequires: python-devel, python-virtualenv
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: libffi-devel
|
||||
BuildRequires: glibc-static, java-1.8.0-openjdk, java-1.8.0-openjdk-devel yum-utils, redhat-lsb
|
||||
BuildRequires: apr-devel
|
||||
%if %{with aesni}
|
||||
|
||||
Reference in New Issue
Block a user