Hello community, here is the log from the commit of package infinipath-psm for openSUSE:Factory checked in at 2017-05-03 15:52:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/infinipath-psm (Old) and /work/SRC/openSUSE:Factory/.infinipath-psm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "infinipath-psm" Wed May 3 15:52:39 2017 rev:9 rq:490168 version:3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/infinipath-psm/infinipath-psm.changes 2017-04-17 10:24:12.008152789 +0200 +++ /work/SRC/openSUSE:Factory/.infinipath-psm.new/infinipath-psm.changes 2017-05-03 15:52:49.589188175 +0200 @@ -1,0 +2,5 @@ +Wed Apr 19 08:40:53 UTC 2017 - nmoreychaisemar...@suse.com + +- Update to latest version v3.3-25-g326b95a (bsc#1027068, fate#322648) + +------------------------------------------------------------------- Old: ---- infinipath-psm-3.3-19_g67c0807_open.tar.gz New: ---- _service infinipath-psm-3.3-25_g326b95a.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ infinipath-psm.spec ++++++ --- /var/tmp/diff_new_pack.MfoUuF/_old 2017-05-03 15:52:50.421070733 +0200 +++ /var/tmp/diff_new_pack.MfoUuF/_new 2017-05-03 15:52:50.433069039 +0200 @@ -16,7 +16,7 @@ # -%define my_release -19_g67c0807 +%define my_release -25_g326b95a Name: infinipath-psm Version: 3.3 @@ -25,7 +25,7 @@ License: BSD-2-Clause or GPL-2.0 Group: Productivity/Networking/System Url: http://www.qlogic.com/ -Source0: http://downloads.openfabrics.org/downloads/infinipath-psm/%{name}-%{version}%{my_release}_open.tar.gz +Source0: %{name}-%{version}%{my_release}.tar.gz Source1: baselibs.conf # PATCH-FIX-UPSTREAM infinipath-psm-cflags.patch p...@suse.de Patch0: infinipath-psm-cflags.patch @@ -87,7 +87,7 @@ interfaces in parallel environments. %prep -%setup -q -n infinipath-psm-%{version}%{my_release}_open +%setup -q -n infinipath-psm-%{version}%{my_release} %patch0 %patch1 %patch3 ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/01org/psm.git</param> <param name="package-meta">no</param> <param name="exclude">.git</param> <param name="filename">infinipath-psm</param> <param name="version">3.3-25_g326b95a</param> <param name="revision">326b95a386f7aeb56743d0b09b2f68f07b856f28</param> </service> <service name="recompress" mode="disabled"> <param name="file">*infinipath-psm*.tar</param> <param name="compression">gz</param> </service> </services> ++++++ infinipath-psm-3.3-19_g67c0807_open.tar.gz -> infinipath-psm-3.3-25_g326b95a.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-19_g67c0807_open/COMMIT new/infinipath-psm-3.3-25_g326b95a/COMMIT --- old/infinipath-psm-3.3-19_g67c0807_open/COMMIT 2016-03-16 18:16:48.000000000 +0100 +++ new/infinipath-psm-3.3-25_g326b95a/COMMIT 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -67c0807c74e9d445900d5541358f0f575f22a630 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-19_g67c0807_open/infinipath-psm.spec new/infinipath-psm-3.3-25_g326b95a/infinipath-psm.spec --- old/infinipath-psm-3.3-19_g67c0807_open/infinipath-psm.spec 2016-03-16 18:16:48.000000000 +0100 +++ new/infinipath-psm-3.3-25_g326b95a/infinipath-psm.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,161 +0,0 @@ -# Copyright (c) 2012. Intel Corporation. All rights reserved. -# Copyright (c) 2010. QLogic Corporation. All rights reserved. -# -# This software is available to you under a choice of one of two -# licenses. You may choose to be licensed under the terms of the GNU -# General Public License (GPL) Version 2, available from the file -# COPYING in the main directory of this source tree, or the -# OpenIB.org BSD license below: -# -# Redistribution and use in source and binary forms, with or -# without modification, are permitted provided that the following -# conditions are met: -# -# - Redistributions of source code must retain the above -# copyright notice, this list of conditions and the following -# disclaimer. -# -# - Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials -# provided with the distribution. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -Summary: Intel PSM Libraries -Name: infinipath-psm -Version: 3.3 -Release: 19_g67c0807_open -Epoch: 4 -License: GPL -Group: System Environment/Libraries -URL: http://www.intel.com/ -Source0: %{name}-%{version}-%{release}.tar.gz -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Provides: infinipath-psm = %{version} -%if "%{PSM_HAVE_SCIF}" == "1" -Provides: intel-mic-psm = %{version} -%endif -# MIC package -Obsoletes: intel-mic-psm -# OFED package -Obsoletes: infinipath-libs <= %{version}-%{release} -Conflicts: infinipath-libs <= %{version}-%{release} -# mpss package -Obsoletes: mpss-psm <= %{version}-%{release} -Conflicts: mpss-psm <= %{version}-%{release} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - -%package -n infinipath-psm-devel -Summary: Development files for Intel PSM -Group: System Environment/Development -Requires: infinipath-psm = %{version}-%{release} -Provides: infinipath-psm-devel = %{version} -%if "%{PSM_HAVE_SCIF}" == "1" -Provides: intel-mic-psm-devel = %{version} -%endif -# MIC package -Obsoletes: intel-mic-psm-devel -# OFED package -Obsoletes: infinipath-devel <= %{version}-%{release} -Conflicts: infinipath-devel <= %{version}-%{release} -# mpss package -Obsoletes: mpss-psm-dev <= %{version}-%{release} -Conflicts: mpss-psm-dev <= %{version}-%{release} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - -# %package card-devel -# Summary: Development files for Intel Xeon Phi -# Group: System Environment/Development -# Requires: %{name} = %{version}-%{release} -# Requires(post): /sbin/ldconfig -# Requires(postun): /sbin/ldconfig - - -%global debug_package %{nil} - -#PSM_HAVE_SCIF is one of: 0 1 -%{!?PSM_HAVE_SCIF: %global PSM_HAVE_SCIF 0} - -%define INFINIPATH_MAKEARG PSM_HAVE_SCIF=0 MIC=0 -%define INTEL_MAKEARG PSM_HAVE_SCIF=1 MIC=0 -%define INTEL_CARD_MAKEARG PSM_HAVE_SCIF=1 MIC=1 LOCAL_PREFIX=/opt/intel/mic/psm -%define card_prefix /opt/intel/mic/psm - -%if "%{PSM_HAVE_SCIF}" == "0" - %define MAKEARG PSM_HAVE_SCIF=0 MIC=0 -%else - %if "%{PSM_HAVE_SCIF}" == "1" - %define MAKEARG PSM_HAVE_SCIF=1 MIC=0 - %else - %define MAKEARG PSM_HAVE_SCIF=0 MIC=0 - %define PSM_HAVE_SCIF "1" - %endif -%endif - -%description -The PSM Messaging API, or PSM API, is Intel's low-level -user-level communications interface for the True Scale -family of products. PSM users are enabled with mechanisms -necessary to implement higher level communications -interfaces in parallel environments. - -%description -n infinipath-psm-devel -Development files for the libpsm_infinipath library - -%prep -%setup -q -n %{name}-%{version}-%{release} - -%build -%{__make} USE_PSM_UUID=1 %{MAKEARG} - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT -export DESTDIR=$RPM_BUILD_ROOT -%{__make} install %{MAKEARG} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig -%post devel -p /sbin/ldconfig -%postun devel -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -/usr/lib64/libpsm_infinipath.so.* -/usr/lib64/libinfinipath.so.* -%if "%{PSM_HAVE_SCIF}" == "1" -/usr/sbin/psmd -%endif - -%files -n infinipath-psm-devel -%defattr(-,root,root,-) -/usr/lib64/libpsm_infinipath.so -/usr/lib64/libinfinipath.so -/usr/include/psm.h -/usr/include/psm_mq.h - - - -%changelog -* Fri Sep 25 2015 Henry Estela <henry.r.est...@intel.com> - 3.3-1 -- Always build infinipath-psm with different Provides names. -* Tue Nov 6 2012 Mitko Haralanov <mitko.harala...@intel.com> - 3.3-1 -- Add Intel Xeon Phi related changes -* Tue May 11 2010 Mitko Haralanov <mi...@qlogic.com> - 3.3-1 -- Initial build. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-19_g67c0807_open/infinipath-psm.spec.in new/infinipath-psm-3.3-25_g326b95a/infinipath-psm.spec.in --- old/infinipath-psm-3.3-19_g67c0807_open/infinipath-psm.spec.in 1970-01-01 01:00:00.000000000 +0100 +++ new/infinipath-psm-3.3-25_g326b95a/infinipath-psm.spec.in 2016-08-15 19:47:30.000000000 +0200 @@ -0,0 +1,163 @@ +# Copyright (c) 2012. Intel Corporation. All rights reserved. +# Copyright (c) 2010. QLogic Corporation. All rights reserved. +# +# This software is available to you under a choice of one of two +# licenses. You may choose to be licensed under the terms of the GNU +# General Public License (GPL) Version 2, available from the file +# COPYING in the main directory of this source tree, or the +# OpenIB.org BSD license below: +# +# Redistribution and use in source and binary forms, with or +# without modification, are permitted provided that the following +# conditions are met: +# +# - Redistributions of source code must retain the above +# copyright notice, this list of conditions and the following +# disclaimer. +# +# - Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# + +Summary: Intel PSM Libraries +Name: infinipath-psm +Version: @VERSION@ +Release: @RELEASE@ +Epoch: 4 +License: GPL +Group: System Environment/Libraries +URL: http://www.intel.com/ +Source0: %{name}-%{version}-%{release}.tar.gz +Prefix: /usr +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Provides: infinipath-psm = %{version} +%if "%{PSM_HAVE_SCIF}" == "1" +Provides: intel-mic-psm = %{version} +%endif +# MIC package +Obsoletes: intel-mic-psm +# OFED package +Obsoletes: infinipath-libs <= %{version}-%{release} +Conflicts: infinipath-libs <= %{version}-%{release} +# mpss package +Obsoletes: mpss-psm <= %{version}-%{release} +Conflicts: mpss-psm <= %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +@REQUIRES@ + +%package -n infinipath-psm-devel +Summary: Development files for Intel PSM +Group: System Environment/Development +Requires: infinipath-psm = %{version}-%{release} +Provides: infinipath-psm-devel = %{version} +%if "%{PSM_HAVE_SCIF}" == "1" +Provides: intel-mic-psm-devel = %{version} +%endif +# MIC package +Obsoletes: intel-mic-psm-devel +# OFED package +Obsoletes: infinipath-devel <= %{version}-%{release} +Conflicts: infinipath-devel <= %{version}-%{release} +# mpss package +Obsoletes: mpss-psm-dev <= %{version}-%{release} +Conflicts: mpss-psm-dev <= %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +@REQUIRES-DEVEL@ + +# %package card-devel +# Summary: Development files for Intel Xeon Phi +# Group: System Environment/Development +# Requires: %{name} = %{version}-%{release} +# Requires(post): /sbin/ldconfig +# Requires(postun): /sbin/ldconfig + + +%global debug_package %{nil} + +#PSM_HAVE_SCIF is one of: 0 1 +%{!?PSM_HAVE_SCIF: %global PSM_HAVE_SCIF 0} + +%define INFINIPATH_MAKEARG PSM_HAVE_SCIF=0 MIC=0 +%define INTEL_MAKEARG PSM_HAVE_SCIF=1 MIC=0 +%define INTEL_CARD_MAKEARG PSM_HAVE_SCIF=1 MIC=1 LOCAL_PREFIX=/opt/intel/mic/psm +%define card_prefix /opt/intel/mic/psm + +%if "%{PSM_HAVE_SCIF}" == "0" + %define MAKEARG PSM_HAVE_SCIF=0 MIC=0 +%else + %if "%{PSM_HAVE_SCIF}" == "1" + %define MAKEARG PSM_HAVE_SCIF=1 MIC=0 + %else + %define MAKEARG PSM_HAVE_SCIF=0 MIC=0 + %define PSM_HAVE_SCIF "1" + %endif +%endif + +%description +The PSM Messaging API, or PSM API, is Intel's low-level +user-level communications interface for the True Scale +family of products. PSM users are enabled with mechanisms +necessary to implement higher level communications +interfaces in parallel environments. + +%description -n infinipath-psm-devel +Development files for the libpsm_infinipath library + +%prep +%setup -q -n %{name}-%{version}-%{release} + +%build +%{__make} @PSM_UUID@ %{MAKEARG} + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT +export DESTDIR=$RPM_BUILD_ROOT +%{__make} install %{MAKEARG} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig +%post devel -p /sbin/ldconfig +%postun devel -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +/usr/lib64/libpsm_infinipath.so.* +/usr/lib64/libinfinipath.so.* +%if "%{PSM_HAVE_SCIF}" == "1" +/usr/sbin/psmd +%endif + +%files -n infinipath-psm-devel +%defattr(-,root,root,-) +/usr/lib64/libpsm_infinipath.so +/usr/lib64/libinfinipath.so +/usr/include/psm.h +/usr/include/psm_mq.h + + + +%changelog +* Fri Sep 25 2015 Henry Estela <henry.r.est...@intel.com> - @VERSION@-1 +- Always build infinipath-psm with different Provides names. +* Tue Nov 6 2012 Mitko Haralanov <mitko.harala...@intel.com> - @VERSION@-1 +- Add Intel Xeon Phi related changes +* Tue May 11 2010 Mitko Haralanov <mi...@qlogic.com> - @VERSION@-1 +- Initial build. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-19_g67c0807_open/intel-mic-psm-card.spec.in new/infinipath-psm-3.3-25_g326b95a/intel-mic-psm-card.spec.in --- old/infinipath-psm-3.3-19_g67c0807_open/intel-mic-psm-card.spec.in 1970-01-01 01:00:00.000000000 +0100 +++ new/infinipath-psm-3.3-25_g326b95a/intel-mic-psm-card.spec.in 2016-08-15 19:47:30.000000000 +0200 @@ -0,0 +1,112 @@ +# Copyright (c) 2012. Intel Corporation. All rights reserved. +# +# This software is available to you under a choice of one of two +# licenses. You may choose to be licensed under the terms of the GNU +# General Public License (GPL) Version 2, available from the file +# COPYING in the main directory of this source tree, or the +# OpenIB.org BSD license below: +# +# Redistribution and use in source and binary forms, with or +# without modification, are permitted provided that the following +# conditions are met: +# +# - Redistributions of source code must retain the above +# copyright notice, this list of conditions and the following +# disclaimer. +# +# - Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# + +%define debug_package ${nil} +%{!?install_prefix:%define install_prefix /usr} + +Summary: Intel PSM Libraries for Intel Xeon Phi +Name: intel-mic-psm-card +Version: @VERSION@ +Release: @RELEASE@ +License: GPL +Group: System Environment/Damon +URL: http://www.intel.com/ +Source0: %{name}-%{version}-%{release}.tar.gz +Prefix: /usr +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +@REQUIRES@ + +%package devel +Summary: Development files for Intel Xeon Phi +Group: System Environment/Development +Requires: %{name} = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +%description +The PSM Messaging API, or PSM API, is Intel's low-level +user-level communications interface for the True Scale +family of products. PSM users are enabled with mechanisms +necessary to implement higher level communications +interfaces in parallel environments. + +%description devel +Development files for libpsm_infinipath library + +%prep +%setup -q -n %{name}-%{version}-%{release} + +%build +%{__make} + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT +%{make_install} +%if %(test "%{install_prefix}" = "/usr" && echo 0 || echo 1) + cp -a mic/* $RPM_BUILD_ROOT + find $RPM_BUILD_ROOT/ -name "*.in" -exec rm -f {} \; +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig +%post devel -p /sbin/ldconfig +%postun devel -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{install_prefix}/lib64/libpsm_infinipath.so.* +%{install_prefix}/lib64/libinfinipath.so.* +%if %(test "%{install_prefix}" = "/usr" && echo 0 || echo 1) + %{install_prefix}/psm.filelist + %{_sysconfdir}/sysconfig/mic/conf.d/psm.conf +%endif + +%files devel +%defattr(-,root,root,-) +%{install_prefix}/lib64/libpsm_infinipath.so +%{install_prefix}/lib64/libinfinipath.so + +%changelog +* Thu Apr 11 2013 Mitko Haralanov <mitko.harala...@intel.com> +- Remove any unwanted files before packaging +* Wed Nov 28 2012 Mitko Haralanov <mitko.harala...@intel.com> +- Add Xeon Phi devel package +* Thu Nov 9 2012 Mitko Haralanov <mitko.harala...@intel.com> +- Add TMI to package +* Mon Nov 5 2012 Mitko Haralanov <mitko.harala...@intel.com> +- Initial build. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-19_g67c0807_open/intel-mic-psm.spec.in new/infinipath-psm-3.3-25_g326b95a/intel-mic-psm.spec.in --- old/infinipath-psm-3.3-19_g67c0807_open/intel-mic-psm.spec.in 1970-01-01 01:00:00.000000000 +0100 +++ new/infinipath-psm-3.3-25_g326b95a/intel-mic-psm.spec.in 2016-08-15 19:47:30.000000000 +0200 @@ -0,0 +1,207 @@ +# Copyright (c) 2012. Intel Corporation. All rights reserved. +# Copyright (c) 2010. QLogic Corporation. All rights reserved. +# +# This software is available to you under a choice of one of two +# licenses. You may choose to be licensed under the terms of the GNU +# General Public License (GPL) Version 2, available from the file +# COPYING in the main directory of this source tree, or the +# OpenIB.org BSD license below: +# +# Redistribution and use in source and binary forms, with or +# without modification, are permitted provided that the following +# conditions are met: +# +# - Redistributions of source code must retain the above +# copyright notice, this list of conditions and the following +# disclaimer. +# +# - Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# + +Summary: Intel PSM Libraries +Name: intel-mic-psm +Version: @VERSION@ +Release: @RELEASE@ +License: GPL +Group: System Environment/Libraries +URL: http://www.intel.com/ +Source0: %{name}-%{version}-%{release}.tar.gz +Prefix: /usr +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Provides: %{name} = %{version} +# ifs package +Obsoletes: infinipath-libs <= %{version}-%{release} +Conflicts: infinipath-libs <= %{version}-%{release} +# mpss package +Obsoletes: mpss-psm <= %{version}-%{release} +Conflicts: mpss-psm <= %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +@REQUIRES@ + +%package devel +Summary: Development files for Intel PSM +Group: System Environment/Development +Requires: %{name} = %{version}-%{release} +Provides: %{name}-devel = %{version} +# ifs package +Obsoletes: infinipath-devel <= %{version}-%{release} +Conflicts: infinipath-devel <= %{version}-%{release} +# mpss package +Obsoletes: mpss-psm-dev <= %{version}-%{release} +Conflicts: mpss-psm-dev <= %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +@REQUIRES-DEVEL@ + + +%package -n infinipath-psm +Summary: QLogic PSM Libraries +Epoch: 4 +License: GPL +Group: System Environment/Libraries +URL: http://www.qlogic.com/ +Prefix: /usr +Provides: infinipath-psm = %{version} +Conflicts: infinipath-libs intel-mic-psm +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +@REQUIRES@ + +%package -n infinipath-psm-devel +Summary: Development files for Intel PSM +Group: System Environment/Development +Requires: infinipath-psm = %{version}-%{release} +Provides: infinipath-psm-devel = %{version} +# ifs package +Obsoletes: infinipath-devel <= %{version}-%{release} +Conflicts: infinipath-devel <= %{version}-%{release} +# mpss package +Obsoletes: mpss-psm-dev <= %{version}-%{release} +Conflicts: mpss-psm-dev <= %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +@REQUIRES-DEVEL@ + +# %package card-devel +# Summary: Development files for Intel Xeon Phi +# Group: System Environment/Development +# Requires: %{name} = %{version}-%{release} +# Requires(post): /sbin/ldconfig +# Requires(postun): /sbin/ldconfig + + +%global debug_package %{nil} + +#%{!?install_prefix:%define install_prefix /usr} +#PSM_HAVE_SCIF is one of: 0 1 +%{!?PSM_HAVE_SCIF: %global PSM_HAVE_SCIF 0} + +%define INFINIPATH_MAKEARG PSM_HAVE_SCIF=0 MIC=0 +%define INTEL_MAKEARG PSM_HAVE_SCIF=1 MIC=0 +%define INTEL_CARD_MAKEARG PSM_HAVE_SCIF=1 MIC=1 LOCAL_PREFIX=/opt/intel/mic/psm +%define card_prefix /opt/intel/mic/psm + +%if "%{PSM_HAVE_SCIF}" == "0" + %define MAKEARG PSM_HAVE_SCIF=0 MIC=0 +%else + %if "%{PSM_HAVE_SCIF}" == "1" + %define MAKEARG PSM_HAVE_SCIF=1 MIC=0 + %else + %define MAKEARG PSM_HAVE_SCIF=0 MIC=0 + %define PSM_HAVE_SCIF "1" + %endif +%endif + +%description +The PSM Messaging API, or PSM API, is Intel's low-level +user-level communications interface for the True Scale +family of products. PSM users are enabled with mechanisms +necessary to implement higher level communications +interfaces in parallel environments. + +%description devel +Development files for the libpsm_infinipath library + +%description -n infinipath-psm +The PSM Messaging API, or PSM API, is QLogic's low-level +user-level communications interface for the Truescale +family of products. PSM users are enabled with mechanisms +necessary to implement higher level communications +interfaces in parallel environments. + +%description -n infinipath-psm-devel +Development files for the libpsm_infinipath library + +%prep +%setup -q -n %{name}-%{version}-%{release} + +%build +%{__make} @PSM_UUID@ %{MAKEARG} + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT +export DESTDIR=$RPM_BUILD_ROOT +%{__make} install %{MAKEARG} + + + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig +%post devel -p /sbin/ldconfig +%postun devel -p /sbin/ldconfig + +%if "%{PSM_HAVE_SCIF}" == "1" +%files +%defattr(-,root,root,-) +%{install_prefix}/lib64/libpsm_infinipath.so.* +%{install_prefix}/lib64/libinfinipath.so.* +/usr/sbin/psmd + +%files devel +%defattr(-,root,root,-) +%{install_prefix}/lib64/libpsm_infinipath.so +%{install_prefix}/lib64/libinfinipath.so +/usr/include/psm.h +/usr/include/psm_mq.h +%endif + + +%if "%{PSM_HAVE_SCIF}" == "0" +%files -n infinipath-psm +%defattr(-,root,root,-) +%{install_prefix}/lib64/libpsm_infinipath.so.* +%{install_prefix}/lib64/libinfinipath.so.* + +%files -n infinipath-psm-devel +%defattr(-,root,root,-) +%{install_prefix}/lib64/libpsm_infinipath.so +%{install_prefix}/lib64/libinfinipath.so +/usr/include/psm.h +/usr/include/psm_mq.h +%endif + + + +%changelog +* Tue Nov 6 2012 Mitko Haralanov <mitko.harala...@intel.com> - @VERSION@-1 +- Add Intel Xeon Phi related changes +* Tue May 11 2010 Mitko Haralanov <mi...@qlogic.com> - @VERSION@-1 +- Initial build. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-19_g67c0807_open/psm.h new/infinipath-psm-3.3-25_g326b95a/psm.h --- old/infinipath-psm-3.3-19_g67c0807_open/psm.h 2016-03-16 18:16:47.000000000 +0100 +++ new/infinipath-psm-3.3-25_g326b95a/psm.h 2016-08-15 19:47:30.000000000 +0200 @@ -275,7 +275,7 @@ * individually set for each opened endpoint. By default, endpoints will * inherit the global handler registered at the time of open. * - * [in] ep Handle associated to the endpoint over which the error occured + * [in] ep Handle associated to the endpoint over which the error occurred * or NULL if the error is being handled by the global error * handler. * [in] error PSM error identifier diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-19_g67c0807_open/psm_diags.c new/infinipath-psm-3.3-25_g326b95a/psm_diags.c --- old/infinipath-psm-3.3-19_g67c0807_open/psm_diags.c 2016-03-16 18:16:47.000000000 +0100 +++ new/infinipath-psm-3.3-25_g326b95a/psm_diags.c 2016-08-15 19:47:30.000000000 +0200 @@ -281,13 +281,14 @@ if (USE_MALLOC) { src = psmi_malloc(PSMI_EP_NONE, UNDEFINED, size); dst = psmi_malloc(PSMI_EP_NONE, UNDEFINED, size); - if (src == NULL || dst == NULL) + if (src == NULL || dst == NULL) { if (src) psmi_free(src); if (dst) psmi_free(dst); return -1; + } } else { - void *src_p, *dst_p; + void *src_p = NULL, *dst_p = NULL; if (posix_memalign(&src_p, 64, size) != 0 || posix_memalign(&dst_p, 64, size) != 0) { if (src_p) psmi_free(src_p); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-19_g67c0807_open/psm_error.c new/infinipath-psm-3.3-25_g326b95a/psm_error.c --- old/infinipath-psm-3.3-19_g67c0807_open/psm_error.c 2016-03-16 18:16:47.000000000 +0100 +++ new/infinipath-psm-3.3-25_g326b95a/psm_error.c 2016-08-15 19:47:30.000000000 +0200 @@ -251,7 +251,7 @@ { PSMI_NOLOG, "unknown 37" }, { PSMI_NOLOG, "unknown 38" }, { PSMI_NOLOG, "unknown 39" }, - { PSMI_NOLOG, "Unknown/unresolved connection status (other errors occured)" }, /* PSM_EPID_UNKNOWN = 40 */ + { PSMI_NOLOG, "Unknown/unresolved connection status (other errors occurred)" }, /* PSM_EPID_UNKNOWN = 40 */ { PSMI_NOLOG, "Endpoint could not be reached" }, /* PSM_EPID_UNREACHABLE = 41 */ { PSMI_NOLOG, "unknown 42" }, { LOG_CRIT , "Invalid node (mismatch in bit width 32/64 or byte order)" }, /* PSM_EPID_INVALID_NODE = 43 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-19_g67c0807_open/psm_mq.h new/infinipath-psm-3.3-25_g326b95a/psm_mq.h --- old/infinipath-psm-3.3-19_g67c0807_open/psm_mq.h 2016-03-16 18:16:48.000000000 +0100 +++ new/infinipath-psm-3.3-25_g326b95a/psm_mq.h 2016-08-15 19:47:30.000000000 +0200 @@ -552,7 +552,7 @@ * * [retval] PSM_OK The request could be successfully cancelled such that the * preposted receive buffer could be removed from the preposted - * receive queue before a match occured. The associated @c + * receive queue before a match occurred. The associated @c * request remains unchanged and the user must still return * the storage to the MQ library. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-19_g67c0807_open/ptl.h new/infinipath-psm-3.3-25_g326b95a/ptl.h --- old/infinipath-psm-3.3-19_g67c0807_open/ptl.h 2016-03-16 18:16:48.000000000 +0100 +++ new/infinipath-psm-3.3-25_g326b95a/ptl.h 2016-08-15 19:47:30.000000000 +0200 @@ -130,7 +130,7 @@ * ptl needs. * post 1: PTL marks error[i] as UNREACHABLE if PTL can't get to epid[i] * post 2: PTL marks error[i] as UNKNOWN for all epid[i] that couldn't be - * connected before a timeout occured. + * connected before a timeout occurred. * post 3: PTL returns OK iff all epids are either OK or UNREACHABLE * post 4: PTL defines content or epaddr[i] only if epaddr[i] is OK. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-19_g67c0807_open/ptl_am/am_reqrep_shmem.c new/infinipath-psm-3.3-25_g326b95a/ptl_am/am_reqrep_shmem.c --- old/infinipath-psm-3.3-19_g67c0807_open/ptl_am/am_reqrep_shmem.c 2016-03-16 18:16:48.000000000 +0100 +++ new/infinipath-psm-3.3-25_g326b95a/ptl_am/am_reqrep_shmem.c 2016-08-15 19:47:30.000000000 +0200 @@ -541,8 +541,8 @@ ips_mb(); ep->amsh_dirpage->is_init = 1; - _IPATH_PRDBG("Mapped and initalized shm object control page at %p," - "size=%ld, kcopy minor is %d (mode=%s)\n", mapptr, + _IPATH_PRDBG("Mapped and initialized shm object control page at %p," + "size=%zu, kcopy minor is %d (mode=%s)\n", mapptr, segsz, kcopy_minor, psmi_kassist_getmode(ep->psmi_kassist_mode)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_spio.c new/infinipath-psm-3.3-25_g326b95a/ptl_ips/ips_spio.c --- old/infinipath-psm-3.3-19_g67c0807_open/ptl_ips/ips_spio.c 2016-03-16 18:16:48.000000000 +0100 +++ new/infinipath-psm-3.3-25_g326b95a/ptl_ips/ips_spio.c 2016-08-15 19:47:30.000000000 +0200 @@ -324,7 +324,7 @@ } if (event_mask & IPATH_EVENT_LID_CHANGE) { - /* Display a warning that LID change has occured during the run. This + /* Display a warning that LID change has occurred during the run. This * is not supported in the current implementation and in general is * bad for the SM to re-assign LIDs during a run. */
