diff --git a/.gitignore b/.gitignore index bb62bf7..a8d57cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/perftest-4.4-0.23.g89e176a.tar.gz +SOURCES/perftest-4.4-0.29.g817ec38.tar.gz diff --git a/.perftest.metadata b/.perftest.metadata index 6c7f217..3e8bcdf 100644 --- a/.perftest.metadata +++ b/.perftest.metadata @@ -1 +1 @@ -7b14b91a29bbe85eaa7e2bae6b74cf07c439d02b SOURCES/perftest-4.4-0.23.g89e176a.tar.gz +26e318b80b7e2464a139a056332f2400864d4f61 SOURCES/perftest-4.4-0.29.g817ec38.tar.gz diff --git a/SOURCES/0010-Fix-multiple-definition-of-duration_param.patch b/SOURCES/0010-Fix-multiple-definition-of-duration_param.patch deleted file mode 100644 index 7edce80..0000000 --- a/SOURCES/0010-Fix-multiple-definition-of-duration_param.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/SOURCES/0011-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch b/SOURCES/0011-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch deleted file mode 100644 index 7984adf..0000000 --- a/SOURCES/0011-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/SPECS/perftest.spec b/SPECS/perftest.spec index ede07f1..bc63360 100644 --- a/SPECS/perftest.spec +++ b/SPECS/perftest.spec @@ -1,15 +1,12 @@ Name: perftest Summary: IB Performance Tests Version: 4.4 -%define minor_release 0.23 -%define git_hash g89e176a -Release: 1%{?dist} +%define minor_release 0.29 +%define git_hash g817ec38 +Release: 2%{?dist} License: GPLv2 or BSD -Group: Productivity/Networking/Diagnostic Source0: https://github.com/linux-rdma/perftest/releases/download/V%{version}-%{minor_release}/perftest-%{version}-%{minor_release}.%{git_hash}.tar.gz Source1: ib_atomic_bw.1 -Patch1: 0010-Fix-multiple-definition-of-duration_param.patch -Patch2: 0011-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch Url: http://www.openfabrics.org BuildRequires: libibverbs-devel > 1.1.4, librdmacm-devel > 1.0.14 BuildRequires: libibumad-devel > 1.3.6 @@ -24,8 +21,6 @@ RDMA networks. %prep %setup -q -%patch1 -p1 -%patch2 -p1 autoreconf --force --install %build @@ -53,6 +48,10 @@ popd %{_mandir}/man1/* %changelog +* Mon May 25 2020 Honggang Li - 4.4-2 +- Update to upstream 4.4-0.29.g817ec38 tarball +- Resolves: rhbz#1832709 + * Wed Apr 15 2020 Honggang Li - 4.4-1 - Update to upstream 4.4-0.23.g89e176a tarball - Resolves: rhbz#1817830