diff options
| author |   Thomas F Herbert <therbert@redhat.com> | 2017-09-11 08:58:23 -0400 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2017-09-20 13:40:04 +0000 |
| commit | 440751b91804947a7c9b533570531cac79629016 (patch) | |
| tree | bba3154c9f3863ab5cc67206ad11d1b7efe8cb7a | |
| parent | 609707ea530de6a0f9fa989b8269b973dd89174e (diff) | |
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>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | extras/rpm/vpp.spec | 5 |
2 files changed, 7 insertions, 2 deletions
@@ -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' diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec index 86c0dbc9b6d..a319ba736c4 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -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} |