Accepting request 501879 from home:NMoreyChaisemartin:branches:science:HPC

- Update to v10.4.0.0.197 * No changelog available - Update opa-ff_fix_suse_build_issue.patch and 0001-Add-shebang-for-exp-files.patch to new sources OBS-URL: https://build.opensuse.org/request/show/501879 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=22
2017-06-08 11:26:38 +00:00
parent 85686fb2e9
commit f32ab495f7
7 changed files with 220 additions and 251 deletions
--- a/0001-Add-shebang-for-exp-files.patch
+++ b/0001-Add-shebang-for-exp-files.patch
@@ -1,451 +1,396 @@
-From 813223d5a286bd4c87c89d3a496b0e1dadca8ce8 Mon Sep 17 00:00:00 2001
-From: Nirmoy Das <ndas@suse.de>
-Date: Fri, 15 Apr 2016 12:56:30 +0200
-Subject: [PATCH] Add shebang for exp files
-
---
- 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 792369b..d41c468 100644
--- a/IbaTools/FastFabric/chassis_configure.exp
-+++ b/IbaTools/FastFabric/chassis_configure.exp
+diff --git IbaTools/FastFabric/chassis_configure.exp IbaTools/FastFabric/chassis_configure.exp
+index f18397f..38fb6d9 100644
+--- IbaTools/FastFabric/chassis_configure.exp
+++ IbaTools/FastFabric/chassis_configure.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_fmconfig.exp b/IbaTools/FastFabric/chassis_fmconfig.exp
-index b0613ad..d037ffc 100755
--- a/IbaTools/FastFabric/chassis_fmconfig.exp
-+++ b/IbaTools/FastFabric/chassis_fmconfig.exp
+diff --git IbaTools/FastFabric/chassis_fmconfig.exp IbaTools/FastFabric/chassis_fmconfig.exp
+index 986d799..ed26fe5 100755
+--- IbaTools/FastFabric/chassis_fmconfig.exp
+++ IbaTools/FastFabric/chassis_fmconfig.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_fmcontrol.exp b/IbaTools/FastFabric/chassis_fmcontrol.exp
-index a603f7b..52938e5 100755
--- a/IbaTools/FastFabric/chassis_fmcontrol.exp
-+++ b/IbaTools/FastFabric/chassis_fmcontrol.exp
+diff --git IbaTools/FastFabric/chassis_fmcontrol.exp IbaTools/FastFabric/chassis_fmcontrol.exp
+index ea3d546..5c67c2f 100755
+--- IbaTools/FastFabric/chassis_fmcontrol.exp
+++ IbaTools/FastFabric/chassis_fmcontrol.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_fmgetconfig.exp b/IbaTools/FastFabric/chassis_fmgetconfig.exp
-index b3582d4..d6e4d08 100755
--- a/IbaTools/FastFabric/chassis_fmgetconfig.exp
-+++ b/IbaTools/FastFabric/chassis_fmgetconfig.exp
+diff --git IbaTools/FastFabric/chassis_fmgetconfig.exp IbaTools/FastFabric/chassis_fmgetconfig.exp
+index dff298e..75b8abc 100755
+--- IbaTools/FastFabric/chassis_fmgetconfig.exp
+++ IbaTools/FastFabric/chassis_fmgetconfig.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp b/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp
-index 2630046..56a9d96 100755
--- a/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp
-+++ b/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp
+diff --git IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp
+index 99c38c1..cf63eac 100755
+--- IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp
+++ IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_fmsecurityfiles.exp b/IbaTools/FastFabric/chassis_fmsecurityfiles.exp
-index 3bbe788..70702f8 100755
--- a/IbaTools/FastFabric/chassis_fmsecurityfiles.exp
-+++ b/IbaTools/FastFabric/chassis_fmsecurityfiles.exp
+diff --git IbaTools/FastFabric/chassis_fmsecurityfiles.exp IbaTools/FastFabric/chassis_fmsecurityfiles.exp
+index b45aff1..a650423 100755
+--- IbaTools/FastFabric/chassis_fmsecurityfiles.exp
+++ IbaTools/FastFabric/chassis_fmsecurityfiles.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_getconfig.exp b/IbaTools/FastFabric/chassis_getconfig.exp
-index c1f4bcc..177be66 100644
--- a/IbaTools/FastFabric/chassis_getconfig.exp
-+++ b/IbaTools/FastFabric/chassis_getconfig.exp
+diff --git IbaTools/FastFabric/chassis_getconfig.exp IbaTools/FastFabric/chassis_getconfig.exp
+index 7454afc..f4415f1 100644
+--- IbaTools/FastFabric/chassis_getconfig.exp
+++ IbaTools/FastFabric/chassis_getconfig.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_reboot.exp b/IbaTools/FastFabric/chassis_reboot.exp
-index e746eb2..d76dadb 100755
--- a/IbaTools/FastFabric/chassis_reboot.exp
-+++ b/IbaTools/FastFabric/chassis_reboot.exp
+diff --git IbaTools/FastFabric/chassis_reboot.exp IbaTools/FastFabric/chassis_reboot.exp
+index f59330f..c2ca75f 100755
+--- IbaTools/FastFabric/chassis_reboot.exp
+++ IbaTools/FastFabric/chassis_reboot.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/chassis_upgrade.exp b/IbaTools/FastFabric/chassis_upgrade.exp
-index 2ed1cad..275dd07 100755
--- a/IbaTools/FastFabric/chassis_upgrade.exp
-+++ b/IbaTools/FastFabric/chassis_upgrade.exp
+diff --git IbaTools/FastFabric/chassis_upgrade.exp IbaTools/FastFabric/chassis_upgrade.exp
+index c255e01..b2a798a 100755
+--- IbaTools/FastFabric/chassis_upgrade.exp
+++ IbaTools/FastFabric/chassis_upgrade.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/configipoib.exp b/IbaTools/FastFabric/configipoib.exp
-index 40c91c8..f1e465b 100755
--- a/IbaTools/FastFabric/configipoib.exp
-+++ b/IbaTools/FastFabric/configipoib.exp
+diff --git IbaTools/FastFabric/configipoib.exp IbaTools/FastFabric/configipoib.exp
+index 7918866..e1207d4 100755
+--- IbaTools/FastFabric/configipoib.exp
+++ IbaTools/FastFabric/configipoib.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/ff_function.exp b/IbaTools/FastFabric/ff_function.exp
-index 94e39dc..1ebd07f 100755
--- a/IbaTools/FastFabric/ff_function.exp
-+++ b/IbaTools/FastFabric/ff_function.exp
+diff --git IbaTools/FastFabric/ff_function.exp IbaTools/FastFabric/ff_function.exp
+index 3590661..c151b90 100755
+--- IbaTools/FastFabric/ff_function.exp
+++ IbaTools/FastFabric/ff_function.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/ipoibping.exp b/IbaTools/FastFabric/ipoibping.exp
-index ec1806f..99128d4 100755
--- a/IbaTools/FastFabric/ipoibping.exp
-+++ b/IbaTools/FastFabric/ipoibping.exp
+diff --git IbaTools/FastFabric/ipoibping.exp IbaTools/FastFabric/ipoibping.exp
+index 17b0486..5520c4b 100755
+--- IbaTools/FastFabric/ipoibping.exp
+++ IbaTools/FastFabric/ipoibping.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/load.exp b/IbaTools/FastFabric/load.exp
-index 22d264c..cb2de07 100755
--- a/IbaTools/FastFabric/load.exp
-+++ b/IbaTools/FastFabric/load.exp
+diff --git IbaTools/FastFabric/load.exp IbaTools/FastFabric/load.exp
+index 91991e0..894ede3 100755
+--- IbaTools/FastFabric/load.exp
+++ IbaTools/FastFabric/load.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/mpiperf.exp b/IbaTools/FastFabric/mpiperf.exp
-index 2138757..022285f 100755
--- a/IbaTools/FastFabric/mpiperf.exp
-+++ b/IbaTools/FastFabric/mpiperf.exp
+diff --git IbaTools/FastFabric/mpiperf.exp IbaTools/FastFabric/mpiperf.exp
+index 630dc66..5e1cb17 100755
+--- IbaTools/FastFabric/mpiperf.exp
+++ IbaTools/FastFabric/mpiperf.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/mpiperfdeviation.exp b/IbaTools/FastFabric/mpiperfdeviation.exp
-index f09c161..478c71a 100755
--- a/IbaTools/FastFabric/mpiperfdeviation.exp
-+++ b/IbaTools/FastFabric/mpiperfdeviation.exp
+diff --git IbaTools/FastFabric/mpiperfdeviation.exp IbaTools/FastFabric/mpiperfdeviation.exp
+index a7fc679..ebdf07e 100755
+--- IbaTools/FastFabric/mpiperfdeviation.exp
+++ IbaTools/FastFabric/mpiperfdeviation.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/reboot.exp b/IbaTools/FastFabric/reboot.exp
-index 497e5fd..584ad88 100755
--- a/IbaTools/FastFabric/reboot.exp
-+++ b/IbaTools/FastFabric/reboot.exp
+diff --git IbaTools/FastFabric/reboot.exp IbaTools/FastFabric/reboot.exp
+index f27b50a..03d98ce 100755
+--- IbaTools/FastFabric/reboot.exp
+++ IbaTools/FastFabric/reboot.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/sacache.exp b/IbaTools/FastFabric/sacache.exp
-index 93f1a35..02e5d57 100755
--- a/IbaTools/FastFabric/sacache.exp
-+++ b/IbaTools/FastFabric/sacache.exp
+diff --git IbaTools/FastFabric/sacache.exp IbaTools/FastFabric/sacache.exp
+index 40a0340..20ef370 100755
+--- IbaTools/FastFabric/sacache.exp
+++ IbaTools/FastFabric/sacache.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/switch_capture.exp b/IbaTools/FastFabric/switch_capture.exp
-index dad55dd..5a8c851 100755
--- a/IbaTools/FastFabric/switch_capture.exp
-+++ b/IbaTools/FastFabric/switch_capture.exp
+diff --git IbaTools/FastFabric/switch_capture.exp IbaTools/FastFabric/switch_capture.exp
+index ed149a3..85e20f6 100755
+--- IbaTools/FastFabric/switch_capture.exp
+++ IbaTools/FastFabric/switch_capture.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/switch_configure.exp b/IbaTools/FastFabric/switch_configure.exp
-index c514da7..5bb9459 100644
--- a/IbaTools/FastFabric/switch_configure.exp
-+++ b/IbaTools/FastFabric/switch_configure.exp
+diff --git IbaTools/FastFabric/switch_configure.exp IbaTools/FastFabric/switch_configure.exp
+index 3516482..5098119 100644
+--- IbaTools/FastFabric/switch_configure.exp
+++ IbaTools/FastFabric/switch_configure.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/switch_dump.exp b/IbaTools/FastFabric/switch_dump.exp
-index d62e1df..7b9c87a 100755
--- a/IbaTools/FastFabric/switch_dump.exp
-+++ b/IbaTools/FastFabric/switch_dump.exp
+diff --git IbaTools/FastFabric/switch_dump.exp IbaTools/FastFabric/switch_dump.exp
+index b567f26..4ab77db 100755
+--- IbaTools/FastFabric/switch_dump.exp
+++ IbaTools/FastFabric/switch_dump.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/switch_fwverify.exp b/IbaTools/FastFabric/switch_fwverify.exp
-index 6cec599..8c3ff70 100755
--- a/IbaTools/FastFabric/switch_fwverify.exp
-+++ b/IbaTools/FastFabric/switch_fwverify.exp
+diff --git IbaTools/FastFabric/switch_fwverify.exp IbaTools/FastFabric/switch_fwverify.exp
+index 6be1ea9..587c07a 100755
+--- IbaTools/FastFabric/switch_fwverify.exp
+++ IbaTools/FastFabric/switch_fwverify.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
-diff --git a/IbaTools/FastFabric/switch_getconfig.exp b/IbaTools/FastFabric/switch_getconfig.exp
-index c357f1d..9be571d 100755
--- a/IbaTools/FastFabric/switch_getconfig.exp
-+++ b/IbaTools/FastFabric/switch_getconfig.exp
+diff --git IbaTools/FastFabric/switch_getconfig.exp IbaTools/FastFabric/switch_getconfig.exp
+index a1cbaae..e79b250 100755
+--- IbaTools/FastFabric/switch_getconfig.exp
+++ IbaTools/FastFabric/switch_getconfig.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
-diff --git a/IbaTools/FastFabric/switch_hwvpd.exp b/IbaTools/FastFabric/switch_hwvpd.exp
-index 354308f..11c97a3 100755
--- a/IbaTools/FastFabric/switch_hwvpd.exp
-+++ b/IbaTools/FastFabric/switch_hwvpd.exp
+diff --git IbaTools/FastFabric/switch_hwvpd.exp IbaTools/FastFabric/switch_hwvpd.exp
+index 24fa8a5..85eafb4 100755
+--- IbaTools/FastFabric/switch_hwvpd.exp
+++ IbaTools/FastFabric/switch_hwvpd.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
-diff --git a/IbaTools/FastFabric/switch_info.exp b/IbaTools/FastFabric/switch_info.exp
-index f339521..d0697fc 100755
--- a/IbaTools/FastFabric/switch_info.exp
-+++ b/IbaTools/FastFabric/switch_info.exp
+diff --git IbaTools/FastFabric/switch_info.exp IbaTools/FastFabric/switch_info.exp
+index 73ef67a..22eb450 100755
+--- IbaTools/FastFabric/switch_info.exp
+++ IbaTools/FastFabric/switch_info.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
-diff --git a/IbaTools/FastFabric/switch_ping.exp b/IbaTools/FastFabric/switch_ping.exp
-index 3c812e6..8b69ff3 100755
--- a/IbaTools/FastFabric/switch_ping.exp
-+++ b/IbaTools/FastFabric/switch_ping.exp
+diff --git IbaTools/FastFabric/switch_ping.exp IbaTools/FastFabric/switch_ping.exp
+index 04f060e..d4ed0bf 100755
+--- IbaTools/FastFabric/switch_ping.exp
+++ IbaTools/FastFabric/switch_ping.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
-diff --git a/IbaTools/FastFabric/switch_reboot.exp b/IbaTools/FastFabric/switch_reboot.exp
-index be07360..1025b18 100755
--- a/IbaTools/FastFabric/switch_reboot.exp
-+++ b/IbaTools/FastFabric/switch_reboot.exp
+diff --git IbaTools/FastFabric/switch_reboot.exp IbaTools/FastFabric/switch_reboot.exp
+index 81f4e3e..d6338be 100755
+--- IbaTools/FastFabric/switch_reboot.exp
+++ IbaTools/FastFabric/switch_reboot.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/switch_upgrade.exp b/IbaTools/FastFabric/switch_upgrade.exp
-index 1355251..109d447 100755
--- a/IbaTools/FastFabric/switch_upgrade.exp
-+++ b/IbaTools/FastFabric/switch_upgrade.exp
+diff --git IbaTools/FastFabric/switch_upgrade.exp IbaTools/FastFabric/switch_upgrade.exp
+index 81bd9b4..45f576c 100755
+--- IbaTools/FastFabric/switch_upgrade.exp
+++ IbaTools/FastFabric/switch_upgrade.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/IbaTools/FastFabric/upgrade.exp b/IbaTools/FastFabric/upgrade.exp
-index 9da4431..afd674b 100755
--- a/IbaTools/FastFabric/upgrade.exp
-+++ b/IbaTools/FastFabric/upgrade.exp
+diff --git IbaTools/FastFabric/upgrade.exp IbaTools/FastFabric/upgrade.exp
+index aecccbb..8f8bc93 100755
+--- IbaTools/FastFabric/upgrade.exp
+++ IbaTools/FastFabric/upgrade.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/basic.exp b/TestTools/basic.exp
-index 6010991..49afb67 100755
--- a/TestTools/basic.exp
-+++ b/TestTools/basic.exp
+diff --git TestTools/basic.exp TestTools/basic.exp
+index 4ffe1f5..2d473b5 100755
+--- TestTools/basic.exp
+++ TestTools/basic.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/chassis.exp b/TestTools/chassis.exp
-index 65821d2..670e8f4 100755
--- a/TestTools/chassis.exp
-+++ b/TestTools/chassis.exp
+diff --git TestTools/chassis.exp TestTools/chassis.exp
+index 9af2e9a..60b79a8 100755
+--- TestTools/chassis.exp
+++ TestTools/chassis.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/common_funcs.exp b/TestTools/common_funcs.exp
+diff --git TestTools/common_funcs.exp TestTools/common_funcs.exp
 index 68d55d8..39bce9a 100644
--- a/TestTools/common_funcs.exp
-+++ b/TestTools/common_funcs.exp
+--- TestTools/common_funcs.exp
+++ TestTools/common_funcs.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/defs.exp b/TestTools/defs.exp
-index 3d3fd07..f4bf97f 100644
--- a/TestTools/defs.exp
-+++ b/TestTools/defs.exp
+diff --git TestTools/defs.exp TestTools/defs.exp
+index 8e1a8e6..eed572f 100644
+--- TestTools/defs.exp
+++ TestTools/defs.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/extmng.exp b/TestTools/extmng.exp
-index 9b9e94e..77c8591 100755
--- a/TestTools/extmng.exp
-+++ b/TestTools/extmng.exp
+diff --git TestTools/extmng.exp TestTools/extmng.exp
+index 2f2d25e..e571529 100755
+--- TestTools/extmng.exp
+++ TestTools/extmng.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/ib.exp b/TestTools/ib.exp
+diff --git TestTools/ib.exp TestTools/ib.exp
 index 06c4a6e..45b6309 100755
--- a/TestTools/ib.exp
-+++ b/TestTools/ib.exp
+--- TestTools/ib.exp
+++ TestTools/ib.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/ibtools.exp b/TestTools/ibtools.exp
-index 2c16b3f..213fc0f 100644
--- a/TestTools/ibtools.exp
-+++ b/TestTools/ibtools.exp
+diff --git TestTools/ibtools.exp TestTools/ibtools.exp
+index 36b945c..1b88094 100644
+--- TestTools/ibtools.exp
+++ TestTools/ibtools.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/install.exp b/TestTools/install.exp
-index 0a440cd..815e954 100755
--- a/TestTools/install.exp
-+++ b/TestTools/install.exp
+diff --git TestTools/install.exp TestTools/install.exp
+index 7736765..e7cc0d4 100755
+--- TestTools/install.exp
+++ TestTools/install.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/mpi.exp b/TestTools/mpi.exp
-index 3d7fe8d..4687775 100755
--- a/TestTools/mpi.exp
-+++ b/TestTools/mpi.exp
+diff --git TestTools/mpi.exp TestTools/mpi.exp
+index 3c5a649..d16354a 100755
+--- TestTools/mpi.exp
+++ TestTools/mpi.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/network.exp b/TestTools/network.exp
-index 347754e..16939e7 100755
--- a/TestTools/network.exp
-+++ b/TestTools/network.exp
+diff --git TestTools/network.exp TestTools/network.exp
+index a859022..0f02d36 100755
+--- TestTools/network.exp
+++ TestTools/network.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/opa_to_xml.exp b/TestTools/opa_to_xml.exp
-index 62d28a4..2418b64 100644
--- a/TestTools/opa_to_xml.exp
-+++ b/TestTools/opa_to_xml.exp
+diff --git TestTools/opa_to_xml.exp TestTools/opa_to_xml.exp
+index e5e8ab8..5a110c4 100644
+--- TestTools/opa_to_xml.exp
+++ TestTools/opa_to_xml.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/proc_mgr.exp b/TestTools/proc_mgr.exp
-index aa73849..4b33827 100755
--- a/TestTools/proc_mgr.exp
-+++ b/TestTools/proc_mgr.exp
+diff --git TestTools/proc_mgr.exp TestTools/proc_mgr.exp
+index abcb65d..be47d2f 100755
+--- TestTools/proc_mgr.exp
+++ TestTools/proc_mgr.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/sm_control.exp b/TestTools/sm_control.exp
-index 8793b0e..3aca630 100755
--- a/TestTools/sm_control.exp
-+++ b/TestTools/sm_control.exp
+diff --git TestTools/sm_control.exp TestTools/sm_control.exp
+index 7f08ccb..4809f4c 100755
+--- TestTools/sm_control.exp
+++ TestTools/sm_control.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/switch_methods.exp b/TestTools/switch_methods.exp
+diff --git TestTools/switch_methods.exp TestTools/switch_methods.exp
 index 9f13773..6f0d730 100644
--- a/TestTools/switch_methods.exp
-+++ b/TestTools/switch_methods.exp
+--- TestTools/switch_methods.exp
+++ TestTools/switch_methods.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/target.exp b/TestTools/target.exp
-index a35bcd5..4fe0e24 100755
--- a/TestTools/target.exp
-+++ b/TestTools/target.exp
+diff --git TestTools/target.exp TestTools/target.exp
+index 9460a67..2c300f9 100755
+--- TestTools/target.exp
+++ TestTools/target.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-diff --git a/TestTools/tools.exp b/TestTools/tools.exp
-index 06c5ec9..ea7cfa4 100755
--- a/TestTools/tools.exp
-+++ b/TestTools/tools.exp
+diff --git TestTools/tools.exp TestTools/tools.exp
+index 850e789..92c94c2 100755
+--- TestTools/tools.exp
+++ TestTools/tools.exp
@@ -1,3 +1,4 @@
 +#!/usr/bin/env expect
 # BEGIN_ICS_COPYRIGHT8 ****************************************
 # 
 # Copyright (c) 2015, Intel Corporation
-- 
-2.6.2
-
--- a/16
+++ b/16
@@ -0,0 +1,16 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+    <param name="scm">git</param>
+    <param name="url">https://github.com/01org/opa-ff.git</param>
+    <param name="package-meta">no</param>
+    <param name="exclude">.git</param>
+    <param name="filename">opa-ff</param>
+    <param name="version">10.4.0</param>
+    <param name="revision">4cf2934fbe186b4a75ec62865dfe9e6ab7cdf287</param>
+  </service>
+  <service name="recompress" mode="disabled">
+    <param name="file">opa-ff*.tar</param>
+    <param name="compression">gz</param>
+  </service>
+
+</services>
--- a/opa-ff-10.4.0.tar.gz
+++ b/opa-ff-10.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c957a52ee7fedc7b90ad23b976e4fb846122cece228ee37fab80a35474418f0
+size 6302232
--- a/opa-ff.changes
+++ b/opa-ff.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jun  8 09:18:02 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Update to v10.4.0.0.197
+  * No changelog available
+- Update opa-ff_fix_suse_build_issue.patch and
+  0001-Add-shebang-for-exp-files.patch to new sources
+
 -------------------------------------------------------------------
 Mon Apr  3 12:30:57 UTC 2017 - josef.moellers@suse.com

--- a/opa-ff.spec
+++ b/opa-ff.spec
@@ -19,13 +19,13 @@
 %define pseudo_opt %{_prefix}/lib/opa-ff/
 %define opasysconfdir %{_sysconfdir}/opa/sysconfig
 Name:           opa-ff
-Version:        10.3.1
+Version:        10.4.0
 Release:        0
 Summary:        Intel Omni-Path basic tools and libraries for fabric managment
 License:        BSD-3-Clause or GPL-2.0
 Group:          System/Libraries
 Url:            http://www.intel.com/
-Source:         opa-ff.tar.gz
+Source:         opa-ff-%{version}.tar.gz
 Source1:        opa-ff.rpmlintrc
 Patch1:         opa-ff_fix_suse_build_issue.patch
 Patch2:         0001-Add-shebang-for-exp-files.patch
@@ -89,9 +89,9 @@ This package contains the include files and libraries
 required to develop programs for the opa-address-resolution package.

 %prep
-%setup -q -n opa-ff
-%patch1 -p1
-%patch2 -p1
+%setup -q -n opa-ff-%{version}
+%patch1
+%patch2

 %build
 export RPM_OPT_FLAGS
@@ -126,7 +126,7 @@ fi
 %define ff_iba_samples hostverify.sh opatopology_FIs.txt opatopology_links.txt opatopology_SMs.txt opatopology_SWs.txt linksum_swd06.csv linksum_swd24.csv README.topology README.xlat_topology topology_cust.xlsx topology.xlsx allhosts-sample chassis-sample hosts-sample switches-sample ports-sample opaff.xml-sample mac_to_dhcp filterFile.txt triggerFile.txt opamon.conf-sample opamon.si.conf-sample opafastfabric.conf-sample opa_ca_openssl.cnf-sample opa_comp_openssl.cnf-sample
 #opagentopology esm_chassis-sample

-%define help_doc opatop_group_bw.hlp opatop_group_config.hlp opatop_group_err.hlp opatop_group_focus.hlp opatop_group_info_sel.hlp opatop_img_config.hlp opatop_pm_config.hlp opatop_port_stats.hlp opatop_summary.hlp opatop_vf_bw.hlp opatop_vf_info_sel.hlp opatop_vf_config.hlp
+%define help_doc opatop_group_bw.hlp opatop_group_config.hlp opatop_group_focus.hlp opatop_group_info_sel.hlp opatop_img_config.hlp opatop_pm_config.hlp opatop_port_stats.hlp opatop_summary.hlp opatop_vf_bw.hlp opatop_vf_info_sel.hlp opatop_vf_config.hlp

 %define opasadb_bin opa_osd_dump opa_osd_exercise opa_osd_perf opa_osd_query

--- a/opa-ff.tar.gz
+++ b/opa-ff.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78df6c28ee4add9d29b501e1137746bf066db945da70b4a3c631aa29d2f412ba
-size 6188154
--- a/opa-ff_fix_suse_build_issue.patch
+++ b/opa-ff_fix_suse_build_issue.patch
@@ -1,7 +1,7 @@
-diff --git a/Makerules/Defs.Flags b/Makerules/Defs.Flags
+diff --git Makerules/Defs.Flags Makerules/Defs.Flags
 index 8caba53..91764ca 100755
--- a/Makerules/Defs.Flags
-+++ b/Makerules/Defs.Flags
+--- Makerules/Defs.Flags
+++ Makerules/Defs.Flags
@@ -53,8 +53,8 @@ CCDEPENDFLAGS		= $(CCFLAGS) $(DEPENDENV) $(DEPENDPROJ) $(DEPENDMOD) $(DEPENDLOCA
 
 CINCLUDE_DIRS	= $(LOCAL_INCLUDE_DIRS) $(MOD_INCLUDE_DIRS) $(PROJ_INCLUDE_DIRS) $(SYS_INCLUDE_DIRS)
@@ -13,10 +13,10 @@ index 8caba53..91764ca 100755
 
 LDFLAGS	= $(LDMACH) $(LDSYS) $(LDENV) $(LDPROJ) $(LDMOD) $(LDLOCAL) $(LDLIBSRCH) $(LDSTRIP) $(LDOUTPUT)
 LD_LIB_DIRS		= $(LOCAL_LIB_DIRS) $(MOD_LIB_DIRS) $(PROJ_LIB_DIRS) $(SYS_LIB_DIRS)
-diff --git a/Makerules/Target.LINUX.INTEL.X86_64 b/Makerules/Target.LINUX.INTEL.X86_64
+diff --git Makerules/Target.LINUX.INTEL.X86_64 Makerules/Target.LINUX.INTEL.X86_64
 index a373262..3a6687d 100755
--- a/Makerules/Target.LINUX.INTEL.X86_64
-+++ b/Makerules/Target.LINUX.INTEL.X86_64
+--- Makerules/Target.LINUX.INTEL.X86_64
+++ Makerules/Target.LINUX.INTEL.X86_64
@@ -132,6 +132,7 @@ endif
 
 endif
@@ -25,14 +25,14 @@ index a373262..3a6687d 100755
 
 # Include directories for kernel
 KERNELDIR=/lib/modules/$(BUILD_TARGET_OS_VERSION)/build
-diff --git a/OpenIb_Host/ff_build.sh b/OpenIb_Host/ff_build.sh
-index d70dcd8..5505ed9 100755
--- a/OpenIb_Host/ff_build.sh
-+++ b/OpenIb_Host/ff_build.sh
-@@ -68,7 +68,13 @@ export PRODUCT=${PRODUCT:-OPENIB_FF}
- # for HSM the kernel rev is not important.  We simply use the kernel rev
+diff --git OpenIb_Host/ff_build.sh OpenIb_Host/ff_build.sh
+index b6a17a0..028a234 100755
+--- OpenIb_Host/ff_build.sh
+++ OpenIb_Host/ff_build.sh
+@@ -65,7 +65,13 @@ export PRODUCT=${PRODUCT:-OPENIB_FF}
+ # for FF the kernel rev is not important.  We simply use the kernel rev
 # of the running kernel.  While BUILD_TARGET_OS_VERSION is needed by Makerules
- # it will have no impact on what is actually built for HSM
+ # it will have no impact on what is actually built for FF
 -export BUILD_TARGET_OS_VERSION=${BUILD_TARGET_OS_VERSION:-`uname -r`}
 +export BUILD_TARGET_OS_VERSION=`uname -r`
 +export BUILD_PLATFORM_OS_VENDOR="SuSE"
@@ -44,7 +44,7 @@ index d70dcd8..5505ed9 100755
 setver $BUILD_TARGET_OS_VENDOR $BUILD_TARGET_OS_VERSION
 
 RELEASE_STRING=IntelOPA-Tools-FF.$BUILD_TARGET_OS_ID.$MODULEVERSION
-@@ -79,6 +85,7 @@ shift
+@@ -76,6 +82,7 @@ shift
 set -x
 {
 	echo "Environment:"