diff --git a/0013-fix-SyntaxWarning-when-use-dpdk-pmdinfo.patch b/0013-fix-SyntaxWarning-when-use-dpdk-pmdinfo.patch new file mode 100644 index 0000000000000000000000000000000000000000..229bdf895f12e47fbf0cf7696b8d5e84f41171b7 --- /dev/null +++ b/0013-fix-SyntaxWarning-when-use-dpdk-pmdinfo.patch @@ -0,0 +1,37 @@ +From 01a36309d05433defc97c81d27eccd781f1fbae3 Mon Sep 17 00:00:00 2001 +From: hubble_zhu +Date: Fri, 25 Sep 2020 10:14:09 +0800 +Subject: [PATCH] fix SyntaxWarning when use dpdk-pmdinfo + +--- + usertools/dpdk-pmdinfo.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py +index 069a3bf..12f2073 100755 +--- a/usertools/dpdk-pmdinfo.py ++++ b/usertools/dpdk-pmdinfo.py +@@ -539,7 +539,7 @@ def scan_for_autoload_pmds(dpdk_path): + return + + (autoload_path, scannedfile) = readelf.search_for_autoload_path() +- if (autoload_path is None or autoload_path is ""): ++ if not autoload_path: + if (raw_output is False): + print("No autoload path configured in %s" % dpdk_path) + return +@@ -561,7 +561,10 @@ def main(stream=None): + + pcifile_default = "./pci.ids" # For unknown OS's assume local file + if platform.system() == 'Linux': +- pcifile_default = "/usr/share/hwdata/pci.ids" ++ # hwdata is the legacy location, misc is supported going forward ++ pcifile_default = "/usr/share/misc/pci.ids" ++ if not os.path.exists(pcifile_default): ++ pcifile_default = "/usr/share/hwdata/pci.ids" + elif platform.system() == 'FreeBSD': + pcifile_default = "/usr/local/share/pciids/pci.ids" + if not os.path.exists(pcifile_default): +-- +2.23.0 + diff --git a/dpdk.spec b/dpdk.spec index d981d862af420d9a0c5177f3f1dba212f3321c23..e6be8635e3f411b3395825ddee48034158f5ef78 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -1,6 +1,6 @@ Name: dpdk Version: 19.11 -Release: 11 +Release: 12 Packager: packaging@6wind.com URL: http://dpdk.org %global source_version 19.11 @@ -42,6 +42,7 @@ Patch32: 0009-dpdk-support-gazelle-11-eal-memory-add-sec.patch Patch33: 0010-dpdk-fix-error-in-clearing-secondary-process-memseg-lists.patch Patch34: 0011-dpdk-fix-coredump-when-primary-process-attach-without-shared-file.patch Patch35: 0012-dpdk-fix-fbarray-memseg-destory-error-during-detach.patch +Patch36: 0013-fix-SyntaxWarning-when-use-dpdk-pmdinfo.patch Summary: Data Plane Development Kit core Group: System Environment/Libraries @@ -134,6 +135,7 @@ This package contains the pdump tool for capture the dpdk network packets. %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch36 -p1 %build namer=%{kern_devel_ver} @@ -236,6 +238,9 @@ strip -g $RPM_BUILD_ROOT/lib/modules/${namer}/extra/dpdk/rte_kni.ko /usr/sbin/depmod %changelog +* Fri May 21 2021 hubble_zhu - 19.11-12 +- sync fix-SyntaxWarning-when-use-dpdk-pmdinfo.patch from openEuler-20.09 + * Mon Apr 5 2021 wu-changsheng<851744572@qq.com> - 19.11-11 - add support for gazelle