diff --git a/_service b/_service index 303337b..05448ba 100644 --- a/_service +++ b/_service @@ -8,7 +8,7 @@ @PARENT_TAG@.@TAG_OFFSET@.%h v(.*) \1 - cb934204ad37b50158e4b89a9f789a1b5637b857 + 73b52d17053f77cd00ed30cd28c39f0b683795be opa-ff*.tar diff --git a/opa-ff-10.8.0.0.201.0.cb934204ad37.tar.gz b/opa-ff-10.8.0.0.201.0.cb934204ad37.tar.gz deleted file mode 100644 index c3e72c3..0000000 --- a/opa-ff-10.8.0.0.201.0.cb934204ad37.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a00bd9eb490a5e9563a3f327175ad723a6274d682aeb0f2ee7595a43352e8360 -size 6554692 diff --git a/opa-ff-10.9.3.1.1.0.73b52d17053f.tar.gz b/opa-ff-10.9.3.1.1.0.73b52d17053f.tar.gz new file mode 100644 index 0000000..5aaf52b --- /dev/null +++ b/opa-ff-10.9.3.1.1.0.73b52d17053f.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dad0495ce6c542935c16cd94e66da532cfccf31d916a9d38d1d66cd921b69dda +size 2944463 diff --git a/opa-ff-add-shebang-for-exp-files.patch b/opa-ff-add-shebang-for-exp-files.patch index d7a3b41..2221b24 100644 --- a/opa-ff-add-shebang-for-exp-files.patch +++ b/opa-ff-add-shebang-for-exp-files.patch @@ -1,4 +1,4 @@ -commit cc0fea0cb6819eff9c33697fffd129d9ca63bd7e +commit ae670c7f2281c63096c769b519a57a43ce5f81bb Author: Nicolas Morey-Chaisemartin Date: Thu Jun 8 11:13:38 2017 +0200 @@ -16,7 +16,7 @@ index f18397fb794d..6ad42beb6c85 100644 # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmconfig.exp IbaTools/FastFabric/chassis_fmconfig.exp -index 9ec04cc20b5d..f407dceec5b0 100755 +index 9ec04cc20b5d..f407dceec5b0 100644 --- IbaTools/FastFabric/chassis_fmconfig.exp +++ IbaTools/FastFabric/chassis_fmconfig.exp @@ -1,3 +1,4 @@ @@ -25,7 +25,7 @@ index 9ec04cc20b5d..f407dceec5b0 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmcontrol.exp IbaTools/FastFabric/chassis_fmcontrol.exp -index 477953a9dc0f..129ab654d081 100755 +index 477953a9dc0f..129ab654d081 100644 --- IbaTools/FastFabric/chassis_fmcontrol.exp +++ IbaTools/FastFabric/chassis_fmcontrol.exp @@ -1,3 +1,4 @@ @@ -34,7 +34,7 @@ index 477953a9dc0f..129ab654d081 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmgetconfig.exp IbaTools/FastFabric/chassis_fmgetconfig.exp -index 2e61cde7241e..f6a4aa8d75bc 100755 +index 2e61cde7241e..f6a4aa8d75bc 100644 --- IbaTools/FastFabric/chassis_fmgetconfig.exp +++ IbaTools/FastFabric/chassis_fmgetconfig.exp @@ -1,3 +1,4 @@ @@ -43,7 +43,7 @@ index 2e61cde7241e..f6a4aa8d75bc 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp -index d31e055ff22f..afd9025f77be 100755 +index d31e055ff22f..afd9025f77be 100644 --- IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp +++ IbaTools/FastFabric/chassis_fmgetsecurityfiles.exp @@ -1,3 +1,4 @@ @@ -52,7 +52,7 @@ index d31e055ff22f..afd9025f77be 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/chassis_fmsecurityfiles.exp IbaTools/FastFabric/chassis_fmsecurityfiles.exp -index 5c2a45dfe394..69c819af80b4 100755 +index 5c2a45dfe394..69c819af80b4 100644 --- IbaTools/FastFabric/chassis_fmsecurityfiles.exp +++ IbaTools/FastFabric/chassis_fmsecurityfiles.exp @@ -1,3 +1,4 @@ @@ -70,7 +70,7 @@ index 7454afce2e9d..6ede46d963b7 100644 # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/chassis_reboot.exp IbaTools/FastFabric/chassis_reboot.exp -index b5f1f39b7d2a..8642c498ebc6 100755 +index b5f1f39b7d2a..8642c498ebc6 100644 --- IbaTools/FastFabric/chassis_reboot.exp +++ IbaTools/FastFabric/chassis_reboot.exp @@ -1,3 +1,4 @@ @@ -79,7 +79,7 @@ index b5f1f39b7d2a..8642c498ebc6 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/chassis_upgrade.exp IbaTools/FastFabric/chassis_upgrade.exp -index b2aa797b671e..981d2617e417 100755 +index b2aa797b671e..981d2617e417 100644 --- IbaTools/FastFabric/chassis_upgrade.exp +++ IbaTools/FastFabric/chassis_upgrade.exp @@ -1,3 +1,4 @@ @@ -88,7 +88,7 @@ index b2aa797b671e..981d2617e417 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/configipoib.exp IbaTools/FastFabric/configipoib.exp -index 10673114e371..8a0d86121986 100755 +index 10673114e371..8a0d86121986 100644 --- IbaTools/FastFabric/configipoib.exp +++ IbaTools/FastFabric/configipoib.exp @@ -1,3 +1,4 @@ @@ -97,7 +97,7 @@ index 10673114e371..8a0d86121986 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/ff_function.exp IbaTools/FastFabric/ff_function.exp -index ab64a00d054a..55f3d2c14bad 100755 +index ab64a00d054a..55f3d2c14bad 100644 --- IbaTools/FastFabric/ff_function.exp +++ IbaTools/FastFabric/ff_function.exp @@ -1,3 +1,4 @@ @@ -106,7 +106,7 @@ index ab64a00d054a..55f3d2c14bad 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/ipoibping.exp IbaTools/FastFabric/ipoibping.exp -index 5739e6072066..48bd84131283 100755 +index 5739e6072066..48bd84131283 100644 --- IbaTools/FastFabric/ipoibping.exp +++ IbaTools/FastFabric/ipoibping.exp @@ -1,3 +1,4 @@ @@ -115,7 +115,7 @@ index 5739e6072066..48bd84131283 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/load.exp IbaTools/FastFabric/load.exp -index b9d07514d3be..687983e68be4 100755 +index b9d07514d3be..687983e68be4 100644 --- IbaTools/FastFabric/load.exp +++ IbaTools/FastFabric/load.exp @@ -1,3 +1,4 @@ @@ -124,7 +124,7 @@ index b9d07514d3be..687983e68be4 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/mpiperf.exp IbaTools/FastFabric/mpiperf.exp -index 3b69e3a6e0dd..69e0f9afdcc9 100755 +index 3b69e3a6e0dd..69e0f9afdcc9 100644 --- IbaTools/FastFabric/mpiperf.exp +++ IbaTools/FastFabric/mpiperf.exp @@ -1,3 +1,4 @@ @@ -133,7 +133,7 @@ index 3b69e3a6e0dd..69e0f9afdcc9 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/mpiperfdeviation.exp IbaTools/FastFabric/mpiperfdeviation.exp -index bcd9839b16a0..113639d7326c 100755 +index bcd9839b16a0..113639d7326c 100644 --- IbaTools/FastFabric/mpiperfdeviation.exp +++ IbaTools/FastFabric/mpiperfdeviation.exp @@ -1,3 +1,4 @@ @@ -142,7 +142,7 @@ index bcd9839b16a0..113639d7326c 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/reboot.exp IbaTools/FastFabric/reboot.exp -index 53fc4b6d6d20..97b5e2bb7665 100755 +index 53fc4b6d6d20..97b5e2bb7665 100644 --- IbaTools/FastFabric/reboot.exp +++ IbaTools/FastFabric/reboot.exp @@ -1,3 +1,4 @@ @@ -151,7 +151,7 @@ index 53fc4b6d6d20..97b5e2bb7665 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/sacache.exp IbaTools/FastFabric/sacache.exp -index b9c188d02a8a..bc9ceaa9f4b0 100755 +index b9c188d02a8a..bc9ceaa9f4b0 100644 --- IbaTools/FastFabric/sacache.exp +++ IbaTools/FastFabric/sacache.exp @@ -1,3 +1,4 @@ @@ -160,7 +160,7 @@ index b9c188d02a8a..bc9ceaa9f4b0 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/switch_capture.exp IbaTools/FastFabric/switch_capture.exp -index 4e7054df4024..30351ccfab6f 100755 +index 4e7054df4024..30351ccfab6f 100644 --- IbaTools/FastFabric/switch_capture.exp +++ IbaTools/FastFabric/switch_capture.exp @@ -1,3 +1,4 @@ @@ -178,7 +178,7 @@ index 3516482b53ee..0bd7c8391d1f 100644 # # Copyright (c) 2015, Intel Corporation diff --git IbaTools/FastFabric/switch_dump.exp IbaTools/FastFabric/switch_dump.exp -index dae0e5b26d45..0d17627946fd 100755 +index dae0e5b26d45..0d17627946fd 100644 --- IbaTools/FastFabric/switch_dump.exp +++ IbaTools/FastFabric/switch_dump.exp @@ -1,3 +1,4 @@ @@ -187,7 +187,7 @@ index dae0e5b26d45..0d17627946fd 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/switch_fwverify.exp IbaTools/FastFabric/switch_fwverify.exp -index 7cf1101384ec..20016f27b8e8 100755 +index 7cf1101384ec..20016f27b8e8 100644 --- IbaTools/FastFabric/switch_fwverify.exp +++ IbaTools/FastFabric/switch_fwverify.exp @@ -1,3 +1,4 @@ @@ -196,7 +196,7 @@ index 7cf1101384ec..20016f27b8e8 100755 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_getconfig.exp IbaTools/FastFabric/switch_getconfig.exp -index 30d6b3fbdc60..16f8ed441ade 100755 +index 30d6b3fbdc60..16f8ed441ade 100644 --- IbaTools/FastFabric/switch_getconfig.exp +++ IbaTools/FastFabric/switch_getconfig.exp @@ -1,3 +1,4 @@ @@ -205,7 +205,7 @@ index 30d6b3fbdc60..16f8ed441ade 100755 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_hwvpd.exp IbaTools/FastFabric/switch_hwvpd.exp -index 266518cc119c..e46696b6031d 100755 +index 266518cc119c..e46696b6031d 100644 --- IbaTools/FastFabric/switch_hwvpd.exp +++ IbaTools/FastFabric/switch_hwvpd.exp @@ -1,3 +1,4 @@ @@ -214,7 +214,7 @@ index 266518cc119c..e46696b6031d 100755 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_info.exp IbaTools/FastFabric/switch_info.exp -index 735a5e5303a2..f5389a356542 100755 +index 735a5e5303a2..f5389a356542 100644 --- IbaTools/FastFabric/switch_info.exp +++ IbaTools/FastFabric/switch_info.exp @@ -1,3 +1,4 @@ @@ -223,7 +223,7 @@ index 735a5e5303a2..f5389a356542 100755 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_ping.exp IbaTools/FastFabric/switch_ping.exp -index 87733455e0de..7d11f907d48a 100755 +index 87733455e0de..7d11f907d48a 100644 --- IbaTools/FastFabric/switch_ping.exp +++ IbaTools/FastFabric/switch_ping.exp @@ -1,3 +1,4 @@ @@ -232,7 +232,7 @@ index 87733455e0de..7d11f907d48a 100755 # BEGIN_ICS_COPYRIGHT8 **************************************** # diff --git IbaTools/FastFabric/switch_reboot.exp IbaTools/FastFabric/switch_reboot.exp -index 1ee19eaa06f6..840e2a39f4ba 100755 +index 1ee19eaa06f6..840e2a39f4ba 100644 --- IbaTools/FastFabric/switch_reboot.exp +++ IbaTools/FastFabric/switch_reboot.exp @@ -1,3 +1,4 @@ @@ -241,7 +241,7 @@ index 1ee19eaa06f6..840e2a39f4ba 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/switch_upgrade.exp IbaTools/FastFabric/switch_upgrade.exp -index 6c5c1041a179..1560d6b39f30 100755 +index 6c5c1041a179..1560d6b39f30 100644 --- IbaTools/FastFabric/switch_upgrade.exp +++ IbaTools/FastFabric/switch_upgrade.exp @@ -1,3 +1,4 @@ @@ -250,7 +250,7 @@ index 6c5c1041a179..1560d6b39f30 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git IbaTools/FastFabric/upgrade.exp IbaTools/FastFabric/upgrade.exp -index dd4abe573690..de0e352bd440 100755 +index dd4abe573690..de0e352bd440 100644 --- IbaTools/FastFabric/upgrade.exp +++ IbaTools/FastFabric/upgrade.exp @@ -1,3 +1,4 @@ @@ -259,7 +259,7 @@ index dd4abe573690..de0e352bd440 100755 # # Copyright (c) 2015-2017, Intel Corporation diff --git TestTools/basic.exp TestTools/basic.exp -index 4ffe1f5dbb10..cae42a380ad4 100755 +index 4ffe1f5dbb10..cae42a380ad4 100644 --- TestTools/basic.exp +++ TestTools/basic.exp @@ -1,3 +1,4 @@ @@ -268,7 +268,7 @@ index 4ffe1f5dbb10..cae42a380ad4 100755 # # Copyright (c) 2015, Intel Corporation diff --git TestTools/chassis.exp TestTools/chassis.exp -index 9af2e9a8ef84..4eae57f4213c 100755 +index 152d7d9fcdfd..ae5e3f9c3838 100644 --- TestTools/chassis.exp +++ TestTools/chassis.exp @@ -1,3 +1,4 @@ @@ -295,7 +295,7 @@ index 8e1a8e6e816d..2081a2b64d1e 100644 # # Copyright (c) 2015, Intel Corporation diff --git TestTools/extmng.exp TestTools/extmng.exp -index b513c61c1069..e0ba680daed3 100755 +index b513c61c1069..e0ba680daed3 100644 --- TestTools/extmng.exp +++ TestTools/extmng.exp @@ -1,3 +1,4 @@ @@ -304,7 +304,7 @@ index b513c61c1069..e0ba680daed3 100755 # # Copyright (c) 2015, Intel Corporation diff --git TestTools/ib.exp TestTools/ib.exp -index 06c4a6ecc645..5b32311d123f 100755 +index 06c4a6ecc645..5b32311d123f 100644 --- TestTools/ib.exp +++ TestTools/ib.exp @@ -1,3 +1,4 @@ @@ -322,7 +322,7 @@ index 36b945c565eb..b23ae61a60d4 100644 # # Copyright (c) 2015, Intel Corporation diff --git TestTools/install.exp TestTools/install.exp -index 773676547a28..8b84886318c8 100755 +index 773676547a28..8b84886318c8 100644 --- TestTools/install.exp +++ TestTools/install.exp @@ -1,3 +1,4 @@ @@ -331,7 +331,7 @@ index 773676547a28..8b84886318c8 100755 # # Copyright (c) 2015, Intel Corporation diff --git TestTools/mpi.exp TestTools/mpi.exp -index 4fe36e9aeca0..fa0624080c98 100755 +index 4fe36e9aeca0..fa0624080c98 100644 --- TestTools/mpi.exp +++ TestTools/mpi.exp @@ -1,3 +1,4 @@ @@ -340,7 +340,7 @@ index 4fe36e9aeca0..fa0624080c98 100755 # # Copyright (c) 2015, Intel Corporation diff --git TestTools/network.exp TestTools/network.exp -index c1b8867019f0..f4f212c5a59b 100755 +index c1b8867019f0..f4f212c5a59b 100644 --- TestTools/network.exp +++ TestTools/network.exp @@ -1,3 +1,4 @@ @@ -349,7 +349,7 @@ index c1b8867019f0..f4f212c5a59b 100755 # # Copyright (c) 2015, Intel Corporation diff --git TestTools/opa_to_xml.exp TestTools/opa_to_xml.exp -index e5e8ab881260..4a4baaffceca 100644 +index 448bfb471aeb..c6232d54ea47 100644 --- TestTools/opa_to_xml.exp +++ TestTools/opa_to_xml.exp @@ -1,3 +1,4 @@ @@ -358,7 +358,7 @@ index e5e8ab881260..4a4baaffceca 100644 # # Copyright (c) 2015, Intel Corporation diff --git TestTools/proc_mgr.exp TestTools/proc_mgr.exp -index abcb65d214ec..e86621d5ea12 100755 +index abcb65d214ec..e86621d5ea12 100644 --- TestTools/proc_mgr.exp +++ TestTools/proc_mgr.exp @@ -1,3 +1,4 @@ @@ -367,7 +367,7 @@ index abcb65d214ec..e86621d5ea12 100755 # # Copyright (c) 2015, Intel Corporation diff --git TestTools/sm_control.exp TestTools/sm_control.exp -index 7f08ccb0e6e0..e639b1a44132 100755 +index 7f08ccb0e6e0..e639b1a44132 100644 --- TestTools/sm_control.exp +++ TestTools/sm_control.exp @@ -1,3 +1,4 @@ @@ -385,7 +385,7 @@ index 9f1377397dcb..cf59126aeb35 100644 # # Copyright (c) 2015, Intel Corporation diff --git TestTools/target.exp TestTools/target.exp -index 4e01d0da73fa..53c4ebf758f9 100755 +index b10d1995cbde..b4fd69fbb8ad 100644 --- TestTools/target.exp +++ TestTools/target.exp @@ -1,3 +1,4 @@ @@ -394,7 +394,7 @@ index 4e01d0da73fa..53c4ebf758f9 100755 # # Copyright (c) 2015, Intel Corporation diff --git TestTools/tools.exp TestTools/tools.exp -index 850e7891b035..1250087c58be 100755 +index 850e7891b035..1250087c58be 100644 --- TestTools/tools.exp +++ TestTools/tools.exp @@ -1,3 +1,4 @@ diff --git a/opa-ff-suse-build-fixes.patch b/opa-ff-suse-build-fixes.patch index d9b3538..473715e 100644 --- a/opa-ff-suse-build-fixes.patch +++ b/opa-ff-suse-build-fixes.patch @@ -1,4 +1,4 @@ -commit 7ff18bb03325761f33ebebe6ebcef3c4acfd977b +commit 8a65ab8349d0a4d9879469d88fb798a275bb2c60 Author: Nicolas Morey-Chaisemartin Date: Thu Jun 8 11:11:01 2017 +0200 @@ -7,19 +7,19 @@ Date: Thu Jun 8 11:11:01 2017 +0200 Signed-off-by: Nicolas Morey-Chaisemartin diff --git Makerules/Defs.Flags Makerules/Defs.Flags -index 8caba534bd95..91764cac6fe7 100755 +index c4ceb2711b45..35112ca71974 100755 --- 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) ifndef KERNELRELEASE --CFLAGS = $(CMACH) $(CSYS) $(CENV) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH) --CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH) -+CFLAGS = $(CMACH) $(CSYS) $(CENV) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS) -+CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS) +-CFLAGS = $(CMACH) $(CSYS) $(CENV) $(CENVFS) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH) +-CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCENVFS) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH) ++CFLAGS = $(CMACH) $(CSYS) $(CENV) $(CENVFS) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS) ++CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCENVFS) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS) - LDFLAGS = $(LDMACH) $(LDSYS) $(LDENV) $(LDPROJ) $(LDMOD) $(LDLOCAL) $(LDLIBSRCH) $(LDSTRIP) $(LDOUTPUT) + LDFLAGS = $(LDMACH) $(LDSYS) $(LDENV) $(LDENVFS) $(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 a373262676b5..3a6687d563cc 100755 @@ -34,7 +34,7 @@ index a373262676b5..3a6687d563cc 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 e2ef82a12276..8c0be6244776 100755 +index dd457e3cf16a..3f31c8ae26be 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 9ea9fde..92196b8 100644 --- a/opa-ff.changes +++ b/opa-ff.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Sep 6 14:32:59 UTC 2019 - Nicolas Morey-Chaisemartin + +- Update to v10.9.3.1.1 + - No changelog available +- Refresh patches against newer sources: + - opa-ff-add-shebang-for-exp-files.patch + - opa-ff-suse-build-fixes.patch +- Drop patches merged upstream: + - reproduciblecpu.patch + - reproducible.patch + ------------------------------------------------------------------- Fri Dec 28 11:19:40 UTC 2018 - Bernhard Wiedemann diff --git a/opa-ff.spec b/opa-ff.spec index 10bf71a..249e313 100644 --- a/opa-ff.spec +++ b/opa-ff.spec @@ -1,7 +1,7 @@ # # spec file for package opa-ff # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,11 +12,11 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define git_ver .0.201.0.cb934204ad37 +%define git_ver .1.1.0.73b52d17053f %define opamgt_major 0 %define opasadb_major 1_0_0 @@ -24,7 +24,7 @@ %define opasysconfdir %{_sysconfdir}/opa/ Name: opa-ff -Version: 10.8.0 +Version: 10.9.3 Release: 0 Summary: Intel Omni-Path basic tools and libraries for fabric managment License: BSD-3-Clause OR GPL-2.0-only @@ -34,8 +34,6 @@ Source0: %{name}-%{version}%{git_ver}.tar.gz Source1: opa-ff.rpmlintrc Patch1: opa-ff-add-shebang-for-exp-files.patch Patch2: opa-ff-suse-build-fixes.patch -Patch3: reproducible.patch -Patch4: reproduciblecpu.patch BuildRequires: gcc-c++ BuildRequires: infiniband-diags-devel BuildRequires: libexpat-devel @@ -65,6 +63,7 @@ Contains basic tools for fabric managment necessary on all compute nodes. %package -n opa-fastfabric Summary: OmniPath management level tools and scripts Group: Productivity/Networking/System +Requires: cron Requires: opa-basic-tools %if 0%{?rhel} Requires: atlas @@ -78,7 +77,7 @@ Summary: OmniPath Subnet Administrator database library Group: System/Libraries %description -n libopasadb%{opasadb_major} -This package contains the library necessary for opa-adress-resolution. +This package contains the library necessary for opa-address-resolution. %package -n opa-address-resolution Summary: OmniPath Address Resolution manager @@ -111,7 +110,7 @@ This package contains the library necessary to build applications that interface %package -n libopamgt-devel Summary: Omni-Path library development headers Group: Development/Libraries/C and C++ -Requires: libopamgt%{opamgt_major} +Requires: libopamgt%{opamgt_major} = %{version} %description -n libopamgt-devel This package contains the necessary headers for opamgt development. @@ -128,11 +127,9 @@ Tools for parsing information from provided snapshot files and issuing packets t %setup -q -n %{name}-%{version}%{git_ver} %patch1 %patch2 -%patch3 -p1 -%patch4 -p1 %build -export RPM_OPT_FLAGS +export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-address-of-packed-member" if [ -d OpenIb_Host ] then cd OpenIb_Host && ./ff_build.sh %{_builddir} $FF_BUILD_ARGS @@ -158,7 +155,7 @@ mkdir -p %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_mandir}/man8 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/opa - +mkdir -p %{buildroot}%{_sysconfdir}/cron.daily/ #Binaries and scripts installing (basic tools) #cd builtbin.OPENIB_FF.release cd $(cat %{_builddir}/RELEASE_PATH) @@ -193,7 +190,10 @@ cd ../etc cp -t %{buildroot}/%{pseudo_opt}fm_tools/ ${ff_tools_fm} ln -s %{pseudo_opt}/fm_tools/config_check %{buildroot}%{_sbindir}/opafmconfigcheck ln -s %{pseudo_opt}/fm_tools/config_diff %{buildroot}%{_sbindir}/opafmconfigdiff - +cd cron.d +# We do not want there cron.d stuff. Directly link the proper bin in cron.daily +ln -s /%{pseudo_opt}tools/opacablehealthcron %{buildroot}%{_sysconfdir}/cron.daily/opa-cablehealth +cd .. cd ../fastfabric/samples cp -t %{buildroot}%{pseudo_opt}samples ${ff_iba_samples} ${basic_samples} cd .. @@ -215,7 +215,7 @@ cd .. #Config files cd ../config -cp -t %{buildroot}%{_sysconfdir}/rdma dsap.conf +cp -t %{buildroot}%{_sysconfdir}/rdma dsap.conf op_path_rec.conf opasadb.xml cp -t %{buildroot}/%{opasysconfdir} opamon.conf opamon.si.conf #Libraries installing @@ -328,7 +328,8 @@ done %dir %{pseudo_opt}tools/ %dir %{opasysconfdir} -%doc README LICENSE +%doc README +%license LICENSE %files -n opa-fastfabric -f %{_builddir}/ff_file.list %defattr(-,root,root,0755) @@ -350,6 +351,8 @@ done %config(noreplace) %{opasysconfdir}/hosts %config(noreplace) %{opasysconfdir}/ports %config(noreplace) %{opasysconfdir}/switches +%dir %{_sysconfdir}/cron.daily +%config(noreplace) %{_sysconfdir}/cron.daily/opa-cablehealth %{opasysconfdir}/opamon.si.conf # Replace opamon.si.conf, as it's a template config file. %{pseudo_opt}tools/osid_wrapper @@ -374,6 +377,8 @@ done %{_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 +%config %{_sysconfdir}/rdma/opasadb.xml %files -n opa-address-resolution-devel %{_includedir}/infiniband @@ -393,6 +398,7 @@ done %dir %{pseudo_opt} %dir %{pseudo_opt}tools/ -%doc README LICENSE +%doc README +%license LICENSE %changelog diff --git a/reproducible.patch b/reproducible.patch deleted file mode 100644 index 769f828..0000000 --- a/reproducible.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://github.com/01org/opa-ff/pull/10 - -commit 2ae76192815212d7a3f821d6a3dddc3d0bb9eae4 -Author: Bernhard M. Wiedemann -Date: Wed Nov 15 20:14:04 2017 +0100 - - Allow to override build date - - in order to make builds reproducible. - See https://reproducible-builds.org/ for why this is good - and https://reproducible-builds.org/specs/source-date-epoch/ - for the definition of this variable. - This date call only works with GNU date. - - Also use UTC to be independent of timezones. - And use ISO date format as the only proper way to unambiguously - represent a date. - -diff --git a/MakeTools/prep.sh b/MakeTools/prep.sh -index c0a4bd1..52b19a6 100755 ---- a/MakeTools/prep.sh -+++ b/MakeTools/prep.sh -@@ -81,6 +81,7 @@ then - exit 1 - fi - -+[[ $SOURCE_DATE_EPOCH ]] && DATE=`date -u -d "@$SOURCE_DATE_EPOCH" -Iseconds` - DATE=${DATE:-"`date +'%m/%d/%y %H:%M'`"} - - if [ "$#" = 1 ] diff --git a/reproduciblecpu.patch b/reproduciblecpu.patch deleted file mode 100644 index e847e1a..0000000 --- a/reproduciblecpu.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/intel/opa-ff/issues/20 -https://bugzilla.opensuse.org/show_bug.cgi?id=1100677 packages do not build reproducibly from compile-time CPU-detection - - -Author: Bernhard M. Wiedemann -Date: 2018-12-28 - - Drop march=native to avoid CPU detection on build machine - - in order to make builds reproducible. - See https://reproducible-builds.org/ for why this is good - -Index: opa-ff-10.8.0.0.201.0.cb934204ad37/IbaTools/stream/Makefile -=================================================================== ---- opa-ff-10.8.0.0.201.0.cb934204ad37.orig/IbaTools/stream/Makefile -+++ opa-ff-10.8.0.0.201.0.cb934204ad37/IbaTools/stream/Makefile -@@ -110,7 +110,7 @@ INCLUDE_SUBDIR = - # (in addition to LOCALDEPLIBS) - #LOCAL_LIB_DIRS = User library directories for libpaths [Empty] - --CLOCAL = $(CPIE) -march=native -mcmodel=medium -DSTREAM_ARRAY_SIZE=353783808 -fopenmp -+CLOCAL = $(CPIE) -mcmodel=medium -DSTREAM_ARRAY_SIZE=353783808 -fopenmp - LDLOCAL = -fopenmp - - # Include Make Rules definitions and rules