From 97c2d8bc57cba72ff0a62f577dcb53efb52d85d8f9d38d1f418c7e0b7c699a8d Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Mon, 13 Jun 2022 09:56:11 +0000 Subject: [PATCH] Accepting request 982424 from home:NMoreyChaisemartin:branches:science:HPC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update to 11.2.229 - Fix GCC compilation issues - Allow PSM2 to work with "self,shm" devices without omnipath hardware - Various fixes - Spec file cleanups submitted by Dirk Müller OBS-URL: https://build.opensuse.org/request/show/982424 OBS-URL: https://build.opensuse.org/package/show/science:HPC/libpsm2?expand=0&rev=65 --- _service | 2 +- libpsm2-11.2.203.tar.bz2 | 3 --- libpsm2-11.2.229.tar.bz2 | 3 +++ libpsm2.changes | 9 +++++++++ libpsm2.spec | 40 +++++++++++++++++----------------------- 5 files changed, 30 insertions(+), 27 deletions(-) delete mode 100644 libpsm2-11.2.203.tar.bz2 create mode 100644 libpsm2-11.2.229.tar.bz2 diff --git a/_service b/_service index 7595f77..20d3a37 100644 --- a/_service +++ b/_service @@ -5,7 +5,7 @@ no .git libpsm2 - 11.2.203 + 11.2.229 PSM2_(.*)(nccl)\? \1 PSM2_* diff --git a/libpsm2-11.2.203.tar.bz2 b/libpsm2-11.2.203.tar.bz2 deleted file mode 100644 index 4ad44c0..0000000 --- a/libpsm2-11.2.203.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d19fbe3ae9a7a7e191580294991b415f1005cc86e3f2d0d9bc06042eac0ed749 -size 363046 diff --git a/libpsm2-11.2.229.tar.bz2 b/libpsm2-11.2.229.tar.bz2 new file mode 100644 index 0000000..47b972a --- /dev/null +++ b/libpsm2-11.2.229.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:752fa5af0038d78d0dc1f631cbfae9825c9f347fcae6d6f9d20a322ba89ba45d +size 364614 diff --git a/libpsm2.changes b/libpsm2.changes index 121d35d..105d8c5 100644 --- a/libpsm2.changes +++ b/libpsm2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jun 13 08:03:18 UTC 2022 - Nicolas Morey-Chaisemartin + +- Update to 11.2.229 + - Fix GCC compilation issues + - Allow PSM2 to work with "self,shm" devices without omnipath hardware + - Various fixes +- Spec file cleanups submitted by Dirk Müller + ------------------------------------------------------------------- Mon Apr 11 20:24:48 UTC 2022 - Martin Wilck diff --git a/libpsm2.spec b/libpsm2.spec index 47b9e71..6094304 100644 --- a/libpsm2.spec +++ b/libpsm2.spec @@ -16,16 +16,16 @@ # -%if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150300 -%define _modprobedir /lib/modprobe.d -%endif %global modprobe_d_files libpsm2-compat.conf +%global psm_so 2 +%global git_ver %{nil} -%define git_ver %{nil} +%if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150300 +%global _modprobedir /lib/modprobe.d +%endif -%define psm_so 2 Name: libpsm2 -Version: 11.2.203 +Version: 11.2.229 Release: 0 Summary: Intel PSM Messaging API libraries License: BSD-2-Clause OR GPL-2.0-only @@ -38,12 +38,11 @@ Patch2: libpsm2-use_RPM_OPT_FLAGS.patch Patch3: libpsm2-use-exported-variable-for-version-and-release.patch BuildRequires: libnuma-devel BuildRequires: libuuid-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(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 @@ -57,7 +56,6 @@ interfaces in parallel environments. %package -n %{name}-%{psm_so} Summary: Intel PSM Messaging API library Group: System/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: %{name} = %{version} %description -n %{name}-%{psm_so} @@ -89,30 +87,30 @@ Support for MPIs linked with PSM versions < 2. %patch2 %patch3 -cp %{S:1} ChangeLog +cp %{SOURCE1} ChangeLog %build %global optflags %{optflags} -fcommon export RPM_OPT_FLAGS export VERSION=${Version} RELEASE=${Release} -make %{?_smp_mflags} +%make_build %install export DESTDIR=%{buildroot} modprobe_dir=%{_modprobedir} make %{?_smp_mflags} DESTDIR=%{buildroot} LIBPSM2_COMPAT_CONF_DIR="${modprobe_dir%/*}" install -install -m0644 %{buildroot}%{_libdir}/psm2-compat/libpsm_infinipath.so.1 %{buildroot}%{_libdir}/libpsm_infinipath.so.1 +install -m0755 %{buildroot}%{_libdir}/psm2-compat/libpsm_infinipath.so.1 %{buildroot}%{_libdir}/libpsm_infinipath.so.1 # removing file to get rid of rpm errors rm %{buildroot}%{_libdir}/psm2-compat/libpsm_infinipath.so.1 -rm %{buildroot}/usr/lib/%name/libpsm2-compat.cmds +rm %{buildroot}%{_prefix}/lib/%{name}/libpsm2-compat.cmds # remove static library rm %{buildroot}%{_libdir}/libpsm2.a %pre compat # Avoid restoring outdated stuff in posttrans for _f in %{?modprobe_d_files}; do - [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \ - mv -f "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}.rpmsave.old" || : + [ ! -f "%{_sysconfdir}/modprobe.d/${_f}.rpmsave" ] || \ + mv -f "%{_sysconfdir}/modprobe.d/${_f}.rpmsave" "%{_sysconfdir}/modprobe.d/${_f}.rpmsave.old" || : done %post -n %{name}-%{psm_so} -p /sbin/ldconfig @@ -123,19 +121,17 @@ done %posttrans compat # Migration of modprobe.conf files to _modprobedir for _f in %{?modprobe_d_files}; do - [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \ - mv -fv "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}" || : + [ ! -f "%{_sysconfdir}/modprobe.d/${_f}.rpmsave" ] || \ + mv -fv "%{_sysconfdir}/modprobe.d/${_f}.rpmsave" "%{_sysconfdir}/modprobe.d/${_f}" || : done %files -n %{name}-%{psm_so} -%defattr(-,root,root,-) %{_libdir}/libpsm2.so.* %{_udevrulesdir}/40-psm.rules %doc README ChangeLog %license COPYING %files devel -%defattr(-,root,root,-) %{_libdir}/libpsm2.so %{_includedir}/psm2.h %{_includedir}/psm2_mq.h @@ -146,7 +142,7 @@ done %dir %{_includedir}/hfi1diag/linux-x86_64/ %{_includedir}/hfi1diag/linux-x86_64/bit_ops.h %{_includedir}/hfi1diag/linux-x86_64/sysdep.h -%_includedir/hfi1diag/hfi1_deprecated.h +%{_includedir}/hfi1diag/hfi1_deprecated.h %{_includedir}/hfi1diag/opa_udebug.h %{_includedir}/hfi1diag/opa_debug.h %{_includedir}/hfi1diag/opa_intf.h @@ -159,11 +155,9 @@ done %{_includedir}/hfi1diag/psmi_wrappers.h %files compat -%defattr(-,root,root,-) %dir %{_modprobedir} - %{_libdir}/libpsm_infinipath.so.* %{_udevrulesdir}/40-psm-compat.rules -%config %{_modprobedir}/libpsm2-compat.conf +%{_modprobedir}/libpsm2-compat.conf %changelog