From 66e29fb810ba83a433f65f1e6018d3f02545ae94 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 5 Nov 2019 16:28:15 -0500 Subject: [PATCH] import opa-ff-10.9.2.2.1-1.el8 --- .gitignore | 2 +- .opa-ff.metadata | 2 +- ...ormat-strings-into-snprintf-function.patch | 26 ----- .../0001-Add-shebang-for-exp-scripts.patch | 94 +++++++++---------- SOURCES/0001-Link-executables-with-pie.patch | 8 +- ...d-config-decide-C-optimization-flags.patch | 88 ++++++++++++----- .../0003-Replace-strdupa-with-strdup.patch | 18 ++-- SOURCES/update-ff-install-script.patch | 39 ++++---- SPECS/opa-ff.spec | 44 ++++++--- 9 files changed, 176 insertions(+), 145 deletions(-) delete mode 100644 SOURCES/0001-Add-literal-format-strings-into-snprintf-function.patch diff --git a/.gitignore b/.gitignore index eeafc4c..a63f622 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/opa-ff-10.7.0.0.133.tar.xz +SOURCES/opa-ff-10.9.2.2.1.tar.xz diff --git a/.opa-ff.metadata b/.opa-ff.metadata index 53b7c80..9a85567 100644 --- a/.opa-ff.metadata +++ b/.opa-ff.metadata @@ -1 +1 @@ -10f1604b99e0c104ca994fcab9313558f0965ee9 SOURCES/opa-ff-10.7.0.0.133.tar.xz +9852b1769fa3b697a9e8aaa050971fdfe2cc4360 SOURCES/opa-ff-10.9.2.2.1.tar.xz diff --git a/SOURCES/0001-Add-literal-format-strings-into-snprintf-function.patch b/SOURCES/0001-Add-literal-format-strings-into-snprintf-function.patch deleted file mode 100644 index 0ccb52d..0000000 --- a/SOURCES/0001-Add-literal-format-strings-into-snprintf-function.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a956ba489526a7d5287a642878994d8125506c62 Mon Sep 17 00:00:00 2001 -From: Honggang Li -Date: Thu, 19 Oct 2017 18:26:35 +0800 -Subject: [PATCH] Add literal format strings into snprintf function - -Signed-off-by: Honggang Li ---- - Esm/ib/src/linux/startup/fm_config/config_convert.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Esm/ib/src/linux/startup/fm_config/config_convert.c b/Esm/ib/src/linux/startup/fm_config/config_convert.c -index 68ec10a..b8c0069 100644 ---- a/Esm/ib/src/linux/startup/fm_config/config_convert.c -+++ b/Esm/ib/src/linux/startup/fm_config/config_convert.c -@@ -541,7 +541,7 @@ char *formatOldValue(Ag_Man_t *sp, OldFormat_t format) - case FORMAT_MTU: - if (FALSE == getOldUllValue(sp, &value)) - return (char*)sp->value; -- snprintf(buf, 50, IbMTUToText((IB_MTU)value)); -+ snprintf(buf, 50, "%s", IbMTUToText((IB_MTU)value)); - return buf; - case FORMAT_RATE: - if (FALSE == getOldUllValue(sp, &value)) --- -2.14.0 - diff --git a/SOURCES/0001-Add-shebang-for-exp-scripts.patch b/SOURCES/0001-Add-shebang-for-exp-scripts.patch index 80e8f90..5fbdc78 100644 --- a/SOURCES/0001-Add-shebang-for-exp-scripts.patch +++ b/SOURCES/0001-Add-shebang-for-exp-scripts.patch @@ -1,6 +1,6 @@ -From 7971ad777ab4e1cf395f460a90f40e28299881a6 Mon Sep 17 00:00:00 2001 +From 34b399805a680ebc5df110c4341729d6591d0e9c Mon Sep 17 00:00:00 2001 From: Honggang Li -Date: Thu, 19 Apr 2018 11:45:06 +0800 +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 @@ -61,7 +61,7 @@ Signed-off-by: Honggang Li 44 files changed, 44 insertions(+) diff --git a/IbaTools/FastFabric/chassis_configure.exp b/IbaTools/FastFabric/chassis_configure.exp -index f18397fb794d..e373a46ca572 100644 +index f18397f..e373a46 100644 --- a/IbaTools/FastFabric/chassis_configure.exp +++ b/IbaTools/FastFabric/chassis_configure.exp @@ -1,3 +1,4 @@ @@ -70,7 +70,7 @@ index f18397fb794d..e373a46ca572 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmconfig.exp b/IbaTools/FastFabric/chassis_fmconfig.exp -index 9ec04cc20b5d..8040a3773611 100755 +index 9ec04cc..8040a37 100644 --- a/IbaTools/FastFabric/chassis_fmconfig.exp +++ b/IbaTools/FastFabric/chassis_fmconfig.exp @@ -1,3 +1,4 @@ @@ -79,7 +79,7 @@ index 9ec04cc20b5d..8040a3773611 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmcontrol.exp b/IbaTools/FastFabric/chassis_fmcontrol.exp -index 477953a9dc0f..2d69a0b2168d 100755 +index 477953a..2d69a0b 100644 --- a/IbaTools/FastFabric/chassis_fmcontrol.exp +++ b/IbaTools/FastFabric/chassis_fmcontrol.exp @@ -1,3 +1,4 @@ @@ -88,7 +88,7 @@ index 477953a9dc0f..2d69a0b2168d 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmgetconfig.exp b/IbaTools/FastFabric/chassis_fmgetconfig.exp -index 2e61cde7241e..200d2d10dac2 100755 +index 2e61cde..200d2d1 100644 --- a/IbaTools/FastFabric/chassis_fmgetconfig.exp +++ b/IbaTools/FastFabric/chassis_fmgetconfig.exp @@ -1,3 +1,4 @@ @@ -97,7 +97,7 @@ index 2e61cde7241e..200d2d10dac2 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp b/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp -index d31e055ff22f..731b6ca98f4b 100755 +index d31e055..731b6ca 100644 --- a/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp +++ b/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp @@ -1,3 +1,4 @@ @@ -106,7 +106,7 @@ index d31e055ff22f..731b6ca98f4b 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmsecurityfiles.exp b/IbaTools/FastFabric/chassis_fmsecurityfiles.exp -index 5c2a45dfe394..5f162b839ca9 100755 +index 5c2a45d..5f162b8 100644 --- a/IbaTools/FastFabric/chassis_fmsecurityfiles.exp +++ b/IbaTools/FastFabric/chassis_fmsecurityfiles.exp @@ -1,3 +1,4 @@ @@ -115,7 +115,7 @@ index 5c2a45dfe394..5f162b839ca9 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_getconfig.exp b/IbaTools/FastFabric/chassis_getconfig.exp -index 7454afce2e9d..4d7b2651fb3a 100644 +index 7454afc..4d7b265 100644 --- a/IbaTools/FastFabric/chassis_getconfig.exp +++ b/IbaTools/FastFabric/chassis_getconfig.exp @@ -1,3 +1,4 @@ @@ -124,7 +124,7 @@ index 7454afce2e9d..4d7b2651fb3a 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_reboot.exp b/IbaTools/FastFabric/chassis_reboot.exp -index b5f1f39b7d2a..36b1ef054a65 100755 +index b5f1f39..36b1ef0 100644 --- a/IbaTools/FastFabric/chassis_reboot.exp +++ b/IbaTools/FastFabric/chassis_reboot.exp @@ -1,3 +1,4 @@ @@ -133,7 +133,7 @@ index b5f1f39b7d2a..36b1ef054a65 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_upgrade.exp b/IbaTools/FastFabric/chassis_upgrade.exp -index b2aa797b671e..df0eb7a6194a 100755 +index b2aa797..df0eb7a 100644 --- a/IbaTools/FastFabric/chassis_upgrade.exp +++ b/IbaTools/FastFabric/chassis_upgrade.exp @@ -1,3 +1,4 @@ @@ -142,7 +142,7 @@ index b2aa797b671e..df0eb7a6194a 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/configipoib.exp b/IbaTools/FastFabric/configipoib.exp -index 10673114e371..f6b29b728ca7 100755 +index 1067311..f6b29b7 100644 --- a/IbaTools/FastFabric/configipoib.exp +++ b/IbaTools/FastFabric/configipoib.exp @@ -1,3 +1,4 @@ @@ -151,7 +151,7 @@ index 10673114e371..f6b29b728ca7 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/ff_function.exp b/IbaTools/FastFabric/ff_function.exp -index ab64a00d054a..73ca780a89a9 100755 +index ab64a00..73ca780 100644 --- a/IbaTools/FastFabric/ff_function.exp +++ b/IbaTools/FastFabric/ff_function.exp @@ -1,3 +1,4 @@ @@ -160,7 +160,7 @@ index ab64a00d054a..73ca780a89a9 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/ipoibping.exp b/IbaTools/FastFabric/ipoibping.exp -index 5739e6072066..5256620d1400 100755 +index 5739e60..5256620 100644 --- a/IbaTools/FastFabric/ipoibping.exp +++ b/IbaTools/FastFabric/ipoibping.exp @@ -1,3 +1,4 @@ @@ -169,7 +169,7 @@ index 5739e6072066..5256620d1400 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/load.exp b/IbaTools/FastFabric/load.exp -index b9d07514d3be..0a6b394f61f8 100755 +index b9d0751..0a6b394 100644 --- a/IbaTools/FastFabric/load.exp +++ b/IbaTools/FastFabric/load.exp @@ -1,3 +1,4 @@ @@ -178,7 +178,7 @@ index b9d07514d3be..0a6b394f61f8 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/mpiperf.exp b/IbaTools/FastFabric/mpiperf.exp -index 3b69e3a6e0dd..c5cab3b59972 100755 +index 3b69e3a..c5cab3b 100644 --- a/IbaTools/FastFabric/mpiperf.exp +++ b/IbaTools/FastFabric/mpiperf.exp @@ -1,3 +1,4 @@ @@ -187,7 +187,7 @@ index 3b69e3a6e0dd..c5cab3b59972 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/mpiperfdeviation.exp b/IbaTools/FastFabric/mpiperfdeviation.exp -index bcd9839b16a0..48882e71d2dc 100755 +index bcd9839..48882e7 100644 --- a/IbaTools/FastFabric/mpiperfdeviation.exp +++ b/IbaTools/FastFabric/mpiperfdeviation.exp @@ -1,3 +1,4 @@ @@ -196,7 +196,7 @@ index bcd9839b16a0..48882e71d2dc 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/reboot.exp b/IbaTools/FastFabric/reboot.exp -index 53fc4b6d6d20..1f9d7d9721d4 100755 +index 53fc4b6..1f9d7d9 100644 --- a/IbaTools/FastFabric/reboot.exp +++ b/IbaTools/FastFabric/reboot.exp @@ -1,3 +1,4 @@ @@ -205,7 +205,7 @@ index 53fc4b6d6d20..1f9d7d9721d4 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/sacache.exp b/IbaTools/FastFabric/sacache.exp -index b9c188d02a8a..ae5f5605d33d 100755 +index b9c188d..ae5f560 100644 --- a/IbaTools/FastFabric/sacache.exp +++ b/IbaTools/FastFabric/sacache.exp @@ -1,3 +1,4 @@ @@ -214,7 +214,7 @@ index b9c188d02a8a..ae5f5605d33d 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/switch_capture.exp b/IbaTools/FastFabric/switch_capture.exp -index 4e7054df4024..ceebd2b54c1f 100755 +index 4e7054d..ceebd2b 100644 --- a/IbaTools/FastFabric/switch_capture.exp +++ b/IbaTools/FastFabric/switch_capture.exp @@ -1,3 +1,4 @@ @@ -223,7 +223,7 @@ index 4e7054df4024..ceebd2b54c1f 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/switch_configure.exp b/IbaTools/FastFabric/switch_configure.exp -index 3516482b53ee..91fa0ba60eb5 100644 +index 3516482..91fa0ba 100644 --- a/IbaTools/FastFabric/switch_configure.exp +++ b/IbaTools/FastFabric/switch_configure.exp @@ -1,3 +1,4 @@ @@ -232,7 +232,7 @@ index 3516482b53ee..91fa0ba60eb5 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/IbaTools/FastFabric/switch_dump.exp b/IbaTools/FastFabric/switch_dump.exp -index dae0e5b26d45..fe998226a5f4 100755 +index dae0e5b..fe99822 100644 --- a/IbaTools/FastFabric/switch_dump.exp +++ b/IbaTools/FastFabric/switch_dump.exp @@ -1,3 +1,4 @@ @@ -241,7 +241,7 @@ index dae0e5b26d45..fe998226a5f4 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/switch_fwverify.exp b/IbaTools/FastFabric/switch_fwverify.exp -index 7cf1101384ec..449401e7d37b 100755 +index 7cf1101..449401e 100644 --- a/IbaTools/FastFabric/switch_fwverify.exp +++ b/IbaTools/FastFabric/switch_fwverify.exp @@ -1,3 +1,4 @@ @@ -250,7 +250,7 @@ index 7cf1101384ec..449401e7d37b 100755 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_getconfig.exp b/IbaTools/FastFabric/switch_getconfig.exp -index 30d6b3fbdc60..39447661e11e 100755 +index 30d6b3f..3944766 100644 --- a/IbaTools/FastFabric/switch_getconfig.exp +++ b/IbaTools/FastFabric/switch_getconfig.exp @@ -1,3 +1,4 @@ @@ -259,7 +259,7 @@ index 30d6b3fbdc60..39447661e11e 100755 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_hwvpd.exp b/IbaTools/FastFabric/switch_hwvpd.exp -index 266518cc119c..dfb1ef28ac84 100755 +index 266518c..dfb1ef2 100644 --- a/IbaTools/FastFabric/switch_hwvpd.exp +++ b/IbaTools/FastFabric/switch_hwvpd.exp @@ -1,3 +1,4 @@ @@ -268,7 +268,7 @@ index 266518cc119c..dfb1ef28ac84 100755 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_info.exp b/IbaTools/FastFabric/switch_info.exp -index 735a5e5303a2..cfecfce1d6c7 100755 +index 735a5e5..cfecfce 100644 --- a/IbaTools/FastFabric/switch_info.exp +++ b/IbaTools/FastFabric/switch_info.exp @@ -1,3 +1,4 @@ @@ -277,7 +277,7 @@ index 735a5e5303a2..cfecfce1d6c7 100755 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_ping.exp b/IbaTools/FastFabric/switch_ping.exp -index 87733455e0de..8230dc227d4c 100755 +index 8773345..8230dc2 100644 --- a/IbaTools/FastFabric/switch_ping.exp +++ b/IbaTools/FastFabric/switch_ping.exp @@ -1,3 +1,4 @@ @@ -286,7 +286,7 @@ index 87733455e0de..8230dc227d4c 100755 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_reboot.exp b/IbaTools/FastFabric/switch_reboot.exp -index 1ee19eaa06f6..572f92f82afa 100755 +index 1ee19ea..572f92f 100644 --- a/IbaTools/FastFabric/switch_reboot.exp +++ b/IbaTools/FastFabric/switch_reboot.exp @@ -1,3 +1,4 @@ @@ -295,7 +295,7 @@ index 1ee19eaa06f6..572f92f82afa 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/switch_upgrade.exp b/IbaTools/FastFabric/switch_upgrade.exp -index 6c5c1041a179..336572bb43ea 100755 +index 6c5c104..336572b 100644 --- a/IbaTools/FastFabric/switch_upgrade.exp +++ b/IbaTools/FastFabric/switch_upgrade.exp @@ -1,3 +1,4 @@ @@ -304,7 +304,7 @@ index 6c5c1041a179..336572bb43ea 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/upgrade.exp b/IbaTools/FastFabric/upgrade.exp -index dd4abe573690..cae30ad3addb 100755 +index dd4abe5..cae30ad 100644 --- a/IbaTools/FastFabric/upgrade.exp +++ b/IbaTools/FastFabric/upgrade.exp @@ -1,3 +1,4 @@ @@ -313,7 +313,7 @@ index dd4abe573690..cae30ad3addb 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/TestTools/basic.exp b/TestTools/basic.exp -index 4ffe1f5dbb10..b3362abff462 100755 +index 4ffe1f5..b3362ab 100644 --- a/TestTools/basic.exp +++ b/TestTools/basic.exp @@ -1,3 +1,4 @@ @@ -322,7 +322,7 @@ index 4ffe1f5dbb10..b3362abff462 100755 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/chassis.exp b/TestTools/chassis.exp -index 9af2e9a8ef84..3ac72db9c51f 100755 +index 9af2e9a..3ac72db 100644 --- a/TestTools/chassis.exp +++ b/TestTools/chassis.exp @@ -1,3 +1,4 @@ @@ -331,7 +331,7 @@ index 9af2e9a8ef84..3ac72db9c51f 100755 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/common_funcs.exp b/TestTools/common_funcs.exp -index 68d55d8fdf48..7f62eb8c50dd 100644 +index 68d55d8..7f62eb8 100644 --- a/TestTools/common_funcs.exp +++ b/TestTools/common_funcs.exp @@ -1,3 +1,4 @@ @@ -340,7 +340,7 @@ index 68d55d8fdf48..7f62eb8c50dd 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/defs.exp b/TestTools/defs.exp -index 8e1a8e6e816d..ecb3e64275cc 100644 +index 8e1a8e6..ecb3e64 100644 --- a/TestTools/defs.exp +++ b/TestTools/defs.exp @@ -1,3 +1,4 @@ @@ -349,7 +349,7 @@ index 8e1a8e6e816d..ecb3e64275cc 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/extmng.exp b/TestTools/extmng.exp -index 92afc6a4d80a..931bd9dffb06 100755 +index b513c61..ac57364 100644 --- a/TestTools/extmng.exp +++ b/TestTools/extmng.exp @@ -1,3 +1,4 @@ @@ -358,7 +358,7 @@ index 92afc6a4d80a..931bd9dffb06 100755 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/ib.exp b/TestTools/ib.exp -index 06c4a6ecc645..8e949cd3093b 100755 +index 06c4a6e..8e949cd 100644 --- a/TestTools/ib.exp +++ b/TestTools/ib.exp @@ -1,3 +1,4 @@ @@ -367,7 +367,7 @@ index 06c4a6ecc645..8e949cd3093b 100755 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/ibtools.exp b/TestTools/ibtools.exp -index 36b945c565eb..36bfdbffb1ad 100644 +index 36b945c..36bfdbf 100644 --- a/TestTools/ibtools.exp +++ b/TestTools/ibtools.exp @@ -1,3 +1,4 @@ @@ -376,7 +376,7 @@ index 36b945c565eb..36bfdbffb1ad 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/install.exp b/TestTools/install.exp -index 773676547a28..8f64eb3046b7 100755 +index 7736765..8f64eb3 100644 --- a/TestTools/install.exp +++ b/TestTools/install.exp @@ -1,3 +1,4 @@ @@ -385,7 +385,7 @@ index 773676547a28..8f64eb3046b7 100755 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/mpi.exp b/TestTools/mpi.exp -index 25defc08804d..f966558d035c 100755 +index 4fe36e9..05fedfa 100644 --- a/TestTools/mpi.exp +++ b/TestTools/mpi.exp @@ -1,3 +1,4 @@ @@ -394,7 +394,7 @@ index 25defc08804d..f966558d035c 100755 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/network.exp b/TestTools/network.exp -index c1b8867019f0..b91a1ed1ce1c 100755 +index c1b8867..b91a1ed 100644 --- a/TestTools/network.exp +++ b/TestTools/network.exp @@ -1,3 +1,4 @@ @@ -403,7 +403,7 @@ index c1b8867019f0..b91a1ed1ce1c 100755 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/opa_to_xml.exp b/TestTools/opa_to_xml.exp -index e5e8ab881260..77f831157bee 100644 +index 448bfb4..9e0d8bc 100644 --- a/TestTools/opa_to_xml.exp +++ b/TestTools/opa_to_xml.exp @@ -1,3 +1,4 @@ @@ -412,7 +412,7 @@ index e5e8ab881260..77f831157bee 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/proc_mgr.exp b/TestTools/proc_mgr.exp -index abcb65d214ec..94cb60fd8648 100755 +index abcb65d..94cb60f 100644 --- a/TestTools/proc_mgr.exp +++ b/TestTools/proc_mgr.exp @@ -1,3 +1,4 @@ @@ -421,7 +421,7 @@ index abcb65d214ec..94cb60fd8648 100755 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/sm_control.exp b/TestTools/sm_control.exp -index 7f08ccb0e6e0..bc89ad4d3f69 100755 +index 7f08ccb..bc89ad4 100644 --- a/TestTools/sm_control.exp +++ b/TestTools/sm_control.exp @@ -1,3 +1,4 @@ @@ -430,7 +430,7 @@ index 7f08ccb0e6e0..bc89ad4d3f69 100755 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/switch_methods.exp b/TestTools/switch_methods.exp -index 9f1377397dcb..3b2b14f96d45 100644 +index 9f13773..3b2b14f 100644 --- a/TestTools/switch_methods.exp +++ b/TestTools/switch_methods.exp @@ -1,3 +1,4 @@ @@ -439,7 +439,7 @@ index 9f1377397dcb..3b2b14f96d45 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/target.exp b/TestTools/target.exp -index 4e01d0da73fa..8fa95dbe40ff 100755 +index b10d199..305757a 100644 --- a/TestTools/target.exp +++ b/TestTools/target.exp @@ -1,3 +1,4 @@ @@ -448,7 +448,7 @@ index 4e01d0da73fa..8fa95dbe40ff 100755 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/tools.exp b/TestTools/tools.exp -index 850e7891b035..aa7f825d72da 100755 +index 850e789..aa7f825 100644 --- a/TestTools/tools.exp +++ b/TestTools/tools.exp @@ -1,3 +1,4 @@ @@ -457,5 +457,5 @@ index 850e7891b035..aa7f825d72da 100755 # # Copyright (c) 2015, Intel Corporation -- -2.15.0-rc1 +2.20.1 diff --git a/SOURCES/0001-Link-executables-with-pie.patch b/SOURCES/0001-Link-executables-with-pie.patch index 7a743f4..d6e8aa7 100644 --- a/SOURCES/0001-Link-executables-with-pie.patch +++ b/SOURCES/0001-Link-executables-with-pie.patch @@ -1,6 +1,6 @@ -From 6ff98094710c0cddb2a47e3ac55611babd7c26e0 Mon Sep 17 00:00:00 2001 +From 88089080e1abf37f782221869e46bee15399339b Mon Sep 17 00:00:00 2001 From: Honggang Li -Date: Thu, 27 Sep 2018 01:52:50 -0400 +Date: Tue, 11 Jun 2019 09:20:52 -0400 Subject: [PATCH 1/3] Link executables with '-pie' Signed-off-by: Honggang Li @@ -10,7 +10,7 @@ Signed-off-by: Honggang Li 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 cbf277f..99b3635 100644 +index c4108fa..cd3f301 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 @@ -40,5 +40,5 @@ index ebf9fdf..9cd7844 100755 endif # CMD_TARGETS_EXE non-null -- -2.18.0 +2.20.1 diff --git a/SOURCES/0002-Lets-build-config-decide-C-optimization-flags.patch b/SOURCES/0002-Lets-build-config-decide-C-optimization-flags.patch index 182993d..a3764ef 100644 --- a/SOURCES/0002-Lets-build-config-decide-C-optimization-flags.patch +++ b/SOURCES/0002-Lets-build-config-decide-C-optimization-flags.patch @@ -1,20 +1,23 @@ -From 3581242b2e434992c9ffa000a878a535441c99c8 Mon Sep 17 00:00:00 2001 +From d8aa76c06080e3a627e0d2872ad0a60b034b764b Mon Sep 17 00:00:00 2001 From: Honggang Li -Date: Thu, 27 Sep 2018 01:54:15 -0400 +Date: Tue, 11 Jun 2019 09:31:24 -0400 Subject: [PATCH 2/3] Lets build config decide C optimization flags Signed-off-by: Honggang Li --- - Dsap/Makefile | 4 ++-- - opasadb/path_tools/cache/Makefile | 2 +- - opasadb/path_tools/dump/Makefile | 2 +- - opasadb/path_tools/exercise/Makefile | 2 +- - opasadb/path_tools/perf/Makefile | 2 +- - opasadb/path_tools/query/Makefile | 2 +- - 6 files changed, 7 insertions(+), 7 deletions(-) + Dsap/Makefile | 4 ++-- + IbaTools/stream/Makefile | 2 +- + opasadb/path_tools/cache/Makefile | 2 +- + opasadb/path_tools/dump/Makefile | 2 +- + opasadb/path_tools/exercise/Makefile | 2 +- + opasadb/path_tools/load/Makefile | 2 +- + opasadb/path_tools/perf/Makefile | 2 +- + opasadb/path_tools/query/Makefile | 2 +- + opasadb/path_tools/query_many/Makefile | 2 +- + 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dsap/Makefile b/Dsap/Makefile -index 1e98c42..9d545e7 100644 +index 64aeb2d..e66d0aa 100644 --- a/Dsap/Makefile +++ b/Dsap/Makefile @@ -133,8 +133,8 @@ include $(TL_DIR)/$(PROJ_FILE_DIR)/Makerules.project @@ -23,13 +26,26 @@ index 1e98c42..9d545e7 100644 # (Windows Only) -COPT = # set by CKERNEL for drivers -CCOPT = # set by CKERNEL for drivers -+#COPT = # set by CKERNEL for drivers -+#CCOPT = # set by CKERNEL for drivers ++COPT ?= # set by CKERNEL for drivers ++CCOPT ?= # set by CKERNEL for drivers + #=============================================================================# + + #=============================================================================# +diff --git a/IbaTools/stream/Makefile b/IbaTools/stream/Makefile +index 7ed670d..9284a91 100644 +--- a/IbaTools/stream/Makefile ++++ b/IbaTools/stream/Makefile +@@ -125,7 +125,7 @@ include $(TL_DIR)/IbaTools/Makerules.module + # (Windows Only) + #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] + # (Windows Only) +-COPT = -O3 ++COPT ?= -O3 #=============================================================================# #=============================================================================# diff --git a/opasadb/path_tools/cache/Makefile b/opasadb/path_tools/cache/Makefile -index 769bad7..0fecf24 100644 +index 769bad7..61b9ec9 100644 --- a/opasadb/path_tools/cache/Makefile +++ b/opasadb/path_tools/cache/Makefile @@ -129,7 +129,7 @@ include $(TL_DIR)/IbaTools/Makerules.module @@ -37,12 +53,12 @@ index 769bad7..0fecf24 100644 #CCOPT = # C optimization flags, default lets build config decide -COPT = -g -D_GNU_SOURCE -Wall -fPIE -+#COPT = -g -D_GNU_SOURCE -Wall -fPIE ++COPT ?= -g -D_GNU_SOURCE -Wall -fPIE #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] # (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..81d89a7 100644 +index 4562df3..ecc91d7 100644 --- a/opasadb/path_tools/dump/Makefile +++ b/opasadb/path_tools/dump/Makefile @@ -129,7 +129,7 @@ include $(TL_DIR)/IbaTools/Makerules.module @@ -50,12 +66,12 @@ index 4562df3..81d89a7 100644 #CCOPT = # C optimization flags, default lets build config decide -COPT = -g -D_GNU_SOURCE -Wall -fPIE -+#COPT = -g -D_GNU_SOURCE -Wall -fPIE ++COPT ?= -g -D_GNU_SOURCE -Wall -fPIE #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] # (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..d7913e3 100644 +index ebed0f5..2f164ee 100644 --- a/opasadb/path_tools/exercise/Makefile +++ b/opasadb/path_tools/exercise/Makefile @@ -129,7 +129,7 @@ include $(TL_DIR)/IbaTools/Makerules.module @@ -63,12 +79,25 @@ index ebed0f5..d7913e3 100644 #CCOPT = # C optimization flags, default lets build config decide -COPT = -g -D_GNU_SOURCE -Wall -fPIE -+#COPT = -g -D_GNU_SOURCE -Wall -fPIE ++COPT ?= -g -D_GNU_SOURCE -Wall -fPIE + #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] + # (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 +--- a/opasadb/path_tools/load/Makefile ++++ b/opasadb/path_tools/load/Makefile +@@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module + # C++ optimization flags, default lets build config decide + #CCOPT = + # C optimization flags, default lets build config decide +-COPT = -g -D_GNU_SOURCE -Wall -fPIE ++COPT ?= -g -D_GNU_SOURCE -Wall -fPIE #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] # (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..72e8836 100644 +index 5029c4a..b3e448c 100644 --- a/opasadb/path_tools/perf/Makefile +++ b/opasadb/path_tools/perf/Makefile @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module @@ -76,12 +105,12 @@ index 5029c4a..72e8836 100644 #CCOPT = # C optimization flags, default lets build config decide -COPT = -g -D_GNU_SOURCE -Wall -fPIE -+#COPT = -g -D_GNU_SOURCE -Wall -fPIE ++COPT ?= -g -D_GNU_SOURCE -Wall -fPIE #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] # (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..7547c41 100644 +index 0b6e480..75fe5c4 100644 --- a/opasadb/path_tools/query/Makefile +++ b/opasadb/path_tools/query/Makefile @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module @@ -89,10 +118,23 @@ index 0b6e480..7547c41 100644 #CCOPT = # C optimization flags, default lets build config decide -COPT = -g -D_GNU_SOURCE -Wall -fPIE -+#COPT = -g -D_GNU_SOURCE -Wall -fPIE ++COPT ?= -g -D_GNU_SOURCE -Wall -fPIE + #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] + # (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 +--- a/opasadb/path_tools/query_many/Makefile ++++ b/opasadb/path_tools/query_many/Makefile +@@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module + # C++ optimization flags, default lets build config decide + #CCOPT = + # C optimization flags, default lets build config decide +-COPT = -g -D_GNU_SOURCE -Wall -fPIE ++COPT ?= -g -D_GNU_SOURCE -Wall -fPIE #SUBSYSTEM = Subsystem to build for (none, console or windows) [none] # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] -- -2.18.0 +2.20.1 diff --git a/SOURCES/0003-Replace-strdupa-with-strdup.patch b/SOURCES/0003-Replace-strdupa-with-strdup.patch index c60d0de..4adb31f 100644 --- a/SOURCES/0003-Replace-strdupa-with-strdup.patch +++ b/SOURCES/0003-Replace-strdupa-with-strdup.patch @@ -1,6 +1,6 @@ -From 74a3c20d4fba0341b9fd15d512fab3a594c10c97 Mon Sep 17 00:00:00 2001 +From 7a41e075c288b83f10c76b31dfbe2f26dc556ff3 Mon Sep 17 00:00:00 2001 From: Honggang Li -Date: Thu, 27 Sep 2018 13:48:41 +0800 +Date: Tue, 11 Jun 2019 09:33:28 -0400 Subject: [PATCH 3/3] Replace 'strdupa' with 'strdup' Signed-off-by: Honggang Li @@ -9,7 +9,7 @@ Signed-off-by: Honggang Li 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 c526b85..f7c3cc9 100644 +index 1f3371d..fa43c5e 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) @@ -37,8 +37,8 @@ index c526b85..f7c3cc9 100644 } break; case '$': -@@ -179,7 +179,7 @@ int main(int argc, char **argv) - +@@ -178,7 +178,7 @@ int main(int argc, char **argv) + print_path_record("Query Parameters", &query); if ((query.pkey != 0) && (query.service_id != 0)) { fprintf(stderr, "Query using both Service ID and PKey not supported\n"); - return -1; @@ -46,7 +46,7 @@ index c526b85..f7c3cc9 100644 } /* * Finds and opens the HFI. -@@ -187,7 +187,7 @@ int main(int argc, char **argv) +@@ -186,7 +186,7 @@ int main(int argc, char **argv) hfi = op_path_find_hfi(hfi_name,&device); if (!device || !hfi) { fprintf(stderr, "Could not open device %s, error code %d\n", (hfi_name?hfi_name:""), errno); @@ -55,7 +55,7 @@ index c526b85..f7c3cc9 100644 } else { fprintf(stderr,"Using device %s\n", device->name); -@@ -202,7 +202,7 @@ int main(int argc, char **argv) +@@ -201,7 +201,7 @@ int main(int argc, char **argv) fprintf(stderr, "Could not access the Distributed SA. This may mean that\n" "the ibacm/dsap has not been started, or that it has not been able\n" "to contact the SA.\n"); @@ -64,7 +64,7 @@ index c526b85..f7c3cc9 100644 } err = op_path_get_path_by_rec(context, -@@ -223,5 +223,12 @@ int main(int argc, char **argv) +@@ -222,5 +222,12 @@ int main(int argc, char **argv) ibv_close_device(hfi); op_path_close(context); @@ -78,5 +78,5 @@ index c526b85..f7c3cc9 100644 + return -1; } -- -2.18.0 +2.20.1 diff --git a/SOURCES/update-ff-install-script.patch b/SOURCES/update-ff-install-script.patch index c487810..1793f3b 100644 --- a/SOURCES/update-ff-install-script.patch +++ b/SOURCES/update-ff-install-script.patch @@ -1,6 +1,6 @@ -From 9af7f4f3214d9448fbbbc253dda11000732b3aed Mon Sep 17 00:00:00 2001 +From a19986431f07165def29ff6a9154b7fe6013edda Mon Sep 17 00:00:00 2001 From: Honggang Li -Date: Thu, 19 Apr 2018 11:43:34 +0800 +Date: Tue, 11 Jun 2019 09:18:50 -0400 Subject: [PATCH] update ff-install script Signed-off-by: Honggang Li @@ -10,7 +10,7 @@ Signed-off-by: Honggang Li 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/OpenIb_Host/ff_filegroups.sh b/OpenIb_Host/ff_filegroups.sh -index 225a63cbea0c..aa5d6280749b 100644 +index 9eb584d..096d1f6 100644 --- a/OpenIb_Host/ff_filegroups.sh +++ b/OpenIb_Host/ff_filegroups.sh @@ -1,5 +1,5 @@ @@ -20,41 +20,42 @@ index 225a63cbea0c..aa5d6280749b 100644 opainfo" basic_tools_sbin_sym="opapmaquery opaportconfig" -@@ -9,7 +9,7 @@ basic_tools_opt="setup_self_ssh usemem opaipcalc" - basic_lib_opa_opt=".comp_fastfabric.pl .comp_oftools.pl" +@@ -7,7 +7,7 @@ basic_tools_sbin_sym="opapmaquery opaportconfig" + basic_tools_opt="setup_self_ssh usemem opaipcalc stream" - basic_mans="opacapture.1 opaconfig.1 opafabricinfo.1 opagetvf.1 + 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" -@@ -92,19 +92,3 @@ opamgt_iba_headers="ib_mad.h ib_sa_records.h ib_sd.h ib_sm_types.h - opamgt_iba_public_headers="datatypes.h datatypes_osd.h ibyteswap.h ibyteswap_osd.h +@@ -91,20 +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_pmb run_imb run_lat2 +- 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" +- hpl-config/HPL.dat-* hpl-config/README mpicc mpif77" - -shmem_apps_files="Makefile mpi_hosts.sample prepare_run README select_mpi run_barrier - run_get_bibw run_get_bw run_get_latency run_put_bibw run_put_bw run_put_latency - run_reduce run_hello run_alltoall shmem-hello.c" +- + opasnapconfig_bin="opasnapconfig" diff --git a/OpenIb_Host/ff_install.sh b/OpenIb_Host/ff_install.sh -index ae86a899ad27..412be5812108 100755 +index 97479fe..3da59bb 100755 --- a/OpenIb_Host/ff_install.sh +++ b/OpenIb_Host/ff_install.sh -@@ -28,10 +28,8 @@ mkdir -p ${DESTDIR}/etc/rdma - mkdir -p ${DESTDIR}/etc/opa +@@ -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 @@ -62,9 +63,9 @@ index ae86a899ad27..412be5812108 100755 mkdir -p ${DESTDIR}/usr/share/man/man8 -mkdir -p ${DESTDIR}/usr/src/opa/{mpi_apps,shmem_apps} - # Copy the comp.pl file before changing directories - cp -t ${DESTDIR}/usr/lib/opa OpenIb_Host/.comp_fastfabric.pl -@@ -55,7 +53,6 @@ cd ../opamgt + #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 @@ -72,7 +73,7 @@ index ae86a899ad27..412be5812108 100755 OPAMGT_VERNO_MAJOR=$(cat version | cut -d . -f 1) -@@ -91,14 +88,6 @@ cd ../man8 +@@ -92,14 +89,6 @@ cd ../man8 cp -t ${DESTDIR}/usr/share/man/man8 $ff_mans cd .. @@ -88,5 +89,5 @@ index ae86a899ad27..412be5812108 100755 cd ../config cp -t ${DESTDIR}/etc/rdma dsap.conf -- -2.15.0-rc1 +2.20.1 diff --git a/SPECS/opa-ff.spec b/SPECS/opa-ff.spec index 3609f63..470bad6 100644 --- a/SPECS/opa-ff.spec +++ b/SPECS/opa-ff.spec @@ -1,18 +1,17 @@ Name: opa-ff Epoch: 1 -Version: 10.7.0.0.133 -Release: 2%{?dist} +Version: 10.9.2.2.1 +Release: 1%{?dist} Summary: Intel Omni-Path basic tools and libraries for fabric management License: BSD or GPLv2 -Url: https://github.com/01org/opa-ff +Url: https://github.com/intel/opa-ff # tarball created by: -# git clone https://github.com/01org/opa-ff.git +# git clone https://github.com/intel/opa-ff.git # cd opa-ff # git archive --format=tar --prefix=opa-ff-%{version}/ \ -# c6b993a4c724f7f3dd3f62a8a5371b0d170b7334 | xz > opa-ff-%{version}.tar.xz +# 99a61b0e4189cc0e812bc8737c08aa5933956082 | xz > opa-ff-%{version}.tar.xz Source: %{name}-%{version}.tar.xz -Patch0005: 0001-Add-literal-format-strings-into-snprintf-function.patch Patch0006: 0001-Add-shebang-for-exp-scripts.patch Patch0007: update-ff-install-script.patch Patch0008: 0001-Link-executables-with-pie.patch @@ -57,6 +56,14 @@ Requires: opa-basic-tools%{?_isa} %description -n opa-fastfabric Contains tools for managing fabric on a management node. +%package -n opa-snapconfig +Summary: Configure fabric with snapshot file +AutoReq: no +Requires: opa-fastfabric%{?_isa} + +%description -n opa-snapconfig +Parse information from provided snapshot file and issue packets to program + %package -n opa-libopamgt Summary: Omni-Path management API library Requires: libibumad @@ -74,7 +81,6 @@ This package contains the necessary headers for opamgt development. %prep %setup -q -%patch0005 -p1 %patch0006 -p1 %patch0007 -p1 %patch0008 -p1 @@ -94,8 +100,7 @@ export release_COPT_Flags='%{optflags}' export release_CCOPT_Flags='%{optflags}' cd OpenIb_Host -./ff_build.sh %{_builddir} $BUILD_ARGS - +OPA_FEATURE_SET= ./ff_build.sh %{_builddir} $BUILD_ARGS %install BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libdir} ./OpenIb_Host/ff_install.sh @@ -123,10 +128,8 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd %{_prefix}/lib/opa/tools/setup_self_ssh %{_prefix}/lib/opa/tools/usemem %{_prefix}/lib/opa/tools/opaipcalc -%{_prefix}/lib/opa/.comp_fastfabric.pl -%{_prefix}/lib/opa/.comp_oftools.pl +%{_prefix}/lib/opa/tools/stream %{_mandir}/man1/opacapture.1.gz -%{_mandir}/man1/opaconfig.1.gz %{_mandir}/man1/opafabricinfo.1.gz %{_mandir}/man1/opagetvf.1.gz %{_mandir}/man1/opagetvf_env.1.gz @@ -214,6 +217,7 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd %{_prefix}/lib/opa/tools/opagetipaddrtype %{_prefix}/lib/opa/tools/opafastfabric.conf.def %{_prefix}/lib/opa/tools/show_counts +%{_prefix}/lib/opa/tools/opacablehealthcron %{_prefix}/lib/opa/tools/basic.exp %{_prefix}/lib/opa/tools/chassis.exp %{_prefix}/lib/opa/tools/chassis_configure.exp @@ -370,6 +374,7 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd %config(noreplace) %{_sysconfdir}/opa/hosts %config(noreplace) %{_sysconfdir}/opa/ports %config(noreplace) %{_sysconfdir}/opa/switches +%config(noreplace) %{_sysconfdir}/cron.d/opa-cablehealth %config(noreplace) %{_prefix}/lib/opa/tools/osid_wrapper @@ -379,24 +384,33 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd %{_bindir}/opa_osd_exercise %{_bindir}/opa_osd_perf %{_bindir}/opa_osd_query +%{_bindir}/opa_osd_query_many +%{_bindir}/opa_osd_load %{_libdir}/ibacm -%{_libdir}/libopasadb.so.* +%{_libdir}/libopasadb.so* %{_includedir}/infiniband %{_mandir}/man1/opa_osd_dump.1* %{_mandir}/man1/opa_osd_exercise.1* %{_mandir}/man1/opa_osd_perf.1* %{_mandir}/man1/opa_osd_query.1* %config(noreplace) %{_sysconfdir}/rdma/dsap.conf +%config(noreplace) %{_sysconfdir}/rdma/op_path_rec.conf +%{_sysconfdir}/rdma/opasadb.xml + +%files -n opa-snapconfig +%{_prefix}/lib/opa/tools/opasnapconfig %files -n opa-libopamgt %{_prefix}/lib/libopamgt.* - %files -n opa-libopamgt-devel %{_includedir}/opamgt - %changelog +* Wed Jun 12 2019 Honggang Li - 10.9.2.2.1-1 +- Rebase to latest upstream release v10.9.2.2.1 +- Resolves: bz1660615 + * Thu Sep 27 2018 Honggang Li - 10.7.0.0.133-2 - Fix annocheck issues - Resolves: bz1624154