import opa-ff-10.11.0.1.1-1.el8

2021-10-06 13:46:41 -04:00 · 2021-10-06 13:46:41 -04:00 · 183b7cf51b
commit 183b7cf51b
parent 1e70d0c60f
5 changed files with 18 additions and 563 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/opa-ff-10.10.3.0.11.tar.xz
+SOURCES/opa-ff-10.11.0.1.1.tar.xz
--- a/.opa-ff.metadata
+++ b/.opa-ff.metadata
@ -1 +1 @@
-2b1d9c6dd865d46e1e2bf1e0b00e972cc235ea9a SOURCES/opa-ff-10.10.3.0.11.tar.xz
+19c227a29953dd97b66d73ef218931e60dbd7b09 SOURCES/opa-ff-10.11.0.1.1.tar.xz
--- a/SOURCES/0001-Add-shebang-for-exp-scripts.patch
+++ b/SOURCES/0001-Add-shebang-for-exp-scripts.patch
@ -1,461 +0,0 @@
-From 4d59ba60ed000eff0d7a7afb240568287cea3117 Mon Sep 17 00:00:00 2001
-From: Honggang Li <honli@redhat.com>
-Date: Mon, 16 Nov 2020 08:28:57 +0800
-Subject: [PATCH] Add shebang for exp scripts
-
-The shebang '#!/usr/bin/expect -f' will make opa-ff packages require
-expect rpm package.
-
-Following bash script had been applied to fix this issue.
-
-for f in $(find -type f -name '*.exp') ; do
-        sed -e '1 i\#!/usr/bin/expect -f' -i $f
-done
-
-Signed-off-by: Honggang Li <honli@redhat.com>
---
- IbaTools/FastFabric/chassis_configure.exp          | 1 +
- IbaTools/FastFabric/chassis_fmconfig.exp           | 1 +
- IbaTools/FastFabric/chassis_fmcontrol.exp          | 1 +
- IbaTools/FastFabric/chassis_fmgetconfig.exp        | 1 +
- IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp | 1 +
- IbaTools/FastFabric/chassis_fmsecurityfiles.exp    | 1 +
- IbaTools/FastFabric/chassis_getconfig.exp          | 1 +
- IbaTools/FastFabric/chassis_reboot.exp             | 1 +
- IbaTools/FastFabric/chassis_upgrade.exp            | 1 +
- IbaTools/FastFabric/configipoib.exp                | 1 +
- IbaTools/FastFabric/ff_function.exp                | 1 +
- IbaTools/FastFabric/ipoibping.exp                  | 1 +
- IbaTools/FastFabric/load.exp                       | 1 +
- IbaTools/FastFabric/mpiperf.exp                    | 1 +
- IbaTools/FastFabric/mpiperfdeviation.exp           | 1 +
- IbaTools/FastFabric/reboot.exp                     | 1 +
- IbaTools/FastFabric/sacache.exp                    | 1 +
- IbaTools/FastFabric/switch_capture.exp             | 1 +
- IbaTools/FastFabric/switch_configure.exp           | 1 +
- IbaTools/FastFabric/switch_dump.exp                | 1 +
- IbaTools/FastFabric/switch_fwverify.exp            | 1 +
- IbaTools/FastFabric/switch_getconfig.exp           | 1 +
- IbaTools/FastFabric/switch_hwvpd.exp               | 1 +
- IbaTools/FastFabric/switch_info.exp                | 1 +
- IbaTools/FastFabric/switch_ping.exp                | 1 +
- IbaTools/FastFabric/switch_reboot.exp              | 1 +
- IbaTools/FastFabric/switch_upgrade.exp             | 1 +
- IbaTools/FastFabric/upgrade.exp                    | 1 +
- TestTools/basic.exp                                | 1 +
- TestTools/chassis.exp                              | 1 +
- TestTools/common_funcs.exp                         | 1 +
- TestTools/defs.exp                                 | 1 +
- TestTools/extmng.exp                               | 1 +
- TestTools/ib.exp                                   | 1 +
- TestTools/ibtools.exp                              | 1 +
- TestTools/install.exp                              | 1 +
- TestTools/mpi.exp                                  | 1 +
- TestTools/network.exp                              | 1 +
- TestTools/opa_to_xml.exp                           | 1 +
- TestTools/proc_mgr.exp                             | 1 +
- TestTools/sm_control.exp                           | 1 +
- TestTools/switch_methods.exp                       | 1 +
- TestTools/target.exp                               | 1 +
- TestTools/tools.exp                                | 1 +
- 44 files changed, 44 insertions(+)
-
-diff --git a/IbaTools/FastFabric/chassis_configure.exp b/IbaTools/FastFabric/chassis_configure.exp
-index f18397fb794d..e373a46ca572 100644
--- a/IbaTools/FastFabric/chassis_configure.exp
-+++ b/IbaTools/FastFabric/chassis_configure.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_fmconfig.exp b/IbaTools/FastFabric/chassis_fmconfig.exp
-index 9ec04cc20b5d..8040a3773611 100644
--- a/IbaTools/FastFabric/chassis_fmconfig.exp
-+++ b/IbaTools/FastFabric/chassis_fmconfig.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_fmcontrol.exp b/IbaTools/FastFabric/chassis_fmcontrol.exp
-index 477953a9dc0f..2d69a0b2168d 100644
--- a/IbaTools/FastFabric/chassis_fmcontrol.exp
-+++ b/IbaTools/FastFabric/chassis_fmcontrol.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_fmgetconfig.exp b/IbaTools/FastFabric/chassis_fmgetconfig.exp
-index 2e61cde7241e..200d2d10dac2 100644
--- a/IbaTools/FastFabric/chassis_fmgetconfig.exp
-+++ b/IbaTools/FastFabric/chassis_fmgetconfig.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp b/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp
-index d31e055ff22f..731b6ca98f4b 100644
--- a/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp
-+++ b/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_fmsecurityfiles.exp b/IbaTools/FastFabric/chassis_fmsecurityfiles.exp
-index 5c2a45dfe394..5f162b839ca9 100644
--- a/IbaTools/FastFabric/chassis_fmsecurityfiles.exp
-+++ b/IbaTools/FastFabric/chassis_fmsecurityfiles.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_getconfig.exp b/IbaTools/FastFabric/chassis_getconfig.exp
-index 7454afce2e9d..4d7b2651fb3a 100644
--- a/IbaTools/FastFabric/chassis_getconfig.exp
-+++ b/IbaTools/FastFabric/chassis_getconfig.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_reboot.exp b/IbaTools/FastFabric/chassis_reboot.exp
-index b5f1f39b7d2a..36b1ef054a65 100644
--- a/IbaTools/FastFabric/chassis_reboot.exp
-+++ b/IbaTools/FastFabric/chassis_reboot.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_upgrade.exp b/IbaTools/FastFabric/chassis_upgrade.exp
-index b2aa797b671e..df0eb7a6194a 100644
--- a/IbaTools/FastFabric/chassis_upgrade.exp
-+++ b/IbaTools/FastFabric/chassis_upgrade.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/configipoib.exp b/IbaTools/FastFabric/configipoib.exp
-index 10673114e371..f6b29b728ca7 100644
--- a/IbaTools/FastFabric/configipoib.exp
-+++ b/IbaTools/FastFabric/configipoib.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/ff_function.exp b/IbaTools/FastFabric/ff_function.exp
-index ab64a00d054a..73ca780a89a9 100644
--- a/IbaTools/FastFabric/ff_function.exp
-+++ b/IbaTools/FastFabric/ff_function.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/ipoibping.exp b/IbaTools/FastFabric/ipoibping.exp
-index 5739e6072066..5256620d1400 100644
--- a/IbaTools/FastFabric/ipoibping.exp
-+++ b/IbaTools/FastFabric/ipoibping.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/load.exp b/IbaTools/FastFabric/load.exp
-index b9d07514d3be..0a6b394f61f8 100644
--- a/IbaTools/FastFabric/load.exp
-+++ b/IbaTools/FastFabric/load.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/mpiperf.exp b/IbaTools/FastFabric/mpiperf.exp
-index 3b69e3a6e0dd..c5cab3b59972 100644
--- a/IbaTools/FastFabric/mpiperf.exp
-+++ b/IbaTools/FastFabric/mpiperf.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/mpiperfdeviation.exp b/IbaTools/FastFabric/mpiperfdeviation.exp
-index bcd9839b16a0..48882e71d2dc 100644
--- a/IbaTools/FastFabric/mpiperfdeviation.exp
-+++ b/IbaTools/FastFabric/mpiperfdeviation.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/reboot.exp b/IbaTools/FastFabric/reboot.exp
-index 53fc4b6d6d20..1f9d7d9721d4 100644
--- a/IbaTools/FastFabric/reboot.exp
-+++ b/IbaTools/FastFabric/reboot.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/sacache.exp b/IbaTools/FastFabric/sacache.exp
-index b9c188d02a8a..ae5f5605d33d 100644
--- a/IbaTools/FastFabric/sacache.exp
-+++ b/IbaTools/FastFabric/sacache.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/switch_capture.exp b/IbaTools/FastFabric/switch_capture.exp
-index 4e7054df4024..ceebd2b54c1f 100644
--- a/IbaTools/FastFabric/switch_capture.exp
-+++ b/IbaTools/FastFabric/switch_capture.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/switch_configure.exp b/IbaTools/FastFabric/switch_configure.exp
-index 3516482b53ee..91fa0ba60eb5 100644
--- a/IbaTools/FastFabric/switch_configure.exp
-+++ b/IbaTools/FastFabric/switch_configure.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/switch_dump.exp b/IbaTools/FastFabric/switch_dump.exp
-index dae0e5b26d45..fe998226a5f4 100644
--- a/IbaTools/FastFabric/switch_dump.exp
-+++ b/IbaTools/FastFabric/switch_dump.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/switch_fwverify.exp b/IbaTools/FastFabric/switch_fwverify.exp
-index 7cf1101384ec..449401e7d37b 100644
--- a/IbaTools/FastFabric/switch_fwverify.exp
-+++ b/IbaTools/FastFabric/switch_fwverify.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- 
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
-diff --git a/IbaTools/FastFabric/switch_getconfig.exp b/IbaTools/FastFabric/switch_getconfig.exp
-index 30d6b3fbdc60..39447661e11e 100644
--- a/IbaTools/FastFabric/switch_getconfig.exp
-+++ b/IbaTools/FastFabric/switch_getconfig.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- 
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
-diff --git a/IbaTools/FastFabric/switch_hwvpd.exp b/IbaTools/FastFabric/switch_hwvpd.exp
-index 266518cc119c..dfb1ef28ac84 100644
--- a/IbaTools/FastFabric/switch_hwvpd.exp
-+++ b/IbaTools/FastFabric/switch_hwvpd.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- 
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
-diff --git a/IbaTools/FastFabric/switch_info.exp b/IbaTools/FastFabric/switch_info.exp
-index 735a5e5303a2..cfecfce1d6c7 100644
--- a/IbaTools/FastFabric/switch_info.exp
-+++ b/IbaTools/FastFabric/switch_info.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- 
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
-diff --git a/IbaTools/FastFabric/switch_ping.exp b/IbaTools/FastFabric/switch_ping.exp
-index 87733455e0de..8230dc227d4c 100644
--- a/IbaTools/FastFabric/switch_ping.exp
-+++ b/IbaTools/FastFabric/switch_ping.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- 
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
-diff --git a/IbaTools/FastFabric/switch_reboot.exp b/IbaTools/FastFabric/switch_reboot.exp
-index 1ee19eaa06f6..572f92f82afa 100644
--- a/IbaTools/FastFabric/switch_reboot.exp
-+++ b/IbaTools/FastFabric/switch_reboot.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/switch_upgrade.exp b/IbaTools/FastFabric/switch_upgrade.exp
-index 6c5c1041a179..336572bb43ea 100644
--- a/IbaTools/FastFabric/switch_upgrade.exp
-+++ b/IbaTools/FastFabric/switch_upgrade.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/IbaTools/FastFabric/upgrade.exp b/IbaTools/FastFabric/upgrade.exp
-index dd4abe573690..cae30ad3addb 100644
--- a/IbaTools/FastFabric/upgrade.exp
-+++ b/IbaTools/FastFabric/upgrade.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015-2017, Intel Corporation
-diff --git a/TestTools/basic.exp b/TestTools/basic.exp
-index 4ffe1f5dbb10..b3362abff462 100644
--- a/TestTools/basic.exp
-+++ b/TestTools/basic.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/chassis.exp b/TestTools/chassis.exp
-index 93265e2d30ed..a01b730617ff 100644
--- a/TestTools/chassis.exp
-+++ b/TestTools/chassis.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- #
- # Copyright (c) 2015-2020, Intel Corporation
-diff --git a/TestTools/common_funcs.exp b/TestTools/common_funcs.exp
-index 68d55d8fdf48..7f62eb8c50dd 100644
--- a/TestTools/common_funcs.exp
-+++ b/TestTools/common_funcs.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/defs.exp b/TestTools/defs.exp
-index 8e1a8e6e816d..ecb3e64275cc 100644
--- a/TestTools/defs.exp
-+++ b/TestTools/defs.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/extmng.exp b/TestTools/extmng.exp
-index cf6d989fc8f5..08324a1118ca 100644
--- a/TestTools/extmng.exp
-+++ b/TestTools/extmng.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- #
- # Copyright (c) 2015-2020, Intel Corporation
-diff --git a/TestTools/ib.exp b/TestTools/ib.exp
-index 06c4a6ecc645..8e949cd3093b 100644
--- a/TestTools/ib.exp
-+++ b/TestTools/ib.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/ibtools.exp b/TestTools/ibtools.exp
-index 36b945c565eb..36bfdbffb1ad 100644
--- a/TestTools/ibtools.exp
-+++ b/TestTools/ibtools.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/install.exp b/TestTools/install.exp
-index 773676547a28..8f64eb3046b7 100644
--- a/TestTools/install.exp
-+++ b/TestTools/install.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/mpi.exp b/TestTools/mpi.exp
-index f3b7e29fb0d0..6d089c8f38be 100644
--- a/TestTools/mpi.exp
-+++ b/TestTools/mpi.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- #
- # Copyright (c) 2015-2020, Intel Corporation
-diff --git a/TestTools/network.exp b/TestTools/network.exp
-index c1b8867019f0..b91a1ed1ce1c 100644
--- a/TestTools/network.exp
-+++ b/TestTools/network.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/opa_to_xml.exp b/TestTools/opa_to_xml.exp
-index f81f07ae8c00..f8aafa6e2324 100644
--- a/TestTools/opa_to_xml.exp
-+++ b/TestTools/opa_to_xml.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- #
- # Copyright (c) 2015-2020, Intel Corporation
-diff --git a/TestTools/proc_mgr.exp b/TestTools/proc_mgr.exp
-index abcb65d214ec..94cb60fd8648 100644
--- a/TestTools/proc_mgr.exp
-+++ b/TestTools/proc_mgr.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/sm_control.exp b/TestTools/sm_control.exp
-index 7f08ccb0e6e0..bc89ad4d3f69 100644
--- a/TestTools/sm_control.exp
-+++ b/TestTools/sm_control.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/switch_methods.exp b/TestTools/switch_methods.exp
-index 9f1377397dcb..3b2b14f96d45 100644
--- a/TestTools/switch_methods.exp
-+++ b/TestTools/switch_methods.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/target.exp b/TestTools/target.exp
-index 8d8311aaa1a6..b0f7603e9219 100644
--- a/TestTools/target.exp
-+++ b/TestTools/target.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- #
- # Copyright (c) 2015-2020, Intel Corporation
-diff --git a/TestTools/tools.exp b/TestTools/tools.exp
-index 850e7891b035..aa7f825d72da 100644
--- a/TestTools/tools.exp
-+++ b/TestTools/tools.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-- 
-2.25.4
-
--- a/SOURCES/update-ff-install-script.patch
+++ b/SOURCES/update-ff-install-script.patch
@ -1,85 +0,0 @@
-From 2cf055959d546fba23876797a0bbe7ac68d44a6f Mon Sep 17 00:00:00 2001
-From: Honggang Li <honli@redhat.com>
-Date: Mon, 16 Nov 2020 08:35:57 +0800
-Subject: [PATCH] update ff-install script
-
-Signed-off-by: Honggang Li <honli@redhat.com>
---
- OpenIb_Host/ff_filegroups.sh | 16 ++--------------
- OpenIb_Host/ff_install.sh    |  7 -------
- 2 files changed, 2 insertions(+), 21 deletions(-)
-
-diff --git a/OpenIb_Host/ff_filegroups.sh b/OpenIb_Host/ff_filegroups.sh
-index ba3aff031d7c..e457b6e4611a 100644
--- a/OpenIb_Host/ff_filegroups.sh
-+++ b/OpenIb_Host/ff_filegroups.sh
-@@ -1,5 +1,5 @@
- basic_tools_sbin="opacapture opafabricinfo opagetvf opagetvf_env opahfirev
-	opapacketcapture opaportinfo oparesolvehfiport opasaquery opasmaquery
-+	opaportinfo oparesolvehfiport opasaquery opasmaquery
- 	opainfo"
- 
- basic_tools_sbin_sym="opapmaquery opaportconfig"
-@@ -7,7 +7,7 @@ basic_tools_sbin_sym="opapmaquery opaportconfig"
- basic_tools_opt="setup_self_ssh usemem opaipcalc stream"
- 
- basic_mans="opacapture.1 opafabricinfo.1 opagetvf.1
-	opagetvf_env.1 opahfirev.1 opainfo.1 opapacketcapture.1 opapmaquery.1
-+	opagetvf_env.1 opahfirev.1 opainfo.1 opapmaquery.1
- 	opaportconfig.1 opaportinfo.1 oparesolvehfiport.1 opasaquery.1
- 	opasmaquery.1"
- 
-@@ -91,16 +91,4 @@ opamgt_iba_public_headers="datatypes.h datatypes_osd.h ibyteswap.h ibyteswap_osd
- 	ilist.h imath.h imemory.h imemory_osd.h ipackoff.h ipackon.h ispinlock.h
- 	ispinlock_osd.h statustext.h iethernet.h"
- 
-opamgt_examples="paquery.c saquery.c simple_sa_query.c simple_sa_notice.c simple_pa_query.c
-	job_schedule.c show_switch_cost_matrix.c Makefile README"
-
-mpi_apps_files="Makefile mpi_hosts.sample README prepare_run select_mpi run_bw
-	get_selected_mpi.sh get_mpi_cc.sh *.params gen_group_hosts gen_mpi_hosts
-	mpi_cleanup stop_daemons hpl_dat_gen config_hpl2 run_hpl2 run_lat run_imb run_lat2
-	run_bw2 run_bibw2 run_bcast2 run_app runmyapp mpicheck run_mpicheck run_deviation
-	run_multibw run_mpi_stress run_osu run_cabletest run_allhfilatency run_nxnlatbw
-	run_alltoall3 run_bcast3 run_bibw3 run_bw3 run_lat3 run_mbw_mr3 run_multi_lat3
-	run_batch_script run_batch_cabletest hpl-count.diff groupstress deviation
-	hpl-config/HPL.dat-* hpl-config/README mpicc mpicxx mpif77"
-
- opasnapconfig_bin=
-diff --git a/OpenIb_Host/ff_install.sh b/OpenIb_Host/ff_install.sh
-index 9430648fcfcd..3da59bbcfdff 100755
--- a/OpenIb_Host/ff_install.sh
-+++ b/OpenIb_Host/ff_install.sh
-@@ -29,10 +29,8 @@ mkdir -p ${DESTDIR}/etc/opa
- mkdir -p ${DESTDIR}/etc/cron.d
- mkdir -p ${DESTDIR}/usr/include/infiniband
- mkdir -p ${DESTDIR}/usr/include/opamgt/iba/public
-mkdir -p ${DESTDIR}/usr/src/opamgt
- mkdir -p ${DESTDIR}/usr/share/man/man1
- mkdir -p ${DESTDIR}/usr/share/man/man8
-mkdir -p ${DESTDIR}/usr/src/opa/mpi_apps
- 
- #Binaries and scripts installing (basic tools)
- #cd builtbin.OPENIB_FF.release
-@@ -52,7 +50,6 @@ cd ../opamgt
- cp -t ${DESTDIR}/usr/include/opamgt $opamgt_headers
- cp -t ${DESTDIR}/usr/include/opamgt/iba $opamgt_iba_headers
- cp -t ${DESTDIR}/usr/include/opamgt/iba/public $opamgt_iba_public_headers
-cp -t ${DESTDIR}/usr/src/opamgt $opamgt_examples
- 
- OPAMGT_VERNO_MAJOR=$(cat version | cut -d . -f 1)
- 
-@@ -92,10 +89,6 @@ cd ../man8
- cp -t ${DESTDIR}/usr/share/man/man8 $ff_mans
- cd ..
- 
-cd ../src/mpi/mpi_apps
-tar -xzf mpi_apps.tgz -C ${DESTDIR}/usr/src/opa/mpi_apps/
-cd ../../
-
- #Config files
- cd ../config
- cp -t ${DESTDIR}/etc/rdma dsap.conf
-- 
-2.25.4
-
--- a/SPECS/opa-ff.spec
+++ b/SPECS/opa-ff.spec
@ -1,19 +1,17 @@
 Name:    opa-ff
 Epoch: 1
-Version: 10.10.3.0.11
+Version: 10.11.0.1.1
 Release: 1%{?dist}
 Summary: Intel Omni-Path basic tools and libraries for fabric management
 License: BSD or GPLv2
-Url: https://github.com/intel/opa-ff
+Url: https://github.com/cornelisnetworks/opa-ff
 # tarball created by:
-# git clone https://github.com/intel/opa-ff.git
+# git clone https://github.com/cornelisnetworks/opa-ff.git
 # cd opa-ff
 # git archive --format=tar --prefix=opa-ff-%{version}/ \
-# 24a3b31bd02627015a0766c9d7050370005e0a4b | xz > opa-ff-%{version}.tar.xz
+# 33b114edae0b0e118dd61b07dd5048d7dbd96d77 | xz > opa-ff-%{version}.tar.xz
 Source: %{name}-%{version}.tar.xz

-Patch0006: 0001-Add-shebang-for-exp-scripts.patch
-Patch0007: update-ff-install-script.patch
 Patch0008: 0001-Link-executables-with-pie.patch
 Patch0009: 0002-Lets-build-config-decide-C-optimization-flags.patch
 Patch0010: 0003-Replace-strdupa-with-strdup.patch
@ -41,7 +39,7 @@ Contains basic tools for fabric management necessary on all compute nodes.
 %package -n opa-address-resolution
 Summary: OPA Address Resolution manager
 Requires: opa-basic-tools%{?_isa}
-Requires: ibacm
+Requires: opa-basic-tools%{?_isa} ibacm

 %description -n opa-address-resolution
 This package contains the ibacm distributed SA provider (dsap) for
@ -51,7 +49,7 @@ by dsap.

 %package -n opa-fastfabric
 Summary: Management level tools and scripts
-Requires: opa-basic-tools%{?_isa}
+Requires: opa-basic-tools%{?_isa} cronie

 %description -n opa-fastfabric
 Contains tools for managing fabric on a management node.
@ -73,15 +71,10 @@ This package contains the necessary headers for opamgt development.

 %prep
 %setup -q
-%patch0006 -p1
-%patch0007 -p1
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1

-find . -type f -name '*.[ch]' -exec 'chmod' 'a-x' '{}' ';'
-find . -type f -name '*.exp'  -exec 'chmod' 'a+x' '{}' ';'
-
 # Make it possible to override hardcoded compiler flags
 sed -i -r -e 's/(release_C(C)?OPT_Flags\s*)=/\1?=/' Makerules/Target.LINUX.GNU.*

@ -92,12 +85,12 @@ export release_COPT_Flags='%{optflags}'
 export release_CCOPT_Flags='%{optflags}'

 cd OpenIb_Host
-OPA_FEATURE_SET= ./ff_build.sh %{_builddir} $BUILD_ARGS
+OPA_FEATURE_SET=opa10 ./ff_build.sh %{_builddir} $BUILD_ARGS

 %install
 BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libdir} ./OpenIb_Host/ff_install.sh
 # https://github.com/linux-rdma/rdma-core/pull/848
-(cd %{buildroot}/%{_libdir}/ibacm && ln -s libdsap.so.1.0.0 libdsap.so)
+(cd %{buildroot}/%{_libdir}/ibacm && ln libdsap.so.1.0.0 libdsap.so)

 %post -n opa-address-resolution -p /sbin/ldconfig
 %postun -n opa-address-resolution -p /sbin/ldconfig
@ -112,6 +105,7 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd
 %{_sbindir}/opagetvf
 %{_sbindir}/opagetvf_env
 %{_sbindir}/opahfirev
+%exclude %{_sbindir}/opapacketcapture
 %{_sbindir}/opaportinfo
 %{_sbindir}/oparesolvehfiport
 %{_sbindir}/opasaquery
@ -129,6 +123,7 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd
 %{_mandir}/man1/opagetvf_env.1.gz
 %{_mandir}/man1/opahfirev.1.gz
 %{_mandir}/man1/opainfo.1.gz
+%exclude %{_mandir}/man1/opapacketcapture.1.gz
 %{_mandir}/man1/opapmaquery.1.gz
 %{_mandir}/man1/opaportconfig.1.gz
 %{_mandir}/man1/opaportinfo.1.gz
@ -362,6 +357,8 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd
 %{_mandir}/man8/opafirmware.8.gz
 %{_mandir}/man8/opaextractmissinglinks.8.gz
 %{_mandir}/man8/opa2rm.8.gz
+%exclude %{_usrsrc}/opa
+%exclude %{_usrsrc}/opamgt
 %{_sysconfdir}/opa/opamon.si.conf
 # Replace opamon.si.conf, as it's a template config file.
 %config(noreplace) %{_sysconfdir}/opa/opafastfabric.conf
@ -402,6 +399,10 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd
 %{_includedir}/opamgt

 %changelog
+* Tue May 25 2021 Honggang Li <honli@redhat.com> - 10.11.0.1.1-1
+- Rebase to latest upstream release v10.11.0.1.1
+- Resolves: bz1920718
+
 * Mon Nov 16 2020 Honggang Li <honli@redhat.com> - 10.10.3.0.11-1
 - Rebase to latest upstream release v10.10.3.0.11
 - Resolves: bz1821734, bz1886812