diff --git a/.gitignore b/.gitignore index 1fd4033..7c40d6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/perftest-3.4-0.9.g98a9a17.tar.gz +SOURCES/perftest-4.2-0.8.g0e24e67.tar.gz diff --git a/.perftest.metadata b/.perftest.metadata index 6a42c5a..a346025 100644 --- a/.perftest.metadata +++ b/.perftest.metadata @@ -1 +1 @@ -5fd46e0a24ea115e4e3e9f15eee44044332c4f19 SOURCES/perftest-3.4-0.9.g98a9a17.tar.gz +398cb7cff2dfcf1d1e67a44c9bd4b98df9983e30 SOURCES/perftest-4.2-0.8.g0e24e67.tar.gz diff --git a/SOURCES/perftest-3.0-cflags.patch b/SOURCES/perftest-3.0-cflags.patch deleted file mode 100644 index b70ca82..0000000 --- a/SOURCES/perftest-3.0-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: perftest-3.4/configure.ac -=================================================================== ---- perftest-3.4.orig/configure.ac -+++ perftest-3.4/configure.ac -@@ -271,7 +271,7 @@ if [test $HAVE_PACKET_PACING = yes]; the - AC_DEFINE([HAVE_PACKET_PACING], [1], [Have PACKET_PACING support]) - fi - --CFLAGS="-g -Wall -D_GNU_SOURCE -O3" -+CFLAGS+=" -g -Wall -D_GNU_SOURCE -O3" - AC_SUBST([LIBUMAD]) - AC_SUBST([LIBMATH]) - AC_CONFIG_FILES([Makefile]) diff --git a/SOURCES/perftest-4.2-cflags.patch b/SOURCES/perftest-4.2-cflags.patch new file mode 100644 index 0000000..10613a9 --- /dev/null +++ b/SOURCES/perftest-4.2-cflags.patch @@ -0,0 +1,13 @@ +Index: perftest-4.2/configure.ac +=================================================================== +--- perftest-4.2.orig/configure.ac ++++ perftest-4.2/configure.ac +@@ -310,7 +310,7 @@ if [test $HAVE_EXP_OOO_ATTR = yes]; then + AC_DEFINE([HAVE_EXP_OOO_ATTR], [1], [Have Experimental Out of order data placement support]) + fi + +-CFLAGS="-g -Wall -D_GNU_SOURCE -O3 $CFLAGS" ++CFLAGS+=" -g -Wall -D_GNU_SOURCE -O3 $CFLAGS" + LIBS=$LIBS" -lpthread" + AC_SUBST([LIBUMAD]) + AC_SUBST([LIBMATH]) diff --git a/SOURCES/perftest-enable-s390x-platform-support.patch b/SOURCES/perftest-enable-s390x-platform-support.patch deleted file mode 100644 index ee1704a..0000000 --- a/SOURCES/perftest-enable-s390x-platform-support.patch +++ /dev/null @@ -1,66 +0,0 @@ -From https://bugzilla.redhat.com/show_bug.cgi?id=1182177#c5 - -Enable the s390x plaform support in the perftest-2.3.1 package by fixing -a typo in the sample_get_cpu_mhz() function call and a couple of typos in -the README file. - -Signed-off-by: Alexey Ishchuk - -[ Rebased and modified to check for __s390__, to cover - both s390 and s390x. -- mschmidt] ---- - README | 2 +- - src/get_clock.c | 6 +++--- - src/get_clock.h | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -Index: perftest-3.4/README -=================================================================== ---- perftest-3.4.orig/README -+++ perftest-3.4/README -@@ -237,7 +237,7 @@ Special feature detailed explanation in - ./configure --disable-verbs_exp - make - -- 6. In te x390x platform virtualized environment the results shown by package test applications can be incorrect. -+ 6. In the s390x platform virtualized environment the results shown by package test applications can be incorrect. - - 7. perftest-2.3 release includes support for dualport VPI test - port1-Ethernet , port2-IB. (in addition to Eth:Eth, IB:IB) - Currently, running dualport when port1-IB , port2-Ethernet still not working. -Index: perftest-3.4/src/get_clock.c -=================================================================== ---- perftest-3.4.orig/src/get_clock.c -+++ perftest-3.4/src/get_clock.c -@@ -133,7 +133,7 @@ static double sample_get_cpu_mhz(void) - return b; - } - --#ifndef __s390x__ -+#ifndef __s390__ - static double proc_get_cpu_mhz(int no_cpu_freq_warn) - { - FILE* f; -@@ -212,8 +212,8 @@ static double proc_get_cpu_mhz(int no_cp - - double get_cpu_mhz(int no_cpu_freq_warn) - { -- #ifdef __s390x__ -- return sample_get_cpu_mgz(); -+ #ifdef __s390__ -+ return sample_get_cpu_mhz(); - #else - double sample, proc, delta; - sample = sample_get_cpu_mhz(); -Index: perftest-3.4/src/get_clock.h -=================================================================== ---- perftest-3.4.orig/src/get_clock.h -+++ perftest-3.4/src/get_clock.h -@@ -70,7 +70,7 @@ static inline cycles_t get_cycles() - asm volatile ("mov %0=ar.itc" : "=r" (ret)); - return ret; - } --#elif defined(__s390x__) -+#elif defined(__s390__) - typedef unsigned long long cycles_t; - static inline cycles_t get_cycles(void) - { diff --git a/SPECS/perftest.spec b/SPECS/perftest.spec index 37c99d7..e5aa94b 100644 --- a/SPECS/perftest.spec +++ b/SPECS/perftest.spec @@ -1,14 +1,14 @@ Name: perftest Summary: IB Performance Tests -Version: 3.4 -%define tar_release 0.9.g98a9a17 -Release: 1%{?dist} +Version: 4.2 +%define minor_release 0.8 +%define git_hash g0e24e67 +Release: 2%{?dist} License: GPLv2 or BSD Group: Productivity/Networking/Diagnostic -Source0: https://www.openfabrics.org/downloads/%{name}/%{name}-%{version}-%{tar_release}.tar.gz +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 -Patch0: perftest-3.0-cflags.patch -Patch1: perftest-enable-s390x-platform-support.patch +Patch1: perftest-4.2-cflags.patch Url: http://www.openfabrics.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libibverbs-devel > 1.1.4, librdmacm-devel > 1.0.14 @@ -24,7 +24,6 @@ RDMA networks. %prep %setup -q -%patch0 -p1 -b .cflags %patch1 -p1 autoreconf --force --install @@ -55,6 +54,14 @@ popd %{_mandir}/man1/* %changelog +* Mon Jun 25 2018 Jarod Wilson 4.2-2 +- Update to upstream 4.2-0.8.g0e24e67 tarball +- Related: rhbz#1456523 + +* Tue May 01 2018 Jarod Wilson - 4.2-1 +- Update to upstream 4.2-0.5.gdd28746 tarball +- Resolves: rhbz#1456523 + * Mon Apr 03 2017 Jarod Wilson - 3.4-1 - Update to upstream 3.4-0.9.g98a9a17 tarball - Resolves: rhbz#1437978