From 466872f0896139b34ef8ccf12f7fcc0093d7cb19 Mon Sep 17 00:00:00 2001 From: Yichen Wang Date: Tue, 30 Jun 2020 23:14:23 -0700 Subject: [PATCH] build: fix the the build on centos/rhel 8 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 --- Makefile | 1 + extras/rpm/vpp.spec | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cac1ed770d9..cf4cfadecc7 100644 --- a/Makefile +++ b/Makefile @@ -110,6 +110,7 @@ RPM_DEPENDS += libuuid-devel RPM_DEPENDS += mbedtls-devel RPM_DEPENDS += ccache RPM_DEPENDS += xmlto +RPM_DEPENDS += elfutils-libelf-devel ifeq ($(OS_ID),fedora) RPM_DEPENDS += dnf-utils diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec index 538c071caea..038c10bc9ff 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -60,7 +60,6 @@ BuildRequires: python3, python36-devel, python3-virtualenv BuildRequires: cmake %else %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 @@ -150,7 +149,7 @@ This package contains the python bindings for the vpp api Summary: VPP api python3 bindings Group: Development/Libraries Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}, libffi-devel -Requires: python-setuptools +Requires: python3-setuptools %description api-python3 This package contains the python3 bindings for the vpp api -- 2.16.6