From d144629eca79bea46a5b643994ee2e9332a05797 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 5 Nov 2019 17:01:48 -0500 Subject: [PATCH] import infiniband-diags-2.2.0-3.el8 --- .gitignore | 2 +- .infiniband-diags.metadata | 2 +- ...-new-device-ID-to-device-white-lists.patch | 52 ------------------- SPECS/infiniband-diags.spec | 19 +++++-- 4 files changed, 16 insertions(+), 59 deletions(-) delete mode 100644 SOURCES/0001-Add-latest-new-device-ID-to-device-white-lists.patch diff --git a/.gitignore b/.gitignore index 350c249..621e3ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/infiniband-diags-2.1.0.tar.gz +SOURCES/infiniband-diags-2.2.0.tar.gz diff --git a/.infiniband-diags.metadata b/.infiniband-diags.metadata index d7175e1..9480e78 100644 --- a/.infiniband-diags.metadata +++ b/.infiniband-diags.metadata @@ -1 +1 @@ -4f8ad11d3ba793ff8e201c0d182c0a6c97931afa SOURCES/infiniband-diags-2.1.0.tar.gz +a2702918f03acf4140db8cffcd7381d00dbfae1b SOURCES/infiniband-diags-2.2.0.tar.gz diff --git a/SOURCES/0001-Add-latest-new-device-ID-to-device-white-lists.patch b/SOURCES/0001-Add-latest-new-device-ID-to-device-white-lists.patch deleted file mode 100644 index 8c7c165..0000000 --- a/SOURCES/0001-Add-latest-new-device-ID-to-device-white-lists.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 48baa814d84215de2afbae696b6ed6cc95714f13 Mon Sep 17 00:00:00 2001 -From: Hal Rosenstock -Date: Fri, 14 Sep 2018 16:05:12 +0300 -Subject: [PATCH] Add latest new device ID to device white lists - -Signed-off-by: Hal Rosenstock ---- - libibnetdisc/src/ibnetdisc.c | 2 +- - src/ibdiag_common.c | 1 + - src/vendstat.c | 1 + - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/libibnetdisc/src/ibnetdisc.c b/libibnetdisc/src/ibnetdisc.c -index 05f1dc9..04bc5c5 100644 ---- a/libibnetdisc/src/ibnetdisc.c -+++ b/libibnetdisc/src/ibnetdisc.c -@@ -208,7 +208,7 @@ static int is_mlnx_ext_port_info_supported(ibnd_port_t * port) - devid == 0x1ba0 || - (devid >= 0x1bd0 && devid <= 0x1bd5)))) - return 1; -- if ((devid >= 0x1003 && devid <= 0x101b) || -+ if ((devid >= 0x1003 && devid <= 0x101b) || (devid == 0xa2d2) || - ((vendorid == 0x119f) && - /* Bull ConnectX3 */ - (devid == 0x1b33 || devid == 0x1b73 || -diff --git a/src/ibdiag_common.c b/src/ibdiag_common.c -index 41b749c..a3aaada 100644 ---- a/src/ibdiag_common.c -+++ b/src/ibdiag_common.c -@@ -553,6 +553,7 @@ int is_mlnx_ext_port_info_supported(uint32_t vendorid, - (devid >= 0x1bd0 && devid <= 0x1bd5)))) - return 1; - if ((devid >= 0x1003 && devid <= 0x101b) || -+ (devid == 0xa2d2) || - ((vendorid == 0x119f) && - /* Bull ConnectX3 */ - (devid == 0x1b33 || devid == 0x1b73 || -diff --git a/src/vendstat.c b/src/vendstat.c -index 5a3af21..71d7b98 100644 ---- a/src/vendstat.c -+++ b/src/vendstat.c -@@ -150,6 +150,7 @@ static uint16_t ext_fw_info_device[][2] = { - {0xd2f0, 0xd2f0}, /* Quantum */ - {0x01b3, 0x01b3}, /* IS-4 */ - {0x1003, 0x101b}, /* Connect-X */ -+ {0xa2d2, 0xa2d2}, /* BlueField */ - {0x1b02, 0x1b02}, /* Bull SwitchX */ - {0x1b50, 0x1b50}, /* Bull SwitchX */ - {0x1ba0, 0x1ba0}, /* Bull SwitchIB */ --- -2.14.4 - diff --git a/SPECS/infiniband-diags.spec b/SPECS/infiniband-diags.spec index 23bd2eb..f2d7387 100644 --- a/SPECS/infiniband-diags.spec +++ b/SPECS/infiniband-diags.spec @@ -1,15 +1,13 @@ Name: infiniband-diags Summary: OpenFabrics Alliance InfiniBand Diagnostic Tools -Version: 2.1.0 -Release: 1%{?dist} +Version: 2.2.0 +Release: 3%{?dist} # Upstream allows either license to be used License: GPLv2 or BSD Url: https://github.com/linux-rdma/infiniband-diags Source0: https://github.com/linux-rdma/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch1: 0001-Add-latest-new-device-ID-to-device-white-lists.patch BuildRequires: gcc -BuildRequires: glib2-devel BuildRequires: libibumad-devel BuildRequires: opensm-devel Provides: perl(IBswcountlimits) @@ -60,7 +58,6 @@ Static libraries for the infiniband-diags and libibmad libraries. %prep %setup -%patch1 -p1 %build %configure --enable-compat-utils @@ -201,6 +198,18 @@ find ${RPM_BUILD_ROOT} -type f -name '*.la' -print -delete %{_libdir}/*.a %changelog +* Fri May 31 2019 Honggang Li - 2.2.0-3 +- Add 'make' as dependency for gating case +- Resolves: bz1682387 + +* Fri May 31 2019 Honggang Li - 2.2.0-2 +- Fix an OSCI gating issue +- Resolves: bz1682387 + +* Thu May 30 2019 Honggang Li - 2.2.0-1 +- Rebase to latest upstream release v2.2.0 +- Resolves: bz1709390 + * Tue Sep 25 2018 Honggang Li - 2.1.0-1 - Rebase to latest upstream release v2.1.0 - Resolves: bz1630652