From 7c272a7d12a51c14cbc4c2875f85337206806157bea3bdac4b352017e1a60525 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Mon, 18 Jun 2018 07:35:07 +0000 Subject: [PATCH] Accepting request 617425 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.7.0.0.133 (fate#325049) * No changelog available - Rebase opa-ff-suse-build-fixes.patch to the latest sources - Update opa-ff-add-shebang-for-exp-files.patchto not use /usr/bin/env OBS-URL: https://build.opensuse.org/request/show/617425 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=43 --- _service | 2 +- opa-ff-10.6.0.0.131.0.3ca3fd5.tar.gz | 3 - opa-ff-10.7.0.0.133.0.c6b993a4c724.tar.gz | 3 + opa-ff-add-shebang-for-exp-files.patch | 218 +++++++++++----------- opa-ff-suse-build-fixes.patch | 8 +- opa-ff.changes | 8 + opa-ff.spec | 24 ++- 7 files changed, 140 insertions(+), 126 deletions(-) delete mode 100644 opa-ff-10.6.0.0.131.0.3ca3fd5.tar.gz create mode 100644 opa-ff-10.7.0.0.133.0.c6b993a4c724.tar.gz diff --git a/_service b/_service index 3b1c5c5..14411a6 100644 --- a/_service +++ b/_service @@ -8,7 +8,7 @@ @PARENT_TAG@.@TAG_OFFSET@.%h v(.*) \1 - 3ca3fd5ef80b0dbe1724c7d0fc1e1678c71b0196 + c6b993a4c724f7f3dd3f62a8a5371b0d170b7334 opa-ff*.tar diff --git a/opa-ff-10.6.0.0.131.0.3ca3fd5.tar.gz b/opa-ff-10.6.0.0.131.0.3ca3fd5.tar.gz deleted file mode 100644 index 64da04f..0000000 --- a/opa-ff-10.6.0.0.131.0.3ca3fd5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bfaae67308d013dc623bf2297f48266db51fc7e28692c1cea6ed31fb4546d74 -size 6231110 diff --git a/opa-ff-10.7.0.0.133.0.c6b993a4c724.tar.gz b/opa-ff-10.7.0.0.133.0.c6b993a4c724.tar.gz new file mode 100644 index 0000000..78b12e2 --- /dev/null +++ b/opa-ff-10.7.0.0.133.0.c6b993a4c724.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:713a70eced62fcf51854d4c8b11a8ef08ee97c0f9553ff5cb593f2f92f0044d4 +size 6339435 diff --git a/opa-ff-add-shebang-for-exp-files.patch b/opa-ff-add-shebang-for-exp-files.patch index 59c984a..5f22806 100644 --- a/opa-ff-add-shebang-for-exp-files.patch +++ b/opa-ff-add-shebang-for-exp-files.patch @@ -1,4 +1,4 @@ -commit 87046311682d922380aba3605906332e7e8c034d +commit 17094ed86eae4ff9c7d4a2846f6d1006e039a571 Author: Nicolas Morey-Chaisemartin Date: Thu Jun 8 11:13:38 2017 +0200 @@ -7,398 +7,398 @@ Date: Thu Jun 8 11:13:38 2017 +0200 Signed-off-by: Nicolas Morey-Chaisemartin diff --git IbaTools/FastFabric/chassis_configure.exp IbaTools/FastFabric/chassis_configure.exp -index f18397f..38fb6d9 100644 +index f18397fb794d..6ad42beb6c85 100644 --- IbaTools/FastFabric/chassis_configure.exp +++ IbaTools/FastFabric/chassis_configure.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmconfig.exp IbaTools/FastFabric/chassis_fmconfig.exp -index 986d799..ed26fe5 100755 +index 9ec04cc20b5d..f407dceec5b0 100755 --- IbaTools/FastFabric/chassis_fmconfig.exp +++ IbaTools/FastFabric/chassis_fmconfig.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmcontrol.exp IbaTools/FastFabric/chassis_fmcontrol.exp -index ea3d546..5c67c2f 100755 +index 477953a9dc0f..129ab654d081 100755 --- IbaTools/FastFabric/chassis_fmcontrol.exp +++ IbaTools/FastFabric/chassis_fmcontrol.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmgetconfig.exp IbaTools/FastFabric/chassis_fmgetconfig.exp -index dff298e..75b8abc 100755 +index 2e61cde7241e..f6a4aa8d75bc 100755 --- IbaTools/FastFabric/chassis_fmgetconfig.exp +++ IbaTools/FastFabric/chassis_fmgetconfig.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp -index 99c38c1..cf63eac 100755 +index d31e055ff22f..afd9025f77be 100755 --- IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp +++ IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmsecurityfiles.exp IbaTools/FastFabric/chassis_fmsecurityfiles.exp -index b45aff1..a650423 100755 +index 5c2a45dfe394..69c819af80b4 100755 --- IbaTools/FastFabric/chassis_fmsecurityfiles.exp +++ IbaTools/FastFabric/chassis_fmsecurityfiles.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/chassis_getconfig.exp IbaTools/FastFabric/chassis_getconfig.exp -index 7454afc..f4415f1 100644 +index 7454afce2e9d..6ede46d963b7 100644 --- IbaTools/FastFabric/chassis_getconfig.exp +++ IbaTools/FastFabric/chassis_getconfig.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/chassis_reboot.exp IbaTools/FastFabric/chassis_reboot.exp -index f59330f..c2ca75f 100755 +index b5f1f39b7d2a..8642c498ebc6 100755 --- IbaTools/FastFabric/chassis_reboot.exp +++ IbaTools/FastFabric/chassis_reboot.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/chassis_upgrade.exp IbaTools/FastFabric/chassis_upgrade.exp -index c255e01..b2a798a 100755 +index b2aa797b671e..981d2617e417 100755 --- IbaTools/FastFabric/chassis_upgrade.exp +++ IbaTools/FastFabric/chassis_upgrade.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/configipoib.exp IbaTools/FastFabric/configipoib.exp -index 7918866..e1207d4 100755 +index 10673114e371..8a0d86121986 100755 --- IbaTools/FastFabric/configipoib.exp +++ IbaTools/FastFabric/configipoib.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/ff_function.exp IbaTools/FastFabric/ff_function.exp -index 3590661..c151b90 100755 +index ab64a00d054a..55f3d2c14bad 100755 --- IbaTools/FastFabric/ff_function.exp +++ IbaTools/FastFabric/ff_function.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/ipoibping.exp IbaTools/FastFabric/ipoibping.exp -index 17b0486..5520c4b 100755 +index 5739e6072066..48bd84131283 100755 --- IbaTools/FastFabric/ipoibping.exp +++ IbaTools/FastFabric/ipoibping.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/load.exp IbaTools/FastFabric/load.exp -index 91991e0..894ede3 100755 +index b9d07514d3be..687983e68be4 100755 --- IbaTools/FastFabric/load.exp +++ IbaTools/FastFabric/load.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/mpiperf.exp IbaTools/FastFabric/mpiperf.exp -index 630dc66..5e1cb17 100755 +index 3b69e3a6e0dd..69e0f9afdcc9 100755 --- IbaTools/FastFabric/mpiperf.exp +++ IbaTools/FastFabric/mpiperf.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/mpiperfdeviation.exp IbaTools/FastFabric/mpiperfdeviation.exp -index a7fc679..ebdf07e 100755 +index bcd9839b16a0..113639d7326c 100755 --- IbaTools/FastFabric/mpiperfdeviation.exp +++ IbaTools/FastFabric/mpiperfdeviation.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/reboot.exp IbaTools/FastFabric/reboot.exp -index f27b50a..03d98ce 100755 +index 53fc4b6d6d20..97b5e2bb7665 100755 --- IbaTools/FastFabric/reboot.exp +++ IbaTools/FastFabric/reboot.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/sacache.exp IbaTools/FastFabric/sacache.exp -index 40a0340..20ef370 100755 +index b9c188d02a8a..bc9ceaa9f4b0 100755 --- IbaTools/FastFabric/sacache.exp +++ IbaTools/FastFabric/sacache.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/switch_capture.exp IbaTools/FastFabric/switch_capture.exp -index ed149a3..85e20f6 100755 +index 4e7054df4024..30351ccfab6f 100755 --- IbaTools/FastFabric/switch_capture.exp +++ IbaTools/FastFabric/switch_capture.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/switch_configure.exp IbaTools/FastFabric/switch_configure.exp -index 3516482..5098119 100644 +index 3516482b53ee..0bd7c8391d1f 100644 --- IbaTools/FastFabric/switch_configure.exp +++ IbaTools/FastFabric/switch_configure.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/switch_dump.exp IbaTools/FastFabric/switch_dump.exp -index b567f26..4ab77db 100755 +index dae0e5b26d45..0d17627946fd 100755 --- IbaTools/FastFabric/switch_dump.exp +++ IbaTools/FastFabric/switch_dump.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/switch_fwverify.exp IbaTools/FastFabric/switch_fwverify.exp -index 6be1ea9..587c07a 100755 +index 7cf1101384ec..20016f27b8e8 100755 --- IbaTools/FastFabric/switch_fwverify.exp +++ IbaTools/FastFabric/switch_fwverify.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_getconfig.exp IbaTools/FastFabric/switch_getconfig.exp -index a1cbaae..e79b250 100755 +index 30d6b3fbdc60..16f8ed441ade 100755 --- IbaTools/FastFabric/switch_getconfig.exp +++ IbaTools/FastFabric/switch_getconfig.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_hwvpd.exp IbaTools/FastFabric/switch_hwvpd.exp -index 24fa8a5..85eafb4 100755 +index 266518cc119c..e46696b6031d 100755 --- IbaTools/FastFabric/switch_hwvpd.exp +++ IbaTools/FastFabric/switch_hwvpd.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_info.exp IbaTools/FastFabric/switch_info.exp -index 73ef67a..22eb450 100755 +index 735a5e5303a2..f5389a356542 100755 --- IbaTools/FastFabric/switch_info.exp +++ IbaTools/FastFabric/switch_info.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_ping.exp IbaTools/FastFabric/switch_ping.exp -index 04f060e..d4ed0bf 100755 +index 87733455e0de..7d11f907d48a 100755 --- IbaTools/FastFabric/switch_ping.exp +++ IbaTools/FastFabric/switch_ping.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_reboot.exp IbaTools/FastFabric/switch_reboot.exp -index 81f4e3e..d6338be 100755 +index 1ee19eaa06f6..840e2a39f4ba 100755 --- IbaTools/FastFabric/switch_reboot.exp +++ IbaTools/FastFabric/switch_reboot.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/switch_upgrade.exp IbaTools/FastFabric/switch_upgrade.exp -index 81bd9b4..45f576c 100755 +index 6c5c1041a179..1560d6b39f30 100755 --- IbaTools/FastFabric/switch_upgrade.exp +++ IbaTools/FastFabric/switch_upgrade.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/upgrade.exp IbaTools/FastFabric/upgrade.exp -index aecccbb..8f8bc93 100755 +index dd4abe573690..de0e352bd440 100755 --- IbaTools/FastFabric/upgrade.exp +++ IbaTools/FastFabric/upgrade.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # - # Copyright (c) 2015, Intel Corporation + # Copyright (c) 2015-2017, Intel Corporation diff --git TestTools/basic.exp TestTools/basic.exp -index 4ffe1f5..2d473b5 100755 +index 4ffe1f5dbb10..cae42a380ad4 100755 --- TestTools/basic.exp +++ TestTools/basic.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/chassis.exp TestTools/chassis.exp -index 9af2e9a..60b79a8 100755 +index 9af2e9a8ef84..4eae57f4213c 100755 --- TestTools/chassis.exp +++ TestTools/chassis.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/common_funcs.exp TestTools/common_funcs.exp -index 68d55d8..39bce9a 100644 +index 68d55d8fdf48..22bed8bdbb7e 100644 --- TestTools/common_funcs.exp +++ TestTools/common_funcs.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/defs.exp TestTools/defs.exp -index 8e1a8e6..eed572f 100644 +index 8e1a8e6e816d..2081a2b64d1e 100644 --- TestTools/defs.exp +++ TestTools/defs.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/extmng.exp TestTools/extmng.exp -index 92afc6a..8a06ac8 100755 +index 92afc6a4d80a..bb49db846e14 100755 --- TestTools/extmng.exp +++ TestTools/extmng.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/ib.exp TestTools/ib.exp -index 06c4a6e..45b6309 100755 +index 06c4a6ecc645..5b32311d123f 100755 --- TestTools/ib.exp +++ TestTools/ib.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/ibtools.exp TestTools/ibtools.exp -index 36b945c..1b88094 100644 +index 36b945c565eb..b23ae61a60d4 100644 --- TestTools/ibtools.exp +++ TestTools/ibtools.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/install.exp TestTools/install.exp -index 7736765..e7cc0d4 100755 +index 773676547a28..8b84886318c8 100755 --- TestTools/install.exp +++ TestTools/install.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/mpi.exp TestTools/mpi.exp -index 25defc0..8bd7b9c 100755 +index 25defc08804d..0008685fbe45 100755 --- TestTools/mpi.exp +++ TestTools/mpi.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/network.exp TestTools/network.exp -index a859022..0f02d36 100755 +index c1b8867019f0..f4f212c5a59b 100755 --- TestTools/network.exp +++ TestTools/network.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/opa_to_xml.exp TestTools/opa_to_xml.exp -index e5e8ab8..5a110c4 100644 +index e5e8ab881260..4a4baaffceca 100644 --- TestTools/opa_to_xml.exp +++ TestTools/opa_to_xml.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/proc_mgr.exp TestTools/proc_mgr.exp -index abcb65d..be47d2f 100755 +index abcb65d214ec..e86621d5ea12 100755 --- TestTools/proc_mgr.exp +++ TestTools/proc_mgr.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/sm_control.exp TestTools/sm_control.exp -index 7f08ccb..4809f4c 100755 +index 7f08ccb0e6e0..e639b1a44132 100755 --- TestTools/sm_control.exp +++ TestTools/sm_control.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/switch_methods.exp TestTools/switch_methods.exp -index 9f13773..6f0d730 100644 +index 9f1377397dcb..cf59126aeb35 100644 --- TestTools/switch_methods.exp +++ TestTools/switch_methods.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/target.exp TestTools/target.exp -index 4e01d0d..5fb6ca9 100755 +index 4e01d0da73fa..53c4ebf758f9 100755 --- TestTools/target.exp +++ TestTools/target.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git TestTools/tools.exp TestTools/tools.exp -index 850e789..92c94c2 100755 +index 850e7891b035..1250087c58be 100755 --- TestTools/tools.exp +++ TestTools/tools.exp @@ -1,3 +1,4 @@ -+#!/usr/bin/env expect ++#!/usr/bin/expect # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015, Intel Corporation diff --git a/opa-ff-suse-build-fixes.patch b/opa-ff-suse-build-fixes.patch index 20eee85..29e5912 100644 --- a/opa-ff-suse-build-fixes.patch +++ b/opa-ff-suse-build-fixes.patch @@ -1,4 +1,4 @@ -commit 7adbd3a6cd0aa8c1b0c3b64f6ca706accf9f4f2a +commit eea4f1409968d74e218f5d9390141516830d0283 Author: Nicolas Morey-Chaisemartin Date: Thu Jun 8 11:11:01 2017 +0200 @@ -7,7 +7,7 @@ Date: Thu Jun 8 11:11:01 2017 +0200 Signed-off-by: Nicolas Morey-Chaisemartin diff --git Makerules/Defs.Flags Makerules/Defs.Flags -index 8caba53..91764ca 100755 +index 8caba534bd95..91764cac6fe7 100755 --- Makerules/Defs.Flags +++ Makerules/Defs.Flags @@ -53,8 +53,8 @@ CCDEPENDFLAGS = $(CCFLAGS) $(DEPENDENV) $(DEPENDPROJ) $(DEPENDMOD) $(DEPENDLOCA @@ -22,7 +22,7 @@ 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 Makerules/Target.LINUX.INTEL.X86_64 Makerules/Target.LINUX.INTEL.X86_64 -index a373262..3a6687d 100755 +index a373262676b5..3a6687d563cc 100755 --- Makerules/Target.LINUX.INTEL.X86_64 +++ Makerules/Target.LINUX.INTEL.X86_64 @@ -132,6 +132,7 @@ endif @@ -34,7 +34,7 @@ index a373262..3a6687d 100755 # Include directories for kernel KERNELDIR=/lib/modules/$(BUILD_TARGET_OS_VERSION)/build diff --git OpenIb_Host/ff_build.sh OpenIb_Host/ff_build.sh -index 5cb06f3..ed63c1f 100755 +index 5a97ff855962..ce4179db7339 100755 --- OpenIb_Host/ff_build.sh +++ OpenIb_Host/ff_build.sh @@ -57,7 +57,13 @@ export PRODUCT=${PRODUCT:-OPENIB_FF} diff --git a/opa-ff.changes b/opa-ff.changes index e22161e..1a017d2 100644 --- a/opa-ff.changes +++ b/opa-ff.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jun 12 07:16:45 UTC 2018 - nmoreychaisemartin@suse.com + +- Update to v10.7.0.0.133 (fate#325049) + * No changelog available +- Rebase opa-ff-suse-build-fixes.patch to the latest sources +- Update opa-ff-add-shebang-for-exp-files.patchto not use /usr/bin/env + ------------------------------------------------------------------- Wed May 23 05:37:05 UTC 2018 - nmoreychaisemartin@suse.com diff --git a/opa-ff.spec b/opa-ff.spec index dacc12d..8e17d38 100644 --- a/opa-ff.spec +++ b/opa-ff.spec @@ -16,7 +16,7 @@ # -%define git_ver .0.131.0.3ca3fd5 +%define git_ver .0.133.0.c6b993a4c724 %define opamgt_major 0 %define opasadb_major 1_0_0 @@ -24,10 +24,10 @@ %define opasysconfdir %{_sysconfdir}/opa/ Name: opa-ff -Version: 10.6.0 +Version: 10.7.0 Release: 0 Summary: Intel Omni-Path basic tools and libraries for fabric managment -License: BSD-3-Clause or GPL-2.0 +License: BSD-3-Clause OR GPL-2.0-only Group: Productivity/Networking/System Url: http://www.intel.com/ Source0: %{name}-%{version}%{git_ver}.tar.gz @@ -174,6 +174,7 @@ cd ../fastfabric cp -t %{buildroot}%{_sbindir} ${ff_tools_sbin} cp -t %{buildroot}%{pseudo_opt}tools/ ${ff_tools_misc} cp -t %{buildroot}%{pseudo_opt}help ${help_doc} +cp -t %{buildroot}%{opasysconfdir} ${basic_configs} cd ../etc cp -t %{buildroot}/%{pseudo_opt}fm_tools/ ${ff_tools_fm} @@ -181,7 +182,7 @@ ln -s %{pseudo_opt}/fm_tools/config_check %{buildroot}%{_sbindir}/opafmconfigche ln -s %{pseudo_opt}/fm_tools/config_diff %{buildroot}%{_sbindir}/opafmconfigdiff cd ../fastfabric/samples -cp -t %{buildroot}%{pseudo_opt}samples ${ff_iba_samples} +cp -t %{buildroot}%{pseudo_opt}samples ${ff_iba_samples} ${basic_samples} cd .. cd ../fastfabric/tools @@ -189,7 +190,7 @@ chmod 755 *.exp cp -t %{buildroot}%{pseudo_opt}tools/ ${ff_tools_exp} cp -t %{buildroot}%{pseudo_opt}tools/ ${ff_libs_misc} cp -t %{buildroot}%{pseudo_opt}tools/ osid_wrapper -cp -t %{buildroot}%{opasysconfdir} allhosts chassis esm_chassis hosts ports switches opaff.xml +cp -t %{buildroot}%{opasysconfdir} allhosts chassis esm_chassis hosts ports switches cd .. cd ../man/man1 @@ -239,6 +240,10 @@ done # Extra wildcard to accept .1.gz echo "%{_mandir}/man1/${file}*" done + #Basic config pages + for file in ${basic_configs}; do + echo "%config(noreplace) %{opasysconfdir}${file}" + done ) > %{_builddir}/basic_file.list # List for opa-fastfabric @@ -264,7 +269,7 @@ done done #FF iba samples - for file in ${ff_iba_samples}; do + for file in ${ff_iba_samples} ${basic_samples}; do echo "%{pseudo_opt}samples/${file}" done @@ -301,6 +306,7 @@ done %defattr(-,root,root,-) %dir %{pseudo_opt} %dir %{pseudo_opt}tools/ +%dir %{opasysconfdir} %doc README LICENSE @@ -313,7 +319,7 @@ done %dir %{pseudo_opt}tools %dir %{_sysconfdir}/sysconfig/opa -%{opasysconfdir} +%dir %{opasysconfdir} /etc/sysconfig/opa/* %config(noreplace) %{opasysconfdir}/opafastfabric.conf @@ -324,8 +330,8 @@ done %config(noreplace) %{opasysconfdir}/hosts %config(noreplace) %{opasysconfdir}/ports %config(noreplace) %{opasysconfdir}/switches -%config(noreplace) %{opasysconfdir}/opaff.xml -%config(noreplace) %{opasysconfdir}/opamon.si.conf +%{opasysconfdir}/opamon.si.conf +# Replace opamon.si.conf, as it's a template config file. %{pseudo_opt}tools/osid_wrapper %{_sbindir}/opafmconfigcheck %{_sbindir}/opafmconfigdiff