Code Review / vpp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 88dbf98)
dpdk: eliminate vpp-dpdk-devel RPM conflict 56/13556/2
authorMatthew Smith <mgsmith@netgate.com>
Thu, 19 Jul 2018 13:37:03 +0000 (08:37 -0500)
committerDamjan Marion <dmarion@me.com>
Thu, 19 Jul 2018 22:34:17 +0000 (22:34 +0000)
Both vpp-devel and vpp-dpdk-devel have /usr/include/dpdk
in their files list. CentOS 7 won't allow them to both be
installed at the same time as a result.

Change vpp-dpdk-devel to /usr/include/dpdk/* so both can
be installed. It is useful to have both installed on a
development system.

Change-Id: I94b6cca299dfbd991638e43c41006db0d8f7ee8b
Signed-off-by: Matthew Smith <mgsmith@netgate.com>
dpdk/rpm/vpp-dpdk.spec patch | blob | history

diff --git a/dpdk/rpm/vpp-dpdk.spec b/dpdk/rpm/vpp-dpdk.spec
index cc61768..93e4235 100644 (file)
--- a/dpdk/rpm/vpp-dpdk.spec
+++ b/dpdk/rpm/vpp-dpdk.spec
@@ -20,7 +20,7 @@ make %{_make_args} install
 
 %files devel
 /usr/bin/*
-/usr/include/dpdk
+/usr/include/dpdk/*
 /usr/lib/*
 /usr/sbin/*
 /usr/share/dpdk
Vector Packet Processing