From 1ab92ca8265e61ddc77a4861656bd137f3661ccf Mon Sep 17 00:00:00 2001 From: hubble_zhu Date: Fri, 25 Sep 2020 10:18:44 +0800 Subject: [PATCH 1/2] fix SyntaxWarning when use dpdk-pmdinfo --- ...-SyntaxWarning-when-use-dpdk-pmdinfo.patch | 37 +++++++++++++++++++ dpdk.spec | 10 ++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0001-fix-SyntaxWarning-when-use-dpdk-pmdinfo.patch diff --git a/0001-fix-SyntaxWarning-when-use-dpdk-pmdinfo.patch b/0001-fix-SyntaxWarning-when-use-dpdk-pmdinfo.patch new file mode 100644 index 0000000..229bdf8 --- /dev/null +++ b/0001-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 4f58876..d53f4d5 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -1,6 +1,6 @@ Name: dpdk Version: 19.11 -Release: 2 +Release: 3 Packager: packaging@6wind.com URL: http://dpdk.org %global source_version 19.11 @@ -12,6 +12,8 @@ Patch2: CVE-2020-10723.patch Patch3: CVE-2020-10724.patch Patch4: CVE-2020-10726.patch +Patch5: 0001-fix-SyntaxWarning-when-use-dpdk-pmdinfo.patch + Summary: Data Plane Development Kit core Group: System Environment/Libraries License: BSD and LGPLv2 and GPLv2 @@ -72,6 +74,9 @@ This package contains the pdump tool for capture the dpdk network packets. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 + + %build namer=%{kern_devel_ver} @@ -173,6 +178,9 @@ strip -g $RPM_BUILD_ROOT/lib/modules/${namer}/extra/dpdk/rte_kni.ko /usr/sbin/depmod %changelog +* Fri Sep 25 2020 hubble_zhu - 19.11-3 +-fix SyntaxWarning when use dpdk-pmdinfo + * Wed Sep 23 2020 hubble_zhu - 19.11-2 -Add requires for dpdk-pmdinfo -- Gitee From 3f0d905cf188bbb615a64374476b6256d082f43b Mon Sep 17 00:00:00 2001 From: hubble_zhu Date: Fri, 25 Sep 2020 10:19:29 +0800 Subject: [PATCH 2/2] Remove README --- README.en.md | 36 ------------------------------------ README.md | 39 --------------------------------------- 2 files changed, 75 deletions(-) delete mode 100644 README.en.md delete mode 100644 README.md diff --git a/README.en.md b/README.en.md deleted file mode 100644 index f04a225..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# dpdk - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index c36bbd9..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# dpdk - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) -- Gitee