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

Remove subunit from Centos requirements.

Browse Source 
JIRA: VPP-1229

Subunit and Subunit-devel in Fedora and Epel but not Centos.
This patch moves the Fedora from the Centos specific requirements.

Change-Id: I093a4571cddf14af5ee2827ba8ee00c7bcbe6fc0
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
This commit is contained in:
Thomas F Herbert
2018-03-05 17:21:56 -05:00
parent 7ace56b9d8
commit ca3c508401
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -84,16 +84,17 @@ RPM_DEPENDS += apr-devel
RPM_DEPENDS += numactl-devel RPM_DEPENDS += numactl-devel
RPM_DEPENDS += check check-devel RPM_DEPENDS += check check-devel
RPM_DEPENDS += boost boost-devel RPM_DEPENDS += boost boost-devel
RPM_DEPENDS += subunit subunit-devel
RPM_DEPENDS += selinux-policy selinux-policy-devel RPM_DEPENDS += selinux-policy selinux-policy-devel
RPM_DEPENDS += mbedtls-devel RPM_DEPENDS += mbedtls-devel
ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25) ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
RPM_DEPENDS += subunit subunit-devel
RPM_DEPENDS += openssl-devel RPM_DEPENDS += openssl-devel
RPM_DEPENDS += python-devel python2-ply RPM_DEPENDS += python-devel python2-ply
RPM_DEPENDS += python2-virtualenv RPM_DEPENDS += python2-virtualenv
RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries' 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) else ifeq ($(shell if [ "$(OS_ID)" = "fedora" ]; then test $(OS_VERSION_ID) -gt 25; echo $$?; fi),0)
RPM_DEPENDS += subunit subunit-devel
RPM_DEPENDS += compat-openssl10-devel RPM_DEPENDS += compat-openssl10-devel
RPM_DEPENDS += python2-devel python2-ply RPM_DEPENDS += python2-devel python2-ply
RPM_DEPENDS += python2-virtualenv RPM_DEPENDS += python2-virtualenv

3
extras/rpm/vpp.spec
View File

@ -50,12 +50,13 @@ Release: %{_release}
Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils, python Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils, python
BuildRequires: systemd, chrpath BuildRequires: systemd, chrpath
BuildRequires: check, check-devel BuildRequires: check, check-devel
BuildRequires: subunit, subunit-devel
%if 0%{?fedora} >= 26 %if 0%{?fedora} >= 26
BuildRequires: subunit, subunit-devel
BuildRequires: compat-openssl10-devel BuildRequires: compat-openssl10-devel
BuildRequires: python2-devel, python2-virtualenv BuildRequires: python2-devel, python2-virtualenv
%else %else
%if 0%{?fedora} == 25 %if 0%{?fedora} == 25
BuildRequires: subunit, subunit-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: python-devel, python2-virtualenv BuildRequires: python-devel, python2-virtualenv
%else %else