diff options
| author |   Thomas F Herbert <therbert@redhat.com> | 2018-11-27 15:57:30 -0500 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-12-18 12:43:33 +0000 |
| commit | 6eb61639de0156a2343ba5825ac535727d6658d0 (patch) | |
| tree | 9f84b8fa9f02ca247584b85822d7bd06b810e862 /extras | |
| parent | 8006c6aa425126529b4017768a9201e4f03964ad (diff) | |
Build changes required for Fedora and CentOS
VPP-1511
cmake is the dep for Fedora but cmake3 is for CentOS 7.
Centos: explicitly install epel-release on Centos.
Epel requirement is now explicit for cmake3, and ninja-build.
Remove references to Fedora 25 which is EOL.
Change-Id: I1548ddf2e5421097ac0ddc2d99abce7582d0d593
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/rpm/vpp.spec | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec index bf2d83a84c8..ef282237088 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -49,20 +49,18 @@ Release: %{_release} Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils, python BuildRequires: systemd, chrpath BuildRequires: check, check-devel -%if 0%{?fedora} >= 26 +%if 0%{?fedora} BuildRequires: subunit, subunit-devel BuildRequires: compat-openssl10-devel BuildRequires: python2-devel, python2-virtualenv, python2-ply BuildRequires: mbedtls-devel +BuildRequires: cmake %else -%if 0%{?fedora} == 25 -BuildRequires: subunit, subunit-devel -BuildRequires: openssl-devel -BuildRequires: python-devel, python2-virtualenv, python2-ply -BuildRequires: mbedtls-devel -%else +%if 0%{rhel} == 7 +BuildRequires: devtoolset-7-toolchain BuildREquires: openssl-devel BuildRequires: python-devel, python-virtualenv, python-ply +BuildRequires: cmake3 %endif %endif BuildRequires: libffi-devel @@ -157,6 +155,9 @@ This package contains a tailored VPP SELinux policy groupadd -f -r vpp %build +%if 0%{?rhel} +. /opt/rh/devtoolset-7/enable +%endif %if %{with aesni} make bootstrap make -C build-root PLATFORM=vpp TAG=%{_vpp_tag} install-packages |