aboutsummaryrefslogtreecommitdiffstats
path: root/extras/rpm
diff options
context:
space:
mode:
authorRenato Botelho do Couto <renato@netgate.com>2019-11-07 06:10:34 -0600
committerDamjan Marion <dmarion@me.com>2019-12-17 18:23:43 +0000
commitc025329bb244952938c8575a1d5602a1e54e5fe7 (patch)
treedf78a9fbbf7b8a32588e66303274e33bf8b159f0 /extras/rpm
parent842506f3c9ac8136642d3f9b49bb73f05f63cfdb (diff)
misc: Add CentOS 8 package support
Type: feature Added missing dependencies on RPM spec file and install-dep Ticket: VPP-1800 Signed-off-by: Renato Botelho do Couto <renato@netgate.com> Change-Id: I91d39c94b3f03c213249dff42b264718ef772bdb
Diffstat (limited to 'extras/rpm')
-rw-r--r--extras/rpm/vpp.spec14
1 files changed, 10 insertions, 4 deletions
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index e20bf1f8fad..09e70c5245d 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -59,20 +59,26 @@ BuildRequires: python, python-devel, python-virtualenv, python-ply
BuildRequires: python3, python36-devel, python3-virtualenv
BuildRequires: cmake
%else
-%if 0%{rhel} == 7
+%if 0%{rhel} >= 7
Requires: epel-release
Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils, python36
Requires: boost-filesystem mbedtls libffi-devel
BuildRequires: epel-release
BuildRequires: mbedtls-devel mbedtls
-BuildRequires: devtoolset-7-toolchain
BuildREquires: openssl-devel
BuildRequires: python36-devel
+%if 0%{rhel} == 7
+BuildRequires: devtoolset-7-toolchain
BuildRequires: cmake3
+BuildRequires: glibc-static, yum-utils
+%else
+BuildRequires: cmake
+BuildRequires: dnf-utils
+%endif
%endif
%endif
BuildRequires: libffi-devel
-BuildRequires: glibc-static, yum-utils, redhat-lsb
+BuildRequires: redhat-lsb
BuildRequires: apr-devel
BuildRequires: numactl-devel
BuildRequires: autoconf automake libtool byacc bison flex
@@ -165,7 +171,7 @@ This package contains a tailored VPP SELinux policy
groupadd -f -r vpp
%build
-%if 0%{?rhel}
+%if 0%{rhel} < 8
. /opt/rh/devtoolset-7/enable
%endif
%if %{with aesni}