Accepting request 438031 from SUSE:SLE-12-SP2:GA
OBS-URL: https://build.opensuse.org/request/show/438031 OBS-URL: https://build.opensuse.org/package/show/science:HPC/libpsm2?expand=0&rev=1
This commit is contained in:
Nirmoy Das
Git OBS Bridge
commit
c7c98551a5
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
||||
22
_service
Normal file
22
_service
Normal file
@ -0,0 +1,22 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://github.com/01org/opa-psm2.git</param>
|
||||
<param name="package-meta">no</param>
|
||||
<param name="exclude">.git</param>
|
||||
<!--
|
||||
To update to a new release, change "revision" to the desired
|
||||
git commit hash and bump "version" if necessary
|
||||
|
||||
<param name="versionformat">1.1.13+git%cd.%h</param>
|
||||
-->
|
||||
<param name="version">0.7</param>
|
||||
<param name="revision">85c07c656198204c4056e1984779fde98b00ba39</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*pacemaker*.tar</param>
|
||||
<param name="compression">bz2</param>
|
||||
</service>
|
||||
|
||||
<service name="set_version" mode="disabled"/>
|
||||
</services>
|
||||
3
libpsm2-0.7.tar.gz
Normal file
3
libpsm2-0.7.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f4e9caceac25ceec0b6340fd0cdccb844b5f915a7d07de31fb404f2c6a495336
|
||||
size 1060302
|
||||
@ -0,0 +1,31 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 8845901..376f2e4 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -172,16 +172,16 @@ install: all
|
||||
mkdir -p ${DESTDIR}/usr/include/hfi1diag
|
||||
mkdir -p ${DESTDIR}/usr/include/hfi1diag/linux-x86_64
|
||||
mkdir -p ${DESTDIR}/usr/include/hfi1diag/ptl_ips
|
||||
- install -D ptl_ips/ipserror.h ${DESTDIR}/usr/include/hfi1diag/ptl_ips/ipserror.h
|
||||
- install -D include/linux-x86_64/bit_ops.h ${DESTDIR}/usr/include/hfi1diag/linux-x86_64/bit_ops.h
|
||||
- install -D include/linux-x86_64/sysdep.h ${DESTDIR}/usr/include/hfi1diag/linux-x86_64/sysdep.h
|
||||
- install -D include/opa_udebug.h ${DESTDIR}/usr/include/hfi1diag/opa_udebug.h
|
||||
- install -D include/opa_debug.h ${DESTDIR}/usr/include/hfi1diag/opa_debug.h
|
||||
- install -D include/opa_intf.h ${DESTDIR}/usr/include/hfi1diag/opa_intf.h
|
||||
- install -D include/opa_user.h ${DESTDIR}/usr/include/hfi1diag/opa_user.h
|
||||
- install -D include/opa_service.h ${DESTDIR}/usr/include/hfi1diag/opa_service.h
|
||||
- install -D include/opa_common.h ${DESTDIR}/usr/include/hfi1diag/opa_common.h
|
||||
- install -D include/opa_byteorder.h ${DESTDIR}/usr/include/hfi1diag/opa_byteorder.h
|
||||
+ install -m 0644 -D ptl_ips/ipserror.h ${DESTDIR}/usr/include/hfi1diag/ptl_ips/ipserror.h
|
||||
+ install -m 0644 -D include/linux-x86_64/bit_ops.h ${DESTDIR}/usr/include/hfi1diag/linux-x86_64/bit_ops.h
|
||||
+ install -m 0644 -D include/linux-x86_64/sysdep.h ${DESTDIR}/usr/include/hfi1diag/linux-x86_64/sysdep.h
|
||||
+ install -m 0644 -D include/opa_udebug.h ${DESTDIR}/usr/include/hfi1diag/opa_udebug.h
|
||||
+ install -m 0644 -D include/opa_debug.h ${DESTDIR}/usr/include/hfi1diag/opa_debug.h
|
||||
+ install -m 0644 -D include/opa_intf.h ${DESTDIR}/usr/include/hfi1diag/opa_intf.h
|
||||
+ install -m 0644 -D include/opa_user.h ${DESTDIR}/usr/include/hfi1diag/opa_user.h
|
||||
+ install -m 0644 -D include/opa_service.h ${DESTDIR}/usr/include/hfi1diag/opa_service.h
|
||||
+ install -m 0644 -D include/opa_common.h ${DESTDIR}/usr/include/hfi1diag/opa_common.h
|
||||
+ install -m 0644 -D include/opa_byteorder.h ${DESTDIR}/usr/include/hfi1diag/opa_byteorder.h
|
||||
|
||||
specfile:
|
||||
sed -e 's/@VERSION@/'${VERSION}'/g' ${RPM_NAME}.spec.in | \
|
||||
30
libpsm2-use-exported-variable-for-version-and-release.patch
Normal file
30
libpsm2-use-exported-variable-for-version-and-release.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From b231e55f53c1257c76ecb0805f5fb380de230b2d Mon Sep 17 00:00:00 2001
|
||||
From: Nirmoy Das <ndas@suse.de>
|
||||
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(-)
|
||||
|
||||
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 )) )
|
||||
|
||||
# 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)
|
||||
+VERSION ?= $(shell if [ -e .git ] ; then git describe --tags --abbrev=0 --match='v*' | sed -e 's/^v//' -e 's/-/_/'; else echo "version" ; fi)
|
||||
#
|
||||
# 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<commitid>
|
||||
-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 [ -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
|
||||
|
||||
31
libpsm2-use_RPM_OPT_FLAGS.patch
Normal file
31
libpsm2-use_RPM_OPT_FLAGS.patch
Normal file
@ -0,0 +1,31 @@
|
||||
---
|
||||
buildflags.mak | 2 +-
|
||||
compat/buildflags.mak | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
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
|
||||
|
||||
-BASECFLAGS += $(BASE_FLAGS)
|
||||
+BASECFLAGS += $(BASE_FLAGS) $(RPM_OPT_FLAGS)
|
||||
LDFLAGS += $(BASE_FLAGS)
|
||||
ASFLAGS += $(BASE_FLAGS)
|
||||
|
||||
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
|
||||
@@ -71,7 +71,7 @@ else
|
||||
endif # gcc4
|
||||
endif # gcc
|
||||
|
||||
-BASECFLAGS += $(BASE_FLAGS)
|
||||
+BASECFLAGS += $(BASE_FLAGS) $(RPM_OPT_FLAGS)
|
||||
LDFLAGS += $(BASE_FLAGS)
|
||||
ASFLAGS += $(BASE_FLAGS)
|
||||
|
||||
41
libpsm2.changes
Normal file
41
libpsm2.changes
Normal file
@ -0,0 +1,41 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 9 14:20:16 CEST 2016 - ndas@suse.de
|
||||
|
||||
- Removed git from buildrequires and specify version and revision using
|
||||
environment variables (bsc#983235).
|
||||
|
||||
[+libpsm2-use-exported-variable-for-version-and-release.patch]
|
||||
|
||||
- Added a _service file(bsc#983235).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 27 10:25:07 CEST 2016 - ndas@suse.de
|
||||
|
||||
- Removed hfi1_user.h from the source as the required changes
|
||||
are available in kernel-devel's hfi1_user.h(bsc#980733).
|
||||
|
||||
[-hfi1_user.h]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 23 09:47:20 CET 2016 - ndas@suse.de
|
||||
|
||||
- Fix build error (bsc#972292).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 11 16:33:22 CET 2016 - pth@suse.de
|
||||
|
||||
- Fix dependency of libpsm2-devel and -compat(bsc#970895).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 9 18:21:57 CET 2016 - pth@suse.de
|
||||
|
||||
- Add libpsm2-use_RPM_OPT_FLAGS.patch to include RPM_OPT_FLAGS
|
||||
in CFLAGS.
|
||||
- Do not recreate RPM_BUILD_ROOT.
|
||||
- Remove unneeded %clean section
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 2 16:58:02 UTC 2016 - nirmoy.das@suse.com
|
||||
|
||||
- Initial Package, Version 0.7(fate#319243).
|
||||
|
||||
144
libpsm2.spec
Normal file
144
libpsm2.spec
Normal file
@ -0,0 +1,144 @@
|
||||
#
|
||||
# spec file for package libpsm2
|
||||
#
|
||||
# Copyright (c) 2016 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
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# 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/
|
||||
#
|
||||
#The tarball is generated using
|
||||
# git clone https://github.com/01org/opa-psm2
|
||||
# cd opa-psm2
|
||||
# git checkout 85c07c656198204c4056e1984779fde98b00ba39
|
||||
# make dist
|
||||
|
||||
%define psm_so 2
|
||||
Name: libpsm2
|
||||
Version: 0.7
|
||||
Release: 0
|
||||
Summary: Intel PSM Libraries
|
||||
License: BSD-2-Clause or GPL-2.0
|
||||
Group: Development/Libraries
|
||||
Url: http://www.intel.com/
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
Patch1: libpsm2-avoid-executable-flag-on-installed-header-files.patch
|
||||
Patch2: libpsm2-use_RPM_OPT_FLAGS.patch
|
||||
Patch3: libpsm2-use-exported-variable-for-version-and-release.patch
|
||||
BuildRequires: libuuid-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: udev
|
||||
Conflicts: opa-libs
|
||||
Obsoletes: hfi-psm
|
||||
Obsoletes: hfi-psm-debuginfo
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
#Currently *only* builds on x86_64
|
||||
ExclusiveArch: x86_64
|
||||
|
||||
%description
|
||||
The PSM Messaging API, or PSM API, is Intel'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.
|
||||
|
||||
%package -n %{name}-%{psm_so}
|
||||
Summary: Runtime PSM library
|
||||
Group: System/Libraries
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description -n %{name}-%{psm_so}
|
||||
libpsm2 provides PSM Messaging API, or PSM API, is Intel's low-level
|
||||
user-level communications interface for the Truescale
|
||||
family of products. This package contains the runtime library.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for Intel PSM
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name}-%{psm_so} = %{version}
|
||||
Requires: libuuid-devel
|
||||
Conflicts: opa-devel
|
||||
|
||||
%package compat
|
||||
Summary: Development files for Intel PSM
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-%{psm_so} = %{version}
|
||||
#Obsoletes: hfi-psm-compat
|
||||
|
||||
%description devel
|
||||
Development files for the libpsm2 library
|
||||
|
||||
%description compat
|
||||
Support for MPIs linked with PSM versions < 2
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch1 -p1
|
||||
%patch2
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
export RPM_OPT_FLAGS
|
||||
export VERSION=${Version} RELEASE=${Release}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
export DESTDIR=%{buildroot}
|
||||
make %{?_smp_mflags} DESTDIR=%{buildroot} install
|
||||
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
|
||||
|
||||
%post -n %{name}-%{psm_so} -p /sbin/ldconfig
|
||||
%postun -n %{name}-%{psm_so} -p /sbin/ldconfig
|
||||
%post devel -p /sbin/ldconfig
|
||||
%postun devel -p /sbin/ldconfig
|
||||
|
||||
%files -n %{name}-%{psm_so}
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libpsm2.so.*
|
||||
%{_udevrulesdir}/40-psm.rules
|
||||
%doc COPYING README
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libpsm2.so
|
||||
%{_includedir}/psm2.h
|
||||
%{_includedir}/psm2_mq.h
|
||||
%{_includedir}/psm2_am.h
|
||||
|
||||
# The following files were part of the devel-noship and moved to devel:
|
||||
%dir %{_includedir}/hfi1diag/
|
||||
%dir %{_includedir}/hfi1diag/linux-x86_64/
|
||||
%dir %{_includedir}/hfi1diag/ptl_ips/
|
||||
|
||||
%{_includedir}/hfi1diag/ptl_ips/ipserror.h
|
||||
%{_includedir}/hfi1diag/linux-x86_64/bit_ops.h
|
||||
%{_includedir}/hfi1diag/linux-x86_64/sysdep.h
|
||||
%{_includedir}/hfi1diag/opa_udebug.h
|
||||
%{_includedir}/hfi1diag/opa_debug.h
|
||||
%{_includedir}/hfi1diag/opa_intf.h
|
||||
%{_includedir}/hfi1diag/opa_user.h
|
||||
%{_includedir}/hfi1diag/opa_service.h
|
||||
%{_includedir}/hfi1diag/opa_common.h
|
||||
%{_includedir}/hfi1diag/opa_byteorder.h
|
||||
|
||||
%files compat
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{_libdir}/psm2/
|
||||
%dir %{_sysconfdir}/modprobe.d
|
||||
|
||||
%{_libdir}/psm2/libpsm_infinipath.so.*
|
||||
%{_udevrulesdir}/40-psm-compat.rules
|
||||
%config %{_sysconfdir}/modprobe.d/hfi1-psm-compat.conf
|
||||
|
||||
%changelog
|
||||
Loading…
x
Reference in New Issue
Block a user