From 26df8d759308de9be5f958bec2dd63d20c6642a5 Mon Sep 17 00:00:00 2001 From: Honggang Li Date: Tue, 24 Jul 2018 02:52:24 -0400 Subject: [PATCH] Rebase to latest upstream release v4.2-0.8 BuildRequires gcc Resolves: bz1605400 Signed-off-by: Honggang Li --- .gitignore | 1 + ...default-un-support-for-contig-memory.patch | 36 ------------------- perftest.spec | 12 ++++--- sources | 2 +- 4 files changed, 10 insertions(+), 41 deletions(-) delete mode 100644 0001-Set-default-un-support-for-contig-memory.patch diff --git a/.gitignore b/.gitignore index d19fac2..bde0bb8 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ noarch/ /perftest-2.*/ /perftest-3.0-0.18.gb464d59.tar.gz /perftest-4.2-0.5.gdd28746.tar.gz +/perftest-4.2-0.8.g0e24e67.tar.gz diff --git a/0001-Set-default-un-support-for-contig-memory.patch b/0001-Set-default-un-support-for-contig-memory.patch deleted file mode 100644 index 05fc2de..0000000 --- a/0001-Set-default-un-support-for-contig-memory.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 198473181e0365f97c5840b8fd406ff52af6335b Mon Sep 17 00:00:00 2001 -From: Zohar Ben Aharon -Date: Wed, 14 Mar 2018 10:33:59 +0200 -Subject: [PATCH] Set default un-support for contig memory - -By default we will not support this since it is EXP verbs supported - -Signed-off-by: Zohar Ben Aharon ---- - src/perftest_resources.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/perftest_resources.c b/src/perftest_resources.c -index c983105..c0c098a 100755 ---- a/src/perftest_resources.c -+++ b/src/perftest_resources.c -@@ -1455,13 +1455,12 @@ int ctx_init(struct pingpong_context *ctx, struct perftest_parameters *user_para - } - #endif - -+ ctx->is_contig_supported = FAILURE; - #ifdef HAVE_VERBS_EXP -- ctx->is_contig_supported = check_for_contig_pages_support(ctx->context); -+ if (!user_param->use_hugepages) -+ ctx->is_contig_supported = check_for_contig_pages_support(ctx->context); - #endif - -- if (user_param->use_hugepages) -- ctx->is_contig_supported = FAILURE; -- - /* Allocating an event channel if requested. */ - if (user_param->use_event) { - ctx->channel = ibv_create_comp_channel(ctx->context); --- -2.17.0 - diff --git a/perftest.spec b/perftest.spec index cb4281e..78b171a 100644 --- a/perftest.spec +++ b/perftest.spec @@ -1,12 +1,12 @@ Name: perftest Summary: IB Performance Tests Version: 4.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 or BSD -Source: https://github.com/linux-rdma/%{name}/releases/download/V4.2-0.5/perftest-4.2-0.5.gdd28746.tar.gz -Patch1: 0001-Set-default-un-support-for-contig-memory.patch +Source: https://github.com/linux-rdma/%{name}/releases/download/V4.2-0.8/perftest-4.2-0.8.g0e24e67.tar.gz Url: https://github.com/linux-rdma/perftest +BuildRequires: gcc BuildRequires: libibverbs-devel >= 1.2.0 BuildRequires: librdmacm-devel >= 1.0.21 BuildRequires: libibumad-devel >= 1.3.10.2 @@ -21,7 +21,6 @@ RDMA networks. %prep %setup -q -%patch1 -p1 find src -type f -iname '*.[ch]' -exec chmod a-x '{}' ';' %build @@ -39,6 +38,11 @@ done %_bindir/* %changelog +* Mon Jul 23 2018 Honggang Li - 4.2-3 +- Rebase to latest upstream release v4.2-0.8 +- BuildRequires gcc +- Resolves: bz1605400 + * Fri Jul 13 2018 Fedora Release Engineering - 4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 7366071..7ce6c1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (perftest-4.2-0.5.gdd28746.tar.gz) = dee31fe2b7070db61b47e402700c86be32e014cfaa97997f666a5a67cdb30f3e94d9d855181ecd82534579e628b3eb167b37b271e7f379e6a45610a6eb9ccc9c +SHA512 (perftest-4.2-0.8.g0e24e67.tar.gz) = 4f1bc30ebad6d4c4424d892a67a3809b391911ee4e8b2ded1b38b3390e622128aa04f67871e33debed6c4c3811d67f7a2833833cb621a240b22ccccdf4f11c43