.gitignore

@@ -1 +1 @@
-SOURCES/opa-ff-10.10.0.0.445.tar.xz
+SOURCES/v10.11.1.3.1.tar.gz

.opa-ff.metadata

@@ -1 +1 @@
-006554f29390126ec9bf41686d6a11b761c04f81 SOURCES/opa-ff-10.10.0.0.445.tar.xz
+2e2ac7f8ebf07d1107707d6cebd1bb8c71033ecb SOURCES/v10.11.1.3.1.tar.gz

SOURCES/0001-Add-shebang-for-exp-scripts.patch

@@ -1,461 +0,0 @@
-From 34b399805a680ebc5df110c4341729d6591d0e9c Mon Sep 17 00:00:00 2001
-From: Honggang Li <honli@redhat.com>
-Date: Tue, 11 Jun 2019 09:14:24 -0400
-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 f18397f..e373a46 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 9ec04cc..8040a37 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 477953a..2d69a0b 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 2e61cde..200d2d1 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 d31e055..731b6ca 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 5c2a45d..5f162b8 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 7454afc..4d7b265 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 b5f1f39..36b1ef0 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 b2aa797..df0eb7a 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 1067311..f6b29b7 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 ab64a00..73ca780 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 5739e60..5256620 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 b9d0751..0a6b394 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 3b69e3a..c5cab3b 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 bcd9839..48882e7 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 53fc4b6..1f9d7d9 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 b9c188d..ae5f560 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 4e7054d..ceebd2b 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 3516482..91fa0ba 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 dae0e5b..fe99822 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 7cf1101..449401e 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 30d6b3f..3944766 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 266518c..dfb1ef2 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 735a5e5..cfecfce 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 8773345..8230dc2 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 1ee19ea..572f92f 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 6c5c104..336572b 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 dd4abe5..cae30ad 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 4ffe1f5..b3362ab 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 9af2e9a..3ac72db 100644
---- a/TestTools/chassis.exp
-+++ b/TestTools/chassis.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/common_funcs.exp b/TestTools/common_funcs.exp
-index 68d55d8..7f62eb8 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 8e1a8e6..ecb3e64 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 b513c61..ac57364 100644
---- a/TestTools/extmng.exp
-+++ b/TestTools/extmng.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/ib.exp b/TestTools/ib.exp
-index 06c4a6e..8e949cd 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 36b945c..36bfdbf 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 7736765..8f64eb3 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 4fe36e9..05fedfa 100644
---- a/TestTools/mpi.exp
-+++ b/TestTools/mpi.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/network.exp b/TestTools/network.exp
-index c1b8867..b91a1ed 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 448bfb4..9e0d8bc 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, Intel Corporation
-diff --git a/TestTools/proc_mgr.exp b/TestTools/proc_mgr.exp
-index abcb65d..94cb60f 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 7f08ccb..bc89ad4 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 9f13773..3b2b14f 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 b10d199..305757a 100644
---- a/TestTools/target.exp
-+++ b/TestTools/target.exp
-@@ -1,3 +1,4 @@
-+#!/usr/bin/expect -f
- # BEGIN_ICS_COPYRIGHT8 ****************************************
- # 
- # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/tools.exp b/TestTools/tools.exp
-index 850e789..aa7f825 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.20.1
-

SOURCES/0001-Link-executables-with-pie.patch

@@ -1,4 +1,4 @@
-From 88089080e1abf37f782221869e46bee15399339b Mon Sep 17 00:00:00 2001
+From bd97a198a83d59ba26db24dfb99c9f65f218c6c4 Mon Sep 17 00:00:00 2001
 From: Honggang Li <honli@redhat.com>
 Date: Tue, 11 Jun 2019 09:20:52 -0400
 Subject: [PATCH 1/3] Link executables with '-pie'
@@ -10,7 +10,7 @@ Signed-off-by: Honggang Li <honli@redhat.com>
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/Esm/ib/src/linux/startup/fm_config/Makefile b/Esm/ib/src/linux/startup/fm_config/Makefile
-index c4108fa..cd3f301 100644
+index 2270be9921ec..59796585e8e4 100644
 --- a/Esm/ib/src/linux/startup/fm_config/Makefile
 +++ b/Esm/ib/src/linux/startup/fm_config/Makefile
 @@ -150,10 +150,10 @@ include $(TL_DIR)/Makerules/Maketargets.build
@@ -27,7 +27,7 @@ index c4108fa..cd3f301 100644
  # install for stage phase
  #include $(TL_DIR)/Makerules/Maketargets.stage
 diff --git a/Makerules/Maketargets.build b/Makerules/Maketargets.build
-index ebf9fdf..9cd7844 100755
+index ebf9fdfdf8dd..9cd78442fc49 100755
 --- a/Makerules/Maketargets.build
 +++ b/Makerules/Maketargets.build
 @@ -127,7 +127,7 @@ else # BUILD_TARGET_OS is not VXWORKS
@@ -40,5 +40,5 @@ index ebf9fdf..9cd7844 100755
  endif # CMD_TARGETS_EXE non-null
  
 -- 
-2.20.1
+2.25.4
 

SOURCES/0002-Lets-build-config-decide-C-optimization-flags.patch

@@ -1,4 +1,4 @@
-From d8aa76c06080e3a627e0d2872ad0a60b034b764b Mon Sep 17 00:00:00 2001
+From f5628b82a017e619106f561e3ec69aa21940adec Mon Sep 17 00:00:00 2001
 From: Honggang Li <honli@redhat.com>
 Date: Tue, 11 Jun 2019 09:31:24 -0400
 Subject: [PATCH 2/3] Lets build config decide C optimization flags
@@ -17,7 +17,7 @@ Signed-off-by: Honggang Li <honli@redhat.com>
  9 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/Dsap/Makefile b/Dsap/Makefile
-index 64aeb2d..e66d0aa 100644
+index 77b976cbb074..0edd6e971c66 100644
 --- a/Dsap/Makefile
 +++ b/Dsap/Makefile
 @@ -133,8 +133,8 @@ include $(TL_DIR)/$(PROJ_FILE_DIR)/Makerules.project
@@ -32,7 +32,7 @@ index 64aeb2d..e66d0aa 100644
  
  #=============================================================================#
 diff --git a/IbaTools/stream/Makefile b/IbaTools/stream/Makefile
-index 7ed670d..9284a91 100644
+index fd963af19fdf..47f03fbbe236 100644
 --- a/IbaTools/stream/Makefile
 +++ b/IbaTools/stream/Makefile
 @@ -125,7 +125,7 @@ include $(TL_DIR)/IbaTools/Makerules.module
@@ -45,7 +45,7 @@ index 7ed670d..9284a91 100644
  
  #=============================================================================#
 diff --git a/opasadb/path_tools/cache/Makefile b/opasadb/path_tools/cache/Makefile
-index 769bad7..61b9ec9 100644
+index 769bad731386..61b9ec9ba8e8 100644
 --- a/opasadb/path_tools/cache/Makefile
 +++ b/opasadb/path_tools/cache/Makefile
 @@ -129,7 +129,7 @@ include $(TL_DIR)/IbaTools/Makerules.module
@@ -58,7 +58,7 @@ index 769bad7..61b9ec9 100644
  #					 (Windows Only)
  #USEMFC	= How Windows MFC should be used (none, static, shared, no_mfc) [none]
 diff --git a/opasadb/path_tools/dump/Makefile b/opasadb/path_tools/dump/Makefile
-index 4562df3..ecc91d7 100644
+index 4562df3eee98..ecc91d76898a 100644
 --- a/opasadb/path_tools/dump/Makefile
 +++ b/opasadb/path_tools/dump/Makefile
 @@ -129,7 +129,7 @@ include $(TL_DIR)/IbaTools/Makerules.module
@@ -71,7 +71,7 @@ index 4562df3..ecc91d7 100644
  #					 (Windows Only)
  #USEMFC	= How Windows MFC should be used (none, static, shared, no_mfc) [none]
 diff --git a/opasadb/path_tools/exercise/Makefile b/opasadb/path_tools/exercise/Makefile
-index ebed0f5..2f164ee 100644
+index ebed0f5a651b..2f164eea0c45 100644
 --- a/opasadb/path_tools/exercise/Makefile
 +++ b/opasadb/path_tools/exercise/Makefile
 @@ -129,7 +129,7 @@ include $(TL_DIR)/IbaTools/Makerules.module
@@ -84,7 +84,7 @@ index ebed0f5..2f164ee 100644
  #					 (Windows Only)
  #USEMFC	= How Windows MFC should be used (none, static, shared, no_mfc) [none]
 diff --git a/opasadb/path_tools/load/Makefile b/opasadb/path_tools/load/Makefile
-index 4e9d10b..640d284 100644
+index a30c8119477a..f1aa4579bfb0 100644
 --- a/opasadb/path_tools/load/Makefile
 +++ b/opasadb/path_tools/load/Makefile
 @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module
@@ -97,7 +97,7 @@ index 4e9d10b..640d284 100644
  #					 (Windows Only)
  #USEMFC	= How Windows MFC should be used (none, static, shared, no_mfc) [none]
 diff --git a/opasadb/path_tools/perf/Makefile b/opasadb/path_tools/perf/Makefile
-index 5029c4a..b3e448c 100644
+index 5029c4a53917..b3e448cfb5ed 100644
 --- a/opasadb/path_tools/perf/Makefile
 +++ b/opasadb/path_tools/perf/Makefile
 @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module
@@ -110,7 +110,7 @@ index 5029c4a..b3e448c 100644
  #					 (Windows Only)
  #USEMFC	= How Windows MFC should be used (none, static, shared, no_mfc) [none]
 diff --git a/opasadb/path_tools/query/Makefile b/opasadb/path_tools/query/Makefile
-index 0b6e480..75fe5c4 100644
+index 0b6e480f7e08..75fe5c48f35b 100644
 --- a/opasadb/path_tools/query/Makefile
 +++ b/opasadb/path_tools/query/Makefile
 @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module
@@ -123,7 +123,7 @@ index 0b6e480..75fe5c4 100644
  #					 (Windows Only)
  #USEMFC	= How Windows MFC should be used (none, static, shared, no_mfc) [none]
 diff --git a/opasadb/path_tools/query_many/Makefile b/opasadb/path_tools/query_many/Makefile
-index b7ff7d4..295fe8f 100644
+index c7b21d1cb579..796fb79a17b2 100644
 --- a/opasadb/path_tools/query_many/Makefile
 +++ b/opasadb/path_tools/query_many/Makefile
 @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module
@@ -136,5 +136,5 @@ index b7ff7d4..295fe8f 100644
  #					 (Windows Only)
  #USEMFC	= How Windows MFC should be used (none, static, shared, no_mfc) [none]
 -- 
-2.20.1
+2.25.4
 

SOURCES/0003-Replace-strdupa-with-strdup.patch

@@ -1,4 +1,4 @@
-From 7a41e075c288b83f10c76b31dfbe2f26dc556ff3 Mon Sep 17 00:00:00 2001
+From f43f9f4af179ad9a46815779e8cbe0bf97ec32cd Mon Sep 17 00:00:00 2001
 From: Honggang Li <honli@redhat.com>
 Date: Tue, 11 Jun 2019 09:33:28 -0400
 Subject: [PATCH 3/3] Replace 'strdupa' with 'strdup'
@@ -9,7 +9,7 @@ Signed-off-by: Honggang Li <honli@redhat.com>
  1 file changed, 13 insertions(+), 6 deletions(-)
 
 diff --git a/opasadb/path_tools/query/opa_osd_query.c b/opasadb/path_tools/query/opa_osd_query.c
-index 1f3371d..fa43c5e 100644
+index 2804eb245731..11725e7aa61a 100644
 --- a/opasadb/path_tools/query/opa_osd_query.c
 +++ b/opasadb/path_tools/query/opa_osd_query.c
 @@ -145,7 +145,7 @@ int main(int argc, char **argv)
@@ -78,5 +78,5 @@ index 1f3371d..fa43c5e 100644
 +	return -1;
  }
 -- 
-2.20.1
+2.25.4
 

SOURCES/update-ff-install-script.patch

@@ -1,85 +0,0 @@
-From 95795231441a2fcd9b0767f65beb4a59db0b923e Mon Sep 17 00:00:00 2001
-From: Honggang Li <honli@redhat.com>
-Date: Thu, 31 Oct 2019 11:25:14 +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 e7a0d8f..e457b6e 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 mpif77"
--
- opasnapconfig_bin=
-diff --git a/OpenIb_Host/ff_install.sh b/OpenIb_Host/ff_install.sh
-index 9430648..3da59bb 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.21.0
-

SPECS/opa-ff.spec

@@ -1,19 +1,12 @@
 Name:    opa-ff
 Epoch: 1
-Version: 10.10.0.0.445
+Version: 10.11.1.3.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
-# tarball created by:
-# git clone https://github.com/intel/opa-ff.git
-# cd opa-ff
-# git archive --format=tar --prefix=opa-ff-%{version}/ \
-# 9e61462bba6ffbf459848878b7147914629305a7 | xz > opa-ff-%{version}.tar.xz
-Source: %{name}-%{version}.tar.xz
+Url: https://github.com/cornelisnetworks/opa-ff
+Source: https://github.com/cornelisnetworks/opa-ff/archive/refs/tags/v%{version}.tar.gz
 
-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 +34,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 +44,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 +66,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,10 +80,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 libdsap.so.1.0.0 libdsap.so)
 
 %post -n opa-address-resolution -p /sbin/ldconfig
 %postun -n opa-address-resolution -p /sbin/ldconfig
@@ -110,6 +100,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
@@ -127,6 +118,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
@@ -360,6 +352,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
@@ -400,6 +394,26 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd
 %{_includedir}/opamgt
 
 %changelog
+* Wed Feb 08 2023 Michal Schmidt <mschmidt@redhat.com> - 10.11.1.3.1-1
+- Update to upstream version 10.11.1.3.1.
+- Resolves: rhbz#2110930
+
+* Tue Nov 09 2021 Honggang Li <honli@redhat.com> - 10.11.0.2-1
+- Rebase to latest upstream release v10.11.0.2
+- Resolves: bz1989157
+
+* 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
+
+* Wed Apr 15 2020 Honggang Li <honli@redhat.com> - 10.10.1.0.35-1
+- Rebase to latest upstream release v10.10.1.0.35
+- Resolves: bz1739280
+
 * Thu Oct 31 2019 Honggang Li <honli@redhat.com> - 10.10.0.0.445-1
 - Rebase to latest upstream release v10.10.0.0.445
 - Resolves: bz1719671