ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix the the build on centos/rhel 8

Browse Source 
1. Remove uncessary runtime dependency;
2. Add missing build dependency;
3. Fix runtime dependency for api-python3 RPM;

Type: make

Change-Id: I2700f1a15112effba8d1527aca6467158f81f486
Signed-off-by: Yichen Wang <yicwang@cisco.com>
(cherry picked from commit 466872f0896139b34ef8ccf12f7fcc0093d7cb19)
This commit is contained in:
Yichen Wang
2020-06-30 23:14:23 -07:00
committed by Andrew Yourtchenko
parent 57b16c694c
commit 748bf82a50
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -110,6 +110,7 @@ RPM_DEPENDS += libuuid-devel
RPM_DEPENDS += mbedtls-devel RPM_DEPENDS += mbedtls-devel
RPM_DEPENDS += ccache RPM_DEPENDS += ccache
RPM_DEPENDS += xmlto RPM_DEPENDS += xmlto
RPM_DEPENDS += elfutils-libelf-devel
ifeq ($(OS_ID),fedora) ifeq ($(OS_ID),fedora)
RPM_DEPENDS += dnf-utils RPM_DEPENDS += dnf-utils

3
extras/rpm/vpp.spec
View File

@ -60,7 +60,6 @@ BuildRequires: python3, python36-devel, python3-virtualenv
BuildRequires: cmake BuildRequires: cmake
%else %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: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils, python36
Requires: boost-filesystem mbedtls libffi-devel Requires: boost-filesystem mbedtls libffi-devel
BuildRequires: epel-release BuildRequires: epel-release
@ -150,7 +149,7 @@ This package contains the python bindings for the vpp api
Summary: VPP api python3 bindings Summary: VPP api python3 bindings
Group: Development/Libraries Group: Development/Libraries
Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}, libffi-devel Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}, libffi-devel
Requires: python-setuptools Requires: python3-setuptools
%description api-python3 %description api-python3
This package contains the python3 bindings for the vpp api This package contains the python3 bindings for the vpp api