diff --git a/.gitignore b/.gitignore index 45d1e93..b3565ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/opa-ff-10.10.1.0.35.tar.xz +SOURCES/opa-ff-10.10.3.0.11.tar.xz diff --git a/.opa-ff.metadata b/.opa-ff.metadata index d693d0a..cd82e7a 100644 --- a/.opa-ff.metadata +++ b/.opa-ff.metadata @@ -1 +1 @@ -581b2e5c447c07d8e11c4626efe385b11924bf28 SOURCES/opa-ff-10.10.1.0.35.tar.xz +2b1d9c6dd865d46e1e2bf1e0b00e972cc235ea9a SOURCES/opa-ff-10.10.3.0.11.tar.xz diff --git a/SOURCES/0001-Add-shebang-for-exp-scripts.patch b/SOURCES/0001-Add-shebang-for-exp-scripts.patch index 5fbdc78..8c99bf1 100644 --- a/SOURCES/0001-Add-shebang-for-exp-scripts.patch +++ b/SOURCES/0001-Add-shebang-for-exp-scripts.patch @@ -1,6 +1,6 @@ -From 34b399805a680ebc5df110c4341729d6591d0e9c Mon Sep 17 00:00:00 2001 +From 4d59ba60ed000eff0d7a7afb240568287cea3117 Mon Sep 17 00:00:00 2001 From: Honggang Li -Date: Tue, 11 Jun 2019 09:14:24 -0400 +Date: Mon, 16 Nov 2020 08:28:57 +0800 Subject: [PATCH] Add shebang for exp scripts The shebang '#!/usr/bin/expect -f' will make opa-ff packages require @@ -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 f18397f..e373a46 100644 +index f18397fb794d..e373a46ca572 100644 --- a/IbaTools/FastFabric/chassis_configure.exp +++ b/IbaTools/FastFabric/chassis_configure.exp @@ -1,3 +1,4 @@ @@ -70,7 +70,7 @@ index f18397f..e373a46 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmconfig.exp b/IbaTools/FastFabric/chassis_fmconfig.exp -index 9ec04cc..8040a37 100644 +index 9ec04cc20b5d..8040a3773611 100644 --- a/IbaTools/FastFabric/chassis_fmconfig.exp +++ b/IbaTools/FastFabric/chassis_fmconfig.exp @@ -1,3 +1,4 @@ @@ -79,7 +79,7 @@ index 9ec04cc..8040a37 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmcontrol.exp b/IbaTools/FastFabric/chassis_fmcontrol.exp -index 477953a..2d69a0b 100644 +index 477953a9dc0f..2d69a0b2168d 100644 --- a/IbaTools/FastFabric/chassis_fmcontrol.exp +++ b/IbaTools/FastFabric/chassis_fmcontrol.exp @@ -1,3 +1,4 @@ @@ -88,7 +88,7 @@ index 477953a..2d69a0b 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmgetconfig.exp b/IbaTools/FastFabric/chassis_fmgetconfig.exp -index 2e61cde..200d2d1 100644 +index 2e61cde7241e..200d2d10dac2 100644 --- a/IbaTools/FastFabric/chassis_fmgetconfig.exp +++ b/IbaTools/FastFabric/chassis_fmgetconfig.exp @@ -1,3 +1,4 @@ @@ -97,7 +97,7 @@ index 2e61cde..200d2d1 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp b/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp -index d31e055..731b6ca 100644 +index d31e055ff22f..731b6ca98f4b 100644 --- a/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp +++ b/IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp @@ -1,3 +1,4 @@ @@ -106,7 +106,7 @@ index d31e055..731b6ca 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_fmsecurityfiles.exp b/IbaTools/FastFabric/chassis_fmsecurityfiles.exp -index 5c2a45d..5f162b8 100644 +index 5c2a45dfe394..5f162b839ca9 100644 --- a/IbaTools/FastFabric/chassis_fmsecurityfiles.exp +++ b/IbaTools/FastFabric/chassis_fmsecurityfiles.exp @@ -1,3 +1,4 @@ @@ -115,7 +115,7 @@ index 5c2a45d..5f162b8 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_getconfig.exp b/IbaTools/FastFabric/chassis_getconfig.exp -index 7454afc..4d7b265 100644 +index 7454afce2e9d..4d7b2651fb3a 100644 --- a/IbaTools/FastFabric/chassis_getconfig.exp +++ b/IbaTools/FastFabric/chassis_getconfig.exp @@ -1,3 +1,4 @@ @@ -124,7 +124,7 @@ index 7454afc..4d7b265 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_reboot.exp b/IbaTools/FastFabric/chassis_reboot.exp -index b5f1f39..36b1ef0 100644 +index b5f1f39b7d2a..36b1ef054a65 100644 --- a/IbaTools/FastFabric/chassis_reboot.exp +++ b/IbaTools/FastFabric/chassis_reboot.exp @@ -1,3 +1,4 @@ @@ -133,7 +133,7 @@ index b5f1f39..36b1ef0 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/chassis_upgrade.exp b/IbaTools/FastFabric/chassis_upgrade.exp -index b2aa797..df0eb7a 100644 +index b2aa797b671e..df0eb7a6194a 100644 --- a/IbaTools/FastFabric/chassis_upgrade.exp +++ b/IbaTools/FastFabric/chassis_upgrade.exp @@ -1,3 +1,4 @@ @@ -142,7 +142,7 @@ index b2aa797..df0eb7a 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/configipoib.exp b/IbaTools/FastFabric/configipoib.exp -index 1067311..f6b29b7 100644 +index 10673114e371..f6b29b728ca7 100644 --- a/IbaTools/FastFabric/configipoib.exp +++ b/IbaTools/FastFabric/configipoib.exp @@ -1,3 +1,4 @@ @@ -151,7 +151,7 @@ index 1067311..f6b29b7 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/ff_function.exp b/IbaTools/FastFabric/ff_function.exp -index ab64a00..73ca780 100644 +index ab64a00d054a..73ca780a89a9 100644 --- a/IbaTools/FastFabric/ff_function.exp +++ b/IbaTools/FastFabric/ff_function.exp @@ -1,3 +1,4 @@ @@ -160,7 +160,7 @@ index ab64a00..73ca780 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/ipoibping.exp b/IbaTools/FastFabric/ipoibping.exp -index 5739e60..5256620 100644 +index 5739e6072066..5256620d1400 100644 --- a/IbaTools/FastFabric/ipoibping.exp +++ b/IbaTools/FastFabric/ipoibping.exp @@ -1,3 +1,4 @@ @@ -169,7 +169,7 @@ index 5739e60..5256620 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/load.exp b/IbaTools/FastFabric/load.exp -index b9d0751..0a6b394 100644 +index b9d07514d3be..0a6b394f61f8 100644 --- a/IbaTools/FastFabric/load.exp +++ b/IbaTools/FastFabric/load.exp @@ -1,3 +1,4 @@ @@ -178,7 +178,7 @@ index b9d0751..0a6b394 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/mpiperf.exp b/IbaTools/FastFabric/mpiperf.exp -index 3b69e3a..c5cab3b 100644 +index 3b69e3a6e0dd..c5cab3b59972 100644 --- a/IbaTools/FastFabric/mpiperf.exp +++ b/IbaTools/FastFabric/mpiperf.exp @@ -1,3 +1,4 @@ @@ -187,7 +187,7 @@ index 3b69e3a..c5cab3b 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/mpiperfdeviation.exp b/IbaTools/FastFabric/mpiperfdeviation.exp -index bcd9839..48882e7 100644 +index bcd9839b16a0..48882e71d2dc 100644 --- a/IbaTools/FastFabric/mpiperfdeviation.exp +++ b/IbaTools/FastFabric/mpiperfdeviation.exp @@ -1,3 +1,4 @@ @@ -196,7 +196,7 @@ index bcd9839..48882e7 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/reboot.exp b/IbaTools/FastFabric/reboot.exp -index 53fc4b6..1f9d7d9 100644 +index 53fc4b6d6d20..1f9d7d9721d4 100644 --- a/IbaTools/FastFabric/reboot.exp +++ b/IbaTools/FastFabric/reboot.exp @@ -1,3 +1,4 @@ @@ -205,7 +205,7 @@ index 53fc4b6..1f9d7d9 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/sacache.exp b/IbaTools/FastFabric/sacache.exp -index b9c188d..ae5f560 100644 +index b9c188d02a8a..ae5f5605d33d 100644 --- a/IbaTools/FastFabric/sacache.exp +++ b/IbaTools/FastFabric/sacache.exp @@ -1,3 +1,4 @@ @@ -214,7 +214,7 @@ index b9c188d..ae5f560 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/switch_capture.exp b/IbaTools/FastFabric/switch_capture.exp -index 4e7054d..ceebd2b 100644 +index 4e7054df4024..ceebd2b54c1f 100644 --- a/IbaTools/FastFabric/switch_capture.exp +++ b/IbaTools/FastFabric/switch_capture.exp @@ -1,3 +1,4 @@ @@ -223,7 +223,7 @@ index 4e7054d..ceebd2b 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/switch_configure.exp b/IbaTools/FastFabric/switch_configure.exp -index 3516482..91fa0ba 100644 +index 3516482b53ee..91fa0ba60eb5 100644 --- a/IbaTools/FastFabric/switch_configure.exp +++ b/IbaTools/FastFabric/switch_configure.exp @@ -1,3 +1,4 @@ @@ -232,7 +232,7 @@ index 3516482..91fa0ba 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/IbaTools/FastFabric/switch_dump.exp b/IbaTools/FastFabric/switch_dump.exp -index dae0e5b..fe99822 100644 +index dae0e5b26d45..fe998226a5f4 100644 --- a/IbaTools/FastFabric/switch_dump.exp +++ b/IbaTools/FastFabric/switch_dump.exp @@ -1,3 +1,4 @@ @@ -241,7 +241,7 @@ index dae0e5b..fe99822 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/switch_fwverify.exp b/IbaTools/FastFabric/switch_fwverify.exp -index 7cf1101..449401e 100644 +index 7cf1101384ec..449401e7d37b 100644 --- a/IbaTools/FastFabric/switch_fwverify.exp +++ b/IbaTools/FastFabric/switch_fwverify.exp @@ -1,3 +1,4 @@ @@ -250,7 +250,7 @@ index 7cf1101..449401e 100644 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_getconfig.exp b/IbaTools/FastFabric/switch_getconfig.exp -index 30d6b3f..3944766 100644 +index 30d6b3fbdc60..39447661e11e 100644 --- a/IbaTools/FastFabric/switch_getconfig.exp +++ b/IbaTools/FastFabric/switch_getconfig.exp @@ -1,3 +1,4 @@ @@ -259,7 +259,7 @@ index 30d6b3f..3944766 100644 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_hwvpd.exp b/IbaTools/FastFabric/switch_hwvpd.exp -index 266518c..dfb1ef2 100644 +index 266518cc119c..dfb1ef28ac84 100644 --- a/IbaTools/FastFabric/switch_hwvpd.exp +++ b/IbaTools/FastFabric/switch_hwvpd.exp @@ -1,3 +1,4 @@ @@ -268,7 +268,7 @@ index 266518c..dfb1ef2 100644 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_info.exp b/IbaTools/FastFabric/switch_info.exp -index 735a5e5..cfecfce 100644 +index 735a5e5303a2..cfecfce1d6c7 100644 --- a/IbaTools/FastFabric/switch_info.exp +++ b/IbaTools/FastFabric/switch_info.exp @@ -1,3 +1,4 @@ @@ -277,7 +277,7 @@ index 735a5e5..cfecfce 100644 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_ping.exp b/IbaTools/FastFabric/switch_ping.exp -index 8773345..8230dc2 100644 +index 87733455e0de..8230dc227d4c 100644 --- a/IbaTools/FastFabric/switch_ping.exp +++ b/IbaTools/FastFabric/switch_ping.exp @@ -1,3 +1,4 @@ @@ -286,7 +286,7 @@ index 8773345..8230dc2 100644 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git a/IbaTools/FastFabric/switch_reboot.exp b/IbaTools/FastFabric/switch_reboot.exp -index 1ee19ea..572f92f 100644 +index 1ee19eaa06f6..572f92f82afa 100644 --- a/IbaTools/FastFabric/switch_reboot.exp +++ b/IbaTools/FastFabric/switch_reboot.exp @@ -1,3 +1,4 @@ @@ -295,7 +295,7 @@ index 1ee19ea..572f92f 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/switch_upgrade.exp b/IbaTools/FastFabric/switch_upgrade.exp -index 6c5c104..336572b 100644 +index 6c5c1041a179..336572bb43ea 100644 --- a/IbaTools/FastFabric/switch_upgrade.exp +++ b/IbaTools/FastFabric/switch_upgrade.exp @@ -1,3 +1,4 @@ @@ -304,7 +304,7 @@ index 6c5c104..336572b 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/IbaTools/FastFabric/upgrade.exp b/IbaTools/FastFabric/upgrade.exp -index dd4abe5..cae30ad 100644 +index dd4abe573690..cae30ad3addb 100644 --- a/IbaTools/FastFabric/upgrade.exp +++ b/IbaTools/FastFabric/upgrade.exp @@ -1,3 +1,4 @@ @@ -313,7 +313,7 @@ index dd4abe5..cae30ad 100644 # # Copyright (c) 2015-2017, Intel Corporation diff --git a/TestTools/basic.exp b/TestTools/basic.exp -index 4ffe1f5..b3362ab 100644 +index 4ffe1f5dbb10..b3362abff462 100644 --- a/TestTools/basic.exp +++ b/TestTools/basic.exp @@ -1,3 +1,4 @@ @@ -322,16 +322,16 @@ index 4ffe1f5..b3362ab 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/chassis.exp b/TestTools/chassis.exp -index 9af2e9a..3ac72db 100644 +index 93265e2d30ed..a01b730617ff 100644 --- a/TestTools/chassis.exp +++ b/TestTools/chassis.exp @@ -1,3 +1,4 @@ +#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** - # - # Copyright (c) 2015, Intel Corporation + # + # Copyright (c) 2015-2020, Intel Corporation diff --git a/TestTools/common_funcs.exp b/TestTools/common_funcs.exp -index 68d55d8..7f62eb8 100644 +index 68d55d8fdf48..7f62eb8c50dd 100644 --- a/TestTools/common_funcs.exp +++ b/TestTools/common_funcs.exp @@ -1,3 +1,4 @@ @@ -340,7 +340,7 @@ index 68d55d8..7f62eb8 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/defs.exp b/TestTools/defs.exp -index 8e1a8e6..ecb3e64 100644 +index 8e1a8e6e816d..ecb3e64275cc 100644 --- a/TestTools/defs.exp +++ b/TestTools/defs.exp @@ -1,3 +1,4 @@ @@ -349,16 +349,16 @@ index 8e1a8e6..ecb3e64 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/extmng.exp b/TestTools/extmng.exp -index b513c61..ac57364 100644 +index cf6d989fc8f5..08324a1118ca 100644 --- a/TestTools/extmng.exp +++ b/TestTools/extmng.exp @@ -1,3 +1,4 @@ +#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** - # - # Copyright (c) 2015, Intel Corporation + # + # Copyright (c) 2015-2020, Intel Corporation diff --git a/TestTools/ib.exp b/TestTools/ib.exp -index 06c4a6e..8e949cd 100644 +index 06c4a6ecc645..8e949cd3093b 100644 --- a/TestTools/ib.exp +++ b/TestTools/ib.exp @@ -1,3 +1,4 @@ @@ -367,7 +367,7 @@ index 06c4a6e..8e949cd 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/ibtools.exp b/TestTools/ibtools.exp -index 36b945c..36bfdbf 100644 +index 36b945c565eb..36bfdbffb1ad 100644 --- a/TestTools/ibtools.exp +++ b/TestTools/ibtools.exp @@ -1,3 +1,4 @@ @@ -376,7 +376,7 @@ index 36b945c..36bfdbf 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/install.exp b/TestTools/install.exp -index 7736765..8f64eb3 100644 +index 773676547a28..8f64eb3046b7 100644 --- a/TestTools/install.exp +++ b/TestTools/install.exp @@ -1,3 +1,4 @@ @@ -385,16 +385,16 @@ index 7736765..8f64eb3 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/mpi.exp b/TestTools/mpi.exp -index 4fe36e9..05fedfa 100644 +index f3b7e29fb0d0..6d089c8f38be 100644 --- a/TestTools/mpi.exp +++ b/TestTools/mpi.exp @@ -1,3 +1,4 @@ +#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** - # - # Copyright (c) 2015, Intel Corporation + # + # Copyright (c) 2015-2020, Intel Corporation diff --git a/TestTools/network.exp b/TestTools/network.exp -index c1b8867..b91a1ed 100644 +index c1b8867019f0..b91a1ed1ce1c 100644 --- a/TestTools/network.exp +++ b/TestTools/network.exp @@ -1,3 +1,4 @@ @@ -403,16 +403,16 @@ index c1b8867..b91a1ed 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/opa_to_xml.exp b/TestTools/opa_to_xml.exp -index 448bfb4..9e0d8bc 100644 +index f81f07ae8c00..f8aafa6e2324 100644 --- a/TestTools/opa_to_xml.exp +++ b/TestTools/opa_to_xml.exp @@ -1,3 +1,4 @@ +#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** - # - # Copyright (c) 2015, Intel Corporation + # + # Copyright (c) 2015-2020, Intel Corporation diff --git a/TestTools/proc_mgr.exp b/TestTools/proc_mgr.exp -index abcb65d..94cb60f 100644 +index abcb65d214ec..94cb60fd8648 100644 --- a/TestTools/proc_mgr.exp +++ b/TestTools/proc_mgr.exp @@ -1,3 +1,4 @@ @@ -421,7 +421,7 @@ index abcb65d..94cb60f 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/sm_control.exp b/TestTools/sm_control.exp -index 7f08ccb..bc89ad4 100644 +index 7f08ccb0e6e0..bc89ad4d3f69 100644 --- a/TestTools/sm_control.exp +++ b/TestTools/sm_control.exp @@ -1,3 +1,4 @@ @@ -430,7 +430,7 @@ index 7f08ccb..bc89ad4 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/switch_methods.exp b/TestTools/switch_methods.exp -index 9f13773..3b2b14f 100644 +index 9f1377397dcb..3b2b14f96d45 100644 --- a/TestTools/switch_methods.exp +++ b/TestTools/switch_methods.exp @@ -1,3 +1,4 @@ @@ -439,16 +439,16 @@ index 9f13773..3b2b14f 100644 # # Copyright (c) 2015, Intel Corporation diff --git a/TestTools/target.exp b/TestTools/target.exp -index b10d199..305757a 100644 +index 8d8311aaa1a6..b0f7603e9219 100644 --- a/TestTools/target.exp +++ b/TestTools/target.exp @@ -1,3 +1,4 @@ +#!/usr/bin/expect -f # BEGIN_ICS_COPYRIGHT8 **************************************** - # - # Copyright (c) 2015, Intel Corporation + # + # Copyright (c) 2015-2020, Intel Corporation diff --git a/TestTools/tools.exp b/TestTools/tools.exp -index 850e789..aa7f825 100644 +index 850e7891b035..aa7f825d72da 100644 --- a/TestTools/tools.exp +++ b/TestTools/tools.exp @@ -1,3 +1,4 @@ @@ -457,5 +457,5 @@ index 850e789..aa7f825 100644 # # Copyright (c) 2015, Intel Corporation -- -2.20.1 +2.25.4 diff --git a/SOURCES/0001-Link-executables-with-pie.patch b/SOURCES/0001-Link-executables-with-pie.patch index d6e8aa7..2caf0ca 100644 --- a/SOURCES/0001-Link-executables-with-pie.patch +++ b/SOURCES/0001-Link-executables-with-pie.patch @@ -1,4 +1,4 @@ -From 88089080e1abf37f782221869e46bee15399339b Mon Sep 17 00:00:00 2001 +From bd97a198a83d59ba26db24dfb99c9f65f218c6c4 Mon Sep 17 00:00:00 2001 From: Honggang Li Date: Tue, 11 Jun 2019 09:20:52 -0400 Subject: [PATCH 1/3] Link executables with '-pie' @@ -10,7 +10,7 @@ Signed-off-by: Honggang Li 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Esm/ib/src/linux/startup/fm_config/Makefile b/Esm/ib/src/linux/startup/fm_config/Makefile -index c4108fa..cd3f301 100644 +index 2270be9921ec..59796585e8e4 100644 --- a/Esm/ib/src/linux/startup/fm_config/Makefile +++ b/Esm/ib/src/linux/startup/fm_config/Makefile @@ -150,10 +150,10 @@ include $(TL_DIR)/Makerules/Maketargets.build @@ -27,7 +27,7 @@ index c4108fa..cd3f301 100644 # install for stage phase #include $(TL_DIR)/Makerules/Maketargets.stage diff --git a/Makerules/Maketargets.build b/Makerules/Maketargets.build -index ebf9fdf..9cd7844 100755 +index ebf9fdfdf8dd..9cd78442fc49 100755 --- a/Makerules/Maketargets.build +++ b/Makerules/Maketargets.build @@ -127,7 +127,7 @@ else # BUILD_TARGET_OS is not VXWORKS @@ -40,5 +40,5 @@ index ebf9fdf..9cd7844 100755 endif # CMD_TARGETS_EXE non-null -- -2.20.1 +2.25.4 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 a3764ef..0f9c53a 100644 --- a/SOURCES/0002-Lets-build-config-decide-C-optimization-flags.patch +++ b/SOURCES/0002-Lets-build-config-decide-C-optimization-flags.patch @@ -1,4 +1,4 @@ -From d8aa76c06080e3a627e0d2872ad0a60b034b764b Mon Sep 17 00:00:00 2001 +From f5628b82a017e619106f561e3ec69aa21940adec Mon Sep 17 00:00:00 2001 From: Honggang Li Date: Tue, 11 Jun 2019 09:31:24 -0400 Subject: [PATCH 2/3] Lets build config decide C optimization flags @@ -17,7 +17,7 @@ Signed-off-by: Honggang Li 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dsap/Makefile b/Dsap/Makefile -index 64aeb2d..e66d0aa 100644 +index 77b976cbb074..0edd6e971c66 100644 --- a/Dsap/Makefile +++ b/Dsap/Makefile @@ -133,8 +133,8 @@ include $(TL_DIR)/$(PROJ_FILE_DIR)/Makerules.project @@ -32,7 +32,7 @@ index 64aeb2d..e66d0aa 100644 #=============================================================================# diff --git a/IbaTools/stream/Makefile b/IbaTools/stream/Makefile -index 7ed670d..9284a91 100644 +index fd963af19fdf..47f03fbbe236 100644 --- a/IbaTools/stream/Makefile +++ b/IbaTools/stream/Makefile @@ -125,7 +125,7 @@ include $(TL_DIR)/IbaTools/Makerules.module @@ -45,7 +45,7 @@ index 7ed670d..9284a91 100644 #=============================================================================# diff --git a/opasadb/path_tools/cache/Makefile b/opasadb/path_tools/cache/Makefile -index 769bad7..61b9ec9 100644 +index 769bad731386..61b9ec9ba8e8 100644 --- a/opasadb/path_tools/cache/Makefile +++ b/opasadb/path_tools/cache/Makefile @@ -129,7 +129,7 @@ include $(TL_DIR)/IbaTools/Makerules.module @@ -58,7 +58,7 @@ index 769bad7..61b9ec9 100644 # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] diff --git a/opasadb/path_tools/dump/Makefile b/opasadb/path_tools/dump/Makefile -index 4562df3..ecc91d7 100644 +index 4562df3eee98..ecc91d76898a 100644 --- a/opasadb/path_tools/dump/Makefile +++ b/opasadb/path_tools/dump/Makefile @@ -129,7 +129,7 @@ include $(TL_DIR)/IbaTools/Makerules.module @@ -71,7 +71,7 @@ index 4562df3..ecc91d7 100644 # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] diff --git a/opasadb/path_tools/exercise/Makefile b/opasadb/path_tools/exercise/Makefile -index ebed0f5..2f164ee 100644 +index ebed0f5a651b..2f164eea0c45 100644 --- a/opasadb/path_tools/exercise/Makefile +++ b/opasadb/path_tools/exercise/Makefile @@ -129,7 +129,7 @@ include $(TL_DIR)/IbaTools/Makerules.module @@ -84,7 +84,7 @@ index ebed0f5..2f164ee 100644 # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] diff --git a/opasadb/path_tools/load/Makefile b/opasadb/path_tools/load/Makefile -index 4e9d10b..640d284 100644 +index a30c8119477a..f1aa4579bfb0 100644 --- a/opasadb/path_tools/load/Makefile +++ b/opasadb/path_tools/load/Makefile @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module @@ -97,7 +97,7 @@ index 4e9d10b..640d284 100644 # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] diff --git a/opasadb/path_tools/perf/Makefile b/opasadb/path_tools/perf/Makefile -index 5029c4a..b3e448c 100644 +index 5029c4a53917..b3e448cfb5ed 100644 --- a/opasadb/path_tools/perf/Makefile +++ b/opasadb/path_tools/perf/Makefile @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module @@ -110,7 +110,7 @@ index 5029c4a..b3e448c 100644 # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] diff --git a/opasadb/path_tools/query/Makefile b/opasadb/path_tools/query/Makefile -index 0b6e480..75fe5c4 100644 +index 0b6e480f7e08..75fe5c48f35b 100644 --- a/opasadb/path_tools/query/Makefile +++ b/opasadb/path_tools/query/Makefile @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module @@ -123,7 +123,7 @@ index 0b6e480..75fe5c4 100644 # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] diff --git a/opasadb/path_tools/query_many/Makefile b/opasadb/path_tools/query_many/Makefile -index b7ff7d4..295fe8f 100644 +index c7b21d1cb579..796fb79a17b2 100644 --- a/opasadb/path_tools/query_many/Makefile +++ b/opasadb/path_tools/query_many/Makefile @@ -128,7 +128,7 @@ include $(TL_DIR)/IbaTools/Makerules.module @@ -136,5 +136,5 @@ index b7ff7d4..295fe8f 100644 # (Windows Only) #USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none] -- -2.20.1 +2.25.4 diff --git a/SOURCES/0003-Replace-strdupa-with-strdup.patch b/SOURCES/0003-Replace-strdupa-with-strdup.patch index 4adb31f..68ed767 100644 --- a/SOURCES/0003-Replace-strdupa-with-strdup.patch +++ b/SOURCES/0003-Replace-strdupa-with-strdup.patch @@ -1,4 +1,4 @@ -From 7a41e075c288b83f10c76b31dfbe2f26dc556ff3 Mon Sep 17 00:00:00 2001 +From f43f9f4af179ad9a46815779e8cbe0bf97ec32cd Mon Sep 17 00:00:00 2001 From: Honggang Li Date: Tue, 11 Jun 2019 09:33:28 -0400 Subject: [PATCH 3/3] Replace 'strdupa' with 'strdup' @@ -9,7 +9,7 @@ Signed-off-by: Honggang Li 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/opasadb/path_tools/query/opa_osd_query.c b/opasadb/path_tools/query/opa_osd_query.c -index 1f3371d..fa43c5e 100644 +index 2804eb245731..11725e7aa61a 100644 --- a/opasadb/path_tools/query/opa_osd_query.c +++ b/opasadb/path_tools/query/opa_osd_query.c @@ -145,7 +145,7 @@ int main(int argc, char **argv) @@ -78,5 +78,5 @@ index 1f3371d..fa43c5e 100644 + return -1; } -- -2.20.1 +2.25.4 diff --git a/SOURCES/update-ff-install-script.patch b/SOURCES/update-ff-install-script.patch index 0e6df54..bbc7f65 100644 --- a/SOURCES/update-ff-install-script.patch +++ b/SOURCES/update-ff-install-script.patch @@ -1,6 +1,6 @@ -From 95795231441a2fcd9b0767f65beb4a59db0b923e Mon Sep 17 00:00:00 2001 +From 2cf055959d546fba23876797a0bbe7ac68d44a6f Mon Sep 17 00:00:00 2001 From: Honggang Li -Date: Thu, 31 Oct 2019 11:25:14 +0800 +Date: Mon, 16 Nov 2020 08:35:57 +0800 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(+), 21 deletions(-) diff --git a/OpenIb_Host/ff_filegroups.sh b/OpenIb_Host/ff_filegroups.sh -index e7a0d8f..e457b6e 100644 +index ba3aff031d7c..e457b6e4611a 100644 --- a/OpenIb_Host/ff_filegroups.sh +++ b/OpenIb_Host/ff_filegroups.sh @@ -1,5 +1,5 @@ @@ -43,11 +43,11 @@ index e7a0d8f..e457b6e 100644 - run_multibw run_mpi_stress run_osu run_cabletest run_allhfilatency run_nxnlatbw - run_alltoall3 run_bcast3 run_bibw3 run_bw3 run_lat3 run_mbw_mr3 run_multi_lat3 - run_batch_script run_batch_cabletest hpl-count.diff groupstress deviation -- hpl-config/HPL.dat-* hpl-config/README mpicc mpif77" +- hpl-config/HPL.dat-* hpl-config/README mpicc mpicxx mpif77" - opasnapconfig_bin= diff --git a/OpenIb_Host/ff_install.sh b/OpenIb_Host/ff_install.sh -index 9430648..3da59bb 100755 +index 9430648fcfcd..3da59bbcfdff 100755 --- a/OpenIb_Host/ff_install.sh +++ b/OpenIb_Host/ff_install.sh @@ -29,10 +29,8 @@ mkdir -p ${DESTDIR}/etc/opa @@ -81,5 +81,5 @@ index 9430648..3da59bb 100755 cd ../config cp -t ${DESTDIR}/etc/rdma dsap.conf -- -2.21.0 +2.25.4 diff --git a/SPECS/opa-ff.spec b/SPECS/opa-ff.spec index f972a86..a5d02ca 100644 --- a/SPECS/opa-ff.spec +++ b/SPECS/opa-ff.spec @@ -1,6 +1,6 @@ Name: opa-ff Epoch: 1 -Version: 10.10.1.0.35 +Version: 10.10.3.0.11 Release: 1%{?dist} Summary: Intel Omni-Path basic tools and libraries for fabric management License: BSD or GPLv2 @@ -9,7 +9,7 @@ Url: https://github.com/intel/opa-ff # git clone https://github.com/intel/opa-ff.git # cd opa-ff # git archive --format=tar --prefix=opa-ff-%{version}/ \ -# bd8b24a56fcb09dcf85443a487b832aad42654c2 | xz > opa-ff-%{version}.tar.xz +# 24a3b31bd02627015a0766c9d7050370005e0a4b | xz > opa-ff-%{version}.tar.xz Source: %{name}-%{version}.tar.xz Patch0006: 0001-Add-shebang-for-exp-scripts.patch @@ -96,6 +96,8 @@ OPA_FEATURE_SET= ./ff_build.sh %{_builddir} $BUILD_ARGS %install BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libdir} ./OpenIb_Host/ff_install.sh +# https://github.com/linux-rdma/rdma-core/pull/848 +(cd %{buildroot}/%{_libdir}/ibacm && ln -s libdsap.so.1.0.0 libdsap.so) %post -n opa-address-resolution -p /sbin/ldconfig %postun -n opa-address-resolution -p /sbin/ldconfig @@ -400,6 +402,10 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} DSAP_LIBDIR=%{_libd %{_includedir}/opamgt %changelog +* Mon Nov 16 2020 Honggang Li - 10.10.3.0.11-1 +- Rebase to latest upstream release v10.10.3.0.11 +- Resolves: bz1821734, bz1886812 + * Wed Apr 15 2020 Honggang Li - 10.10.1.0.35-1 - Rebase to latest upstream release v10.10.1.0.35 - Resolves: bz1739280