From 3e505d6a9fbcd10f9c95c3fb3dbb97bfe90a9af3 Mon Sep 17 00:00:00 2001 From: huangliming Date: Wed, 6 Jan 2021 03:40:36 +0000 Subject: [PATCH] fix yum update dpdk-tools conflict with dpdk-devel Signed-off-by: huangliming --- dpdk.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dpdk.spec b/dpdk.spec index d6fed94..93fd57c 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -1,6 +1,6 @@ Name: dpdk Version: 19.11 -Release: 7 +Release: 8 Packager: packaging@6wind.com URL: http://dpdk.org %global source_version 19.11 @@ -155,6 +155,7 @@ strip -g $RPM_BUILD_ROOT/lib/modules/${namer}/extra/dpdk/rte_kni.ko %dir %{_datadir}/dpdk %{_datadir}/dpdk/usertools/*.py %{_datadir}/dpdk/usertools/*.sh +%{_sbindir}/dpdk-devbind /lib/modules/%{kern_devel_ver}/extra/dpdk/* /lib64/librte*.so* @@ -164,7 +165,6 @@ strip -g $RPM_BUILD_ROOT/lib/modules/${namer}/extra/dpdk/rte_kni.ko %{_datadir}/dpdk/buildtools %{_datadir}/dpdk/%{target} %{_datadir}/dpdk/examples -%{_sbindir}/* %{_bindir}/* %{_libdir}/* %dir /usr/include/%{name}-%{version}/ @@ -172,6 +172,8 @@ strip -g $RPM_BUILD_ROOT/lib/modules/${namer}/extra/dpdk/rte_kni.ko %dir /usr/include/dpdk/ /usr/include/dpdk/* +%exclude /usr/bin/dpdk-pdump + %files doc #%doc %{_docdir}/dpdk @@ -187,6 +189,9 @@ strip -g $RPM_BUILD_ROOT/lib/modules/${namer}/extra/dpdk/rte_kni.ko /usr/sbin/depmod %changelog +* Tue Jan 05 2021 huangliming - 19.11-8 +-fix yum update dpdk-tools conflict with dpdk-devel + * Mon Dec 28 2020 huangliming - 19.11-7 -fix CVE-2020-14374 CVE-2020-14375 -- Gitee