From 5e84cf58b4a4217460f3cd18c17fd9eccdb12835 Mon Sep 17 00:00:00 2001 From: Honggang Li Date: Mon, 10 Feb 2020 03:12:02 -0500 Subject: [PATCH] Rebase to upstream release perftest-4.4-0.11 Signed-off-by: Honggang Li --- .gitignore | 1 + ...ultiple-definition-of-duration_param.patch | 26 +++++++++++++++++++ ...ace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch | 26 +++++++++++++++++++ perftest.spec | 12 ++++++--- sources | 2 +- 5 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 0010-Fix-multiple-definition-of-duration_param.patch create mode 100644 0011-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch diff --git a/.gitignore b/.gitignore index bde0bb8..2ce7e97 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ noarch/ /perftest-3.0-0.18.gb464d59.tar.gz /perftest-4.2-0.5.gdd28746.tar.gz /perftest-4.2-0.8.g0e24e67.tar.gz +/perftest-4.4-0.11.gd240b65.tar.gz diff --git a/0010-Fix-multiple-definition-of-duration_param.patch b/0010-Fix-multiple-definition-of-duration_param.patch new file mode 100644 index 0000000..7edce80 --- /dev/null +++ b/0010-Fix-multiple-definition-of-duration_param.patch @@ -0,0 +1,26 @@ +From 144ff72482dba53dd290e0743c6a557c9eae99df Mon Sep 17 00:00:00 2001 +From: Honggang Li +Date: Mon, 10 Feb 2020 02:18:42 -0500 +Subject: [PATCH 10/11] Fix multiple definition of duration_param + +Signed-off-by: Honggang Li +--- + src/raw_ethernet_resources.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raw_ethernet_resources.c b/src/raw_ethernet_resources.c +index 9e3a455..a5f8057 100755 +--- a/src/raw_ethernet_resources.c ++++ b/src/raw_ethernet_resources.c +@@ -55,7 +55,7 @@ + #include + #endif + +-struct perftest_parameters* duration_param; ++extern struct perftest_parameters* duration_param; + + int check_flow_steering_support(char *dev_name) + { +-- +2.25.0 + diff --git a/0011-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch b/0011-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch new file mode 100644 index 0000000..7984adf --- /dev/null +++ b/0011-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch @@ -0,0 +1,26 @@ +From 32a97e3718a94d57dd7ccc343f94d7ac5ef6d1c4 Mon Sep 17 00:00:00 2001 +From: Honggang Li +Date: Mon, 10 Feb 2020 02:19:16 -0500 +Subject: [PATCH 11/11] Replace '_BSD_SOURCE' with '_DEFAULT_SOURCE' + +Signed-off-by: Honggang Li +--- + src/get_clock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/get_clock.c b/src/get_clock.c +index 91aaf72..acdc6f1 100755 +--- a/src/get_clock.c ++++ b/src/get_clock.c +@@ -39,7 +39,7 @@ + /* #define GET_CPU_MHZ_FROM_PROC 1 */ + + /* For gettimeofday */ +-#define _BSD_SOURCE ++#define _DEFAULT_SOURCE + #include + + #include +-- +2.25.0 + diff --git a/perftest.spec b/perftest.spec index 5e7eed5..b1254c0 100644 --- a/perftest.spec +++ b/perftest.spec @@ -1,9 +1,11 @@ Name: perftest Summary: IB Performance Tests -Version: 4.2 -Release: 6%{?dist} +Version: 4.4 +Release: 1%{?dist} License: GPLv2 or BSD -Source: https://github.com/linux-rdma/%{name}/releases/download/V4.2-0.8/perftest-4.2-0.8.g0e24e67.tar.gz +Source: https://github.com/linux-rdma/perftest/releases/download/v4.4-0.11/perftest-4.4-0.11.gd240b65.tar.gz +Patch0010: 0010-Fix-multiple-definition-of-duration_param.patch +Patch0011: 0011-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch Url: https://github.com/linux-rdma/perftest BuildRequires: gcc @@ -21,6 +23,7 @@ RDMA networks. %prep %setup -q +%autosetup -v -p1 find src -type f -iname '*.[ch]' -exec chmod a-x '{}' ';' %build @@ -38,6 +41,9 @@ done %_bindir/* %changelog +* Mon Feb 10 2020 Honggang Li - 4.4-1 +- Rebase to upstream release perftest-4.4-0.11 + * Wed Jan 29 2020 Fedora Release Engineering - 4.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 7ce6c1a..77f852b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (perftest-4.2-0.8.g0e24e67.tar.gz) = 4f1bc30ebad6d4c4424d892a67a3809b391911ee4e8b2ded1b38b3390e622128aa04f67871e33debed6c4c3811d67f7a2833833cb621a240b22ccccdf4f11c43 +SHA512 (perftest-4.4-0.11.gd240b65.tar.gz) = 66ece240745e819f3f52123dc9e97d5a0e52f17634cf12cc14e6aea89c2a674ad7b92702593a5ede76a5aa32be44a9e00954418f15bb3d07d1f8036a41693951