diff --git a/_service b/_service
index 8675473..03c6aeb 100644
--- a/_service
+++ b/_service
@@ -10,8 +10,8 @@
1.1.13+git%cd.%h
-->
- 0.7
- 85c07c656198204c4056e1984779fde98b00ba39
+ 10.2.2
+ 7dec1ba420c56ae4affe9a0b901781423be40925
*pacemaker*.tar
diff --git a/libpsm2-0.7.tar.gz b/libpsm2-0.7.tar.gz
deleted file mode 100644
index 3562408..0000000
--- a/libpsm2-0.7.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4e9caceac25ceec0b6340fd0cdccb844b5f915a7d07de31fb404f2c6a495336
-size 1060302
diff --git a/libpsm2-10.2.2.tar.gz b/libpsm2-10.2.2.tar.gz
new file mode 100644
index 0000000..409c12f
--- /dev/null
+++ b/libpsm2-10.2.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ccaee3b735be70cfa33414f5f6d24fd79169d114171ef84f95dc38c7350aee4
+size 389465
diff --git a/libpsm2-use-exported-variable-for-version-and-release.patch b/libpsm2-use-exported-variable-for-version-and-release.patch
index 6f50773..6b6beec 100644
--- a/libpsm2-use-exported-variable-for-version-and-release.patch
+++ b/libpsm2-use-exported-variable-for-version-and-release.patch
@@ -4,15 +4,15 @@ Date: Thu, 9 Jun 2016 14:15:39 +0200
Subject: [PATCH] use exported variable for version and release
---
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ Makefile | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
-diff --git a/Makefile b/Makefile
-index 8845901..1b792a4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -106,11 +106,11 @@ MINOR := $(PSM2_LIB_MINOR)
- nthreads := $(shell echo $$(( `nproc` * 2 )) )
+Index: Makefile
+===================================================================
+--- Makefile.orig 2016-12-06 16:12:45.891907761 +0100
++++ Makefile 2016-12-06 16:15:03.063168224 +0100
+@@ -135,15 +135,11 @@ endif
+ export LIBPSM2_COMPAT_CONF_DIR
# The desired version number comes from the most recent tag starting with "v"
-VERSION := $(shell if [ -e .git ] ; then git describe --tags --abbrev=0 --match='v*' | sed -e 's/^v//' -e 's/-/_/'; else echo "version" ; fi)
@@ -20,11 +20,12 @@ index 8845901..1b792a4 100644
#
# The desired release number comes the git describe following the version which
# is the number of commits since the version tag was planted suffixed by the g
--RELEASE := $(shell if [ -e .git ] ; then git describe --tags --long --match='v*' | sed -e 's/v[0-9.]*-\(.*\)/\1/' -e 's/-/_/' | sed -e 's/_g.*$$//'; else echo "release" ; fi)
+-RELEASE := $(shell if [ -f RELEASE ]; then cat RELEASE;\
+- elif [ -e .git ] ; then git describe --tags --long --match='v*' | \
+- sed -e 's/v[0-9.]*-\(.*\)/\1/' -e 's/-/_/' | \
+- sed -e 's/_g.*$$//'; \
+- else echo "release" ; fi)
+RELEASE ?= $(shell if [ -e .git ] ; then git describe --tags --long --match='v*' | sed -e 's/v[0-9.]*-\(.*\)/\1/' -e 's/-/_/' | sed -e 's/_g.*$$//'; else echo "release" ; fi)
- #
- # Concatenated version and release
---
-2.6.2
-
+ DIST_SHA := ${shell if [ -e .git ] ; then git log -n1 --pretty=format:%H ; \
+ else echo DIST_SHA ; fi}
diff --git a/libpsm2-use_RPM_OPT_FLAGS.patch b/libpsm2-use_RPM_OPT_FLAGS.patch
index 7f9e8fd..b828e4a 100644
--- a/libpsm2-use_RPM_OPT_FLAGS.patch
+++ b/libpsm2-use_RPM_OPT_FLAGS.patch
@@ -5,11 +5,11 @@
Index: buildflags.mak
===================================================================
---- buildflags.mak.orig 2016-03-02 16:34:21.679569395 +0100
-+++ buildflags.mak 2016-03-09 18:30:21.287468548 +0100
-@@ -90,7 +90,7 @@ else
- endif # gfortran
- endif # pathf90
+--- buildflags.mak.orig 2016-12-06 16:11:52.060197738 +0100
++++ buildflags.mak 2016-12-06 16:12:15.004074162 +0100
+@@ -80,7 +80,7 @@ else
+ anerr := $(error Unknown Fortran compiler arch: ${FCARCH})
+ endif # gfortran
-BASECFLAGS += $(BASE_FLAGS)
+BASECFLAGS += $(BASE_FLAGS) $(RPM_OPT_FLAGS)
@@ -18,8 +18,8 @@ Index: buildflags.mak
Index: compat/buildflags.mak
===================================================================
---- compat/buildflags.mak.orig 2016-03-02 16:34:21.679569395 +0100
-+++ compat/buildflags.mak 2016-03-09 18:30:22.127464014 +0100
+--- compat/buildflags.mak.orig 2016-12-06 16:11:45.612232462 +0100
++++ compat/buildflags.mak 2016-12-06 16:11:52.060197738 +0100
@@ -71,7 +71,7 @@ else
endif # gcc4
endif # gcc
diff --git a/libpsm2.changelog b/libpsm2.changelog
new file mode 100644
index 0000000..3ca62fc
--- /dev/null
+++ b/libpsm2.changelog
@@ -0,0 +1,159 @@
+2016-09-21 Aravind Gopalakrishnan
+
+ Sync with wfr-psm 10.2 release codebase
+ This code surface corresponds to the 10.2 release
+ of PSM2. Changes in this patch include few bew
+ fixes and patches to improve performance for certain
+ workloads bt interleaving the RTS handling.
+
+ While at it, removing some unnecessary files whose
+ functionality have been moved.
+
+2016-07-12 Russell McGuire (rwmcguir)
+
+ Update psm2_ep_close timeout handling
+ This change includes many patches for psm2_ep_close timeouts
+ * Fixed timeout logic for IPS layer disconnects
+ * Replaced usage of rand/srand/random with drand48_r
+ * Cleanup of internal connection symbols names
+ * Fix for amsh layer dropping disconnect packets
+ * Fixed issue with spec file not obsoleting older rpm name
+ * Update README for newer RPM names and usages
+ * Reduce timeout scaling for dropped packets during psm2_ep_close
+ for large scale jobs.
+
+2016-06-29 Russell McGuire (rwmcguir)
+
+ Remove deprecated hfi1-spec* files
+ These files were left over after the rpm
+ rename from hfi1-psm to libpsm2.
+
+2016-06-30 Aravind Gopalakrishnan
+
+ Upstreaming /dev/hfi_N selection logic and some bug fixes
+ This change primarily includes the following patches to PSM2-
+ * Remove usage of /dev/hfi
+ * Logic to select correct /dev/hfi_N
+ * Initialize frag_size in tidrecv array tidflows which
+ fixes assertion hit on debug builds
+ * Clear send_msgoff in req struct which fixes the hang
+ while using OPCODE_SHORT messages repeatedly
+
+2016-06-27 Russell McGuire (rwmcguir)
+
+ Update Makefile to use RELEASE_VER for rpm version
+ This change is to allow this git repo, to honor a
+ RELEASE_VER file for RPM naming convetion. This will be
+ used over counting the number of commits since the last
+ v. tag in the repo.
+
+ Mostly this is added to allow internal and external
+ rpm naming syncronization with Intel IFS releases for OPA.
+
+2016-06-28 Aravind Gopalakrishnan
+
+ Sync with wfr-psm 10.1 branch
+ This corresponds to the 10.1 release surface
+
+2016-06-28 Paul Reger
+
+ Adds many bug fixes, and heap debug code.
+ This surface corresponds to the code being upstreamed to Fedora.
+
+2016-06-23 pjreger
+
+ Merge pull request #5 from LeviDettwyler/10.2
+ Fix for assertion failure seen in PSM_DEBUG builds
+
+2016-06-23 Levi Dettwyler
+
+ Fix for assertion failure seen in PSM_DEBUG builds
+ Merging fix from internal repos to public github to correct tidflow frag_size assertion issue when running workloads with PSM_DEBUG builds.
+
+2016-05-06 Paul Reger
+
+ First commit for v10.2 branch, and first commit for Fedora 25 support.
+
+2016-04-06 Paul Reger
+
+ Adds many bug fixes, and heap debug code. This surface corresponds to the code being upstreamed to Fedora.
+
+ Adding two bug fixes. This surface corresonds to the 10.0.1 release.
+
+2016-03-03 Paul Reger
+
+ Limit rpm builds of the psm library to the x86_64 architecture only.
+
+2016-03-02 Paul Reger
+
+ Moved two unnecessary macros under PSM_DEBUG to fix build error on Fedora 24.
+
+2016-02-19 Paul Reger
+
+ Update gitub to RELEASE-10.0 version includes:
+ - Primarily bug fixes
+ - One feature was added that includes a new hashing scheme for MQ's
+ - Performance enhancements
+
+2015-12-07 Paul Reger
+
+ Update gitub to beta0, includes:
+ - Symbol renames from psm* to psm2* and PSM* to PSM2*,
+ - Compat library support added,
+ - Tid caching requires building and running with a driver
+ that includes tid caching support.
+
+2015-09-23 nbwhite
+
+ Merge pull request #2 from michich/no-exec-stack
+ prevent having executable stack
+
+2015-09-04 nbwhite
+
+ Merge pull request #1 from michich/master
+ fix issues found during packaging for RHEL
+
+2015-09-01 Michal Schmidt
+
+ prevent having executable stack
+ Add .note.GNU-stack sections to objects compiled from assembly.
+ This allows libpsm2.so.2.0 to have non-executable stack.
+
+2015-08-25 Michal Schmidt
+
+ use pkg-config to find udev rules dir
+ and default to /lib/udev (for system rules) rather than /etc/udev (which
+ is for the local administrator).
+
+2015-08-12 Michal Schmidt
+
+ avoid calling memset with zero length
+ This avoids the following build error:
+
+ In file included from /usr/include/string.h:638:0,
+ from ./include/opa_user.h:77,
+ from psm_user.h:67,
+ from psm_diags.c:56:
+ In function 'memset',
+ inlined from 'memcpy_check_one.constprop.4' at psm_diags.c:278:8,
+ inlined from 'memcpy_check_size.constprop.2' at psm_diags.c:335:30,
+ inlined from 'psmi_test_memcpy.constprop.1' at psm_diags.c:230:6,
+ inlined from 'psmi_diags' at psm_diags.c:84:25:
+ /usr/include/bits/string3.h:81:30: error: call to
+ '__warn_memset_zero_len' declared with attribute warning: memset used
+ with constant zero length parameter; this could be due to transposed
+ parameters [-Werror]
+ __warn_memset_zero_len ();
+ ^
+
+2015-08-12 Michal Schmidt
+
+ avoid executable flag on installed header files
+
+2015-07-23 Paul Reger
+
+ Sync github to internal git repo.
+
+2015-07-15 nbwhite
+
+ Initial commit
diff --git a/libpsm2.changes b/libpsm2.changes
index 4d75877..b8ce2e8 100644
--- a/libpsm2.changes
+++ b/libpsm2.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Dec 6 16:01:36 CET 2016 - pth@suse.de
+
+- Update to 10.2.2. As 0.7 isn't mentioned in the log, see
+ ChangeLog for any changes to the package.
+- Remove libpsm2-avoid-executable-flag-on-installed-header-files.patch
+ as the fix is upstream.
+- Adapt the remaining patches to the changed sources.
+- Generate ChangeLog from git log and package it.
+
-------------------------------------------------------------------
Thu Jun 9 14:20:16 CEST 2016 - ndas@suse.de
diff --git a/libpsm2.spec b/libpsm2.spec
index d797d75..e6f5be3 100644
--- a/libpsm2.spec
+++ b/libpsm2.spec
@@ -22,16 +22,16 @@
%define psm_so 2
Name: libpsm2
-Version: 0.7
+Version: 10.2.2
Release: 0
Summary: Intel PSM Libraries
License: BSD-2-Clause or GPL-2.0
Group: Development/Libraries
-Url: http://www.intel.com/
+Url: https://github.com/01org/opa-psm2/
Source: %{name}-%{version}.tar.gz
-Patch1: libpsm2-avoid-executable-flag-on-installed-header-files.patch
+Source1: libpsm2.changelog
Patch2: libpsm2-use_RPM_OPT_FLAGS.patch
-Patch3: libpsm2-use-exported-variable-for-version-and-release.patch
+Patch3: libpsm2-use-exported-variable-for-version-and-release.patch
BuildRequires: libuuid-devel
BuildRequires: pkg-config
BuildRequires: udev
@@ -80,9 +80,9 @@ Support for MPIs linked with PSM versions < 2
%prep
%setup -q -n %{name}-%{version}
-%patch1 -p1
%patch2
-%patch3 -p1
+%patch3
+cp %{S:1} ChangeLog
%build
export RPM_OPT_FLAGS
@@ -96,7 +96,7 @@ mkdir -p -m 0755 -p %{buildroot}/%{_libdir}/psm2
install -m0644 %{buildroot}/%{_libdir}/psm2-compat/libpsm_infinipath.so.1 %{buildroot}/%{_libdir}/psm2/libpsm_infinipath.so.1
# removing file to get rid of rpm errors
rm %{buildroot}/%{_libdir}/psm2-compat/libpsm_infinipath.so.1
-rm %{buildroot}/%{_sbindir}/hfi1-psm-compat.cmds
+rm %{buildroot}/%{_libexecdir}/%name/libpsm2-compat.cmds
%post -n %{name}-%{psm_so} -p /sbin/ldconfig
%postun -n %{name}-%{psm_so} -p /sbin/ldconfig
@@ -107,7 +107,7 @@ rm %{buildroot}/%{_sbindir}/hfi1-psm-compat.cmds
%defattr(-,root,root,-)
%{_libdir}/libpsm2.so.*
%{_udevrulesdir}/40-psm.rules
-%doc COPYING README
+%doc COPYING README ChangeLog
%files devel
%defattr(-,root,root,-)
@@ -124,6 +124,7 @@ rm %{buildroot}/%{_sbindir}/hfi1-psm-compat.cmds
%{_includedir}/hfi1diag/ptl_ips/ipserror.h
%{_includedir}/hfi1diag/linux-x86_64/bit_ops.h
%{_includedir}/hfi1diag/linux-x86_64/sysdep.h
+%_includedir/hfi1diag/hfi1_deprecated.h
%{_includedir}/hfi1diag/opa_udebug.h
%{_includedir}/hfi1diag/opa_debug.h
%{_includedir}/hfi1diag/opa_intf.h
@@ -139,6 +140,6 @@ rm %{buildroot}/%{_sbindir}/hfi1-psm-compat.cmds
%{_libdir}/psm2/libpsm_infinipath.so.*
%{_udevrulesdir}/40-psm-compat.rules
-%config %{_sysconfdir}/modprobe.d/hfi1-psm-compat.conf
+%config %{_sysconfdir}/modprobe.d/libpsm2-compat.conf
%changelog