aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Ganne <gabriel.ganne@enea.com>2017-11-16 14:47:42 +0100
committerDamjan Marion <dmarion.lists@gmail.com>2017-11-17 08:39:06 +0000
commitb8bbd6521fbab6579e4c571f61489f995f56bc78 (patch)
tree2041ec8ef62366634d5ddf8f83cd923ff40311a0
parent9385aa096ca2f216ae220cbca4f6554e606baeb7 (diff)
subunit is required on centos as well as fedora
Remove fedora dependency restriction on subunit and subunit-devel packages. libsunit is only called in test/ext/Makefile on all platforms safe opensuse. Change-Id: I483f42f20f6ba8bd112c18a9c51753a5d816d1c1 Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com> Signed-off-by: Romain Ly <romain.ly@enea.com>
-rw-r--r--Makefile3
-rw-r--r--extras/rpm/vpp.spec2
2 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index ee1b2757cab..fcce193c3f6 100644
--- a/Makefile
+++ b/Makefile
@@ -84,15 +84,14 @@ RPM_DEPENDS += apr-devel
RPM_DEPENDS += numactl-devel
RPM_DEPENDS += check check-devel
RPM_DEPENDS += boost boost-devel
+RPM_DEPENDS += subunit subunit-devel
ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
- RPM_DEPENDS += subunit subunit-devel
RPM_DEPENDS += openssl-devel
RPM_DEPENDS += python-devel
RPM_DEPENDS += python2-virtualenv
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)
- RPM_DEPENDS += subunit subunit-devel
RPM_DEPENDS += compat-openssl10-devel
RPM_DEPENDS += python2-devel
RPM_DEPENDS += python2-virtualenv
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index d266a649a26..b200df7ee82 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -32,9 +32,7 @@ Release: %{_release}
Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python
BuildRequires: systemd, chrpath
BuildRequires: check, check-devel
-%if 0%{?fedora} >= 25
BuildRequires: subunit, subunit-devel
-%endif
%if 0%{?fedora} >= 26
BuildRequires: compat-openssl10-devel
BuildRequires: python2-devel, python2-virtualenv