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

- Update to v10.6.0.0.131
  * No changelog available
- Remove opa-ff-sigset-was-removed.patch as it was fixed upstream.
- Rebase opa-ff-suse-build-fixes.patch and
  opa-ff-add-shebang-for-exp-files.patch to the latest sources

OBS-URL: https://build.opensuse.org/request/show/543959
OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=34

_service

@@ -8,7 +8,7 @@
     <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
-    <param name="revision">206c362b545ab1acd42b36822e5083fb74d26e63</param>
+    <param name="revision">3ca3fd5ef80b0dbe1724c7d0fc1e1678c71b0196</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">opa-ff*.tar</param>

opa-ff-10.5.0.0.140.0.206c362.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e16a72bdb2c88171b923a7fcb0fc9229b3fd8645f40eb16a1befa001a9c8cba
-size 6306022

opa-ff-10.6.0.0.131.0.3ca3fd5.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bfaae67308d013dc623bf2297f48266db51fc7e28692c1cea6ed31fb4546d74
+size 6231110

opa-ff-add-shebang-for-exp-files.patch

@@ -1,3 +1,11 @@
+commit 87046311682d922380aba3605906332e7e8c034d
+Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
+Date:   Thu Jun 8 11:13:38 2017 +0200
+
+    opa-ff add shebang for exp files
+    
+    Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
+
 diff --git IbaTools/FastFabric/chassis_configure.exp IbaTools/FastFabric/chassis_configure.exp
 index f18397f..38fb6d9 100644
 --- IbaTools/FastFabric/chassis_configure.exp
@@ -287,7 +295,7 @@ index 8e1a8e6..eed572f 100644
  # 
  # Copyright (c) 2015, Intel Corporation
 diff --git TestTools/extmng.exp TestTools/extmng.exp
-index 2f2d25e..e571529 100755
+index 92afc6a..8a06ac8 100755
 --- TestTools/extmng.exp
 +++ TestTools/extmng.exp
 @@ -1,3 +1,4 @@
@@ -323,7 +331,7 @@ index 7736765..e7cc0d4 100755
  # 
  # Copyright (c) 2015, Intel Corporation
 diff --git TestTools/mpi.exp TestTools/mpi.exp
-index 3c5a649..d16354a 100755
+index 25defc0..8bd7b9c 100755
 --- TestTools/mpi.exp
 +++ TestTools/mpi.exp
 @@ -1,3 +1,4 @@
@@ -377,7 +385,7 @@ index 9f13773..6f0d730 100644
  # 
  # Copyright (c) 2015, Intel Corporation
 diff --git TestTools/target.exp TestTools/target.exp
-index 9460a67..2c300f9 100755
+index 4e01d0d..5fb6ca9 100755
 --- TestTools/target.exp
 +++ TestTools/target.exp
 @@ -1,3 +1,4 @@

opa-ff-sigset-was-removed.patch

@@ -1,18 +0,0 @@
-diff --git Esm/ib/src/ibaccess/vs_thr.c Esm/ib/src/ibaccess/vs_thr.c
-index 82f30ca..e9281f4 100755
---- Esm/ib/src/ibaccess/vs_thr.c
-+++ Esm/ib/src/ibaccess/vs_thr.c
-@@ -51,11 +51,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * SFW       03/10/02    Initial functions all passing testcases.
- * MGR       04/19/02    Changed pthread_kill call to pthread_cancel.
- ***********************************************************************/
--//#if defined(LINT)
-+#if defined(LINT)
- #include <pthread.h>
- #define __signed__ signed
- #include <bits/sigset.h>
--//#endif
-+#endif
- #include <stdio.h>
- #include <sys/types.h>
- #include <unistd.h>

opa-ff-suse-build-fixes.patch

@@ -1,3 +1,11 @@
+commit 7adbd3a6cd0aa8c1b0c3b64f6ca706accf9f4f2a
+Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
+Date:   Thu Jun 8 11:11:01 2017 +0200
+
+    opa-ff suse build fixes
+    
+    Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
+
 diff --git Makerules/Defs.Flags Makerules/Defs.Flags
 index 8caba53..91764ca 100755
 --- Makerules/Defs.Flags
@@ -26,10 +34,10 @@ 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 b6a17a0..028a234 100755
+index 5cb06f3..ed63c1f 100755
 --- OpenIb_Host/ff_build.sh
 +++ OpenIb_Host/ff_build.sh
-@@ -65,7 +65,13 @@ export PRODUCT=${PRODUCT:-OPENIB_FF}
+@@ -57,7 +57,13 @@ export PRODUCT=${PRODUCT:-OPENIB_FF}
  # for FF the kernel rev is not important.  We simply use the kernel rev
  # of the running kernel.  While BUILD_TARGET_OS_VERSION is needed by Makerules
  # it will have no impact on what is actually built for FF
@@ -43,8 +51,8 @@ index b6a17a0..028a234 100755
 +
  setver $BUILD_TARGET_OS_VENDOR $BUILD_TARGET_OS_VERSION
  
- RELEASE_STRING=IntelOPA-Tools-FF.$BUILD_TARGET_OS_ID.$MODULEVERSION
+ MODULEVERSION=`$TL_DIR/MakeTools/convert_releasetag.pl $RELEASE_TAG`
-@@ -76,6 +82,7 @@ shift
+@@ -69,6 +75,7 @@ shift
  set -x
  {
  	echo "Environment:"

opa-ff.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Nov 20 16:47:51 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Update to v10.6.0.0.131
+  * No changelog available
+- Remove opa-ff-sigset-was-removed.patch as it was fixed upstream.
+- Rebase opa-ff-suse-build-fixes.patch and
+  opa-ff-add-shebang-for-exp-files.patch to the latest sources
+
 -------------------------------------------------------------------
 Tue Sep 19 11:59:58 UTC 2017 - nmoreychaisemartin@suse.com
 

opa-ff.spec

@@ -16,12 +16,12 @@
 #
 
 
-%define git_ver .0.140.0.206c362
+%define git_ver .0.131.0.3ca3fd5
 
 %define pseudo_opt %{_prefix}/lib/opa-ff/
 %define opasysconfdir %{_sysconfdir}/opa/sysconfig
 Name:           opa-ff
-Version:        10.5.0
+Version:        10.6.0
 Release:        0
 Summary:        Intel Omni-Path basic tools and libraries for fabric managment
 License:        BSD-3-Clause or GPL-2.0
@@ -31,7 +31,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:         opa-ff-sigset-was-removed.patch
 BuildRequires:  gcc-c++
 BuildRequires:  infiniband-diags-devel
 BuildRequires:  libexpat-devel
@@ -99,7 +98,6 @@ required to develop programs for the opa-address-resolution package.
 %setup -q -n  %{name}-%{version}%{git_ver}
 %patch1
 %patch2
-%patch3
 
 %build
 export RPM_OPT_FLAGS