summaryrefslogtreecommitdiffstats
path: root/dpdk
diff options
context:
space:
mode:
authorMatthew Smith <mgsmith@netgate.com>2018-07-19 08:37:03 -0500
committerDamjan Marion <dmarion@me.com>2018-07-19 22:34:17 +0000
commit3a9702a05feb2e810ebd992d75fcee98b5888071 (patch)
tree620863ce660d3a6eef3728d831784de4f6adef03 /dpdk
parent88dbf98fe717bec95ab53d33c04b375f30f801ba (diff)
dpdk: eliminate vpp-dpdk-devel RPM conflict
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>
Diffstat (limited to 'dpdk')
-rw-r--r--dpdk/rpm/vpp-dpdk.spec2
1 files changed, 1 insertions, 1 deletions
diff --git a/dpdk/rpm/vpp-dpdk.spec b/dpdk/rpm/vpp-dpdk.spec
index cc617681318..93e423584cb 100644
--- 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