From cdfcb0f352ff9b0e2088e9e8555de9a2a7b2932f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 21 2020 22:16:33 +0000 Subject: import libpsm2-11.2.86-1.el8 --- diff --git a/.gitignore b/.gitignore index 0027dda..bf2ea76 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libpsm2-10.3.58.tar.gz +SOURCES/libpsm2-11.2.86.tar.gz diff --git a/.libpsm2.metadata b/.libpsm2.metadata index 29682b7..1b52a93 100644 --- a/.libpsm2.metadata +++ b/.libpsm2.metadata @@ -1 +1 @@ -871dea07ad15f63f63b6d2ee43a9283b35abc113 SOURCES/libpsm2-10.3.58.tar.gz +1bf37bd6b0d41131607a719cdb5dc3e626054de3 SOURCES/libpsm2-11.2.86.tar.gz diff --git a/SOURCES/0001-temporally-replace-g3-with-default-g.patch b/SOURCES/0001-temporally-replace-g3-with-default-g.patch index 15b87d7..07da971 100644 --- a/SOURCES/0001-temporally-replace-g3-with-default-g.patch +++ b/SOURCES/0001-temporally-replace-g3-with-default-g.patch @@ -1,6 +1,6 @@ -From 1def43055d3563ecfeddaa8881f3d910e7fd55a5 Mon Sep 17 00:00:00 2001 +From 22dcbe8897b4f3a4e42a606c26dd69f0239ae424 Mon Sep 17 00:00:00 2001 From: Honggang Li -Date: Mon, 24 Sep 2018 17:04:16 +0800 +Date: Tue, 29 Oct 2019 16:16:22 +0800 Subject: [PATCH] temporally replace '-g3' with default '-g' rpm debugedit might corrupt the debug file strings when source files @@ -18,10 +18,10 @@ Signed-off-by: Honggang Li 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildflags.mak b/buildflags.mak -index f59958c..633a010 100644 +index 10ec288..4c597e1 100644 --- a/buildflags.mak +++ b/buildflags.mak -@@ -147,9 +147,9 @@ ifneq (,${HFI_BRAKE_DEBUG}) +@@ -163,9 +163,9 @@ ifneq (,${HFI_BRAKE_DEBUG}) BASECFLAGS += -DHFI_BRAKE_DEBUG endif ifneq (,${PSM_DEBUG}) @@ -33,9 +33,9 @@ index f59958c..633a010 100644 endif ifneq (,${PSM_COVERAGE}) # This check must come after PSM_DEBUG to override optimization setting BASECFLAGS += -O -fprofile-arcs -ftest-coverage -@@ -185,7 +185,7 @@ else - BASECFLAGS += -DNVALGRIND - endif +@@ -196,7 +196,7 @@ endif + + BASECFLAGS += -fpic -fPIC -D_GNU_SOURCE -ASFLAGS += -g3 -fpic +ASFLAGS += -g -fpic @@ -60,5 +60,5 @@ index b448e4e..ab501d5 100644 else ifeq (${CCARCH},gcc) -- -2.14.4 +2.21.0 diff --git a/SOURCES/extend-fdesc-array.patch b/SOURCES/extend-fdesc-array.patch deleted file mode 100644 index 4729057..0000000 --- a/SOURCES/extend-fdesc-array.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- psm_utils.c.orig 2018-03-14 21:12:33.678607767 -0400 -+++ psm_utils.c 2018-03-14 21:11:04.696909162 -0400 -@@ -951,7 +951,7 @@ struct psmi_faultinj_spec *psmi_faultinj - union psmi_envvar_val env_fi; - char fvals_str[128]; - char fname[128]; -- char fdesc[256]; -+ char fdesc[512]; - - snprintf(fvals_str, sizeof(fvals_str) - 1, "%d:%d:1", num, - denom); diff --git a/SPECS/libpsm2.spec b/SPECS/libpsm2.spec index 7e90d49..2ef3169 100644 --- a/SPECS/libpsm2.spec +++ b/SPECS/libpsm2.spec @@ -52,19 +52,18 @@ # Summary: Intel PSM Libraries Name: libpsm2 -Version: 10.3.58 -Release: 2%{?dist} +Version: 11.2.86 +Release: 1%{?dist} License: BSD or GPLv2 -URL: https://github.com/01org/opa-psm2/ +URL: https://github.com/intel/opa-psm2 # The tarball can be created by: -# git clone https://github.com/01org/opa-psm2 +# git clone https://github.com/intel/opa-psm2.git # cd opa-psm2 -# git checkout 0f9213e7af8d32c291d4657ff4a3279918de1e60 +# git checkout 4f0ad8cf4d6b44fcce5f745e946a056659ba54c0 # make dist Source0: %{name}-%{version}.tar.gz -Patch1: extend-fdesc-array.patch -Patch2: 0001-temporally-replace-g3-with-default-g.patch +Patch1: 0001-temporally-replace-g3-with-default-g.patch # The OPA product is supported on x86 64 only: ExclusiveArch: x86_64 @@ -103,8 +102,7 @@ Support for MPIs linked with PSM versions < 2 %prep %setup -q -%patch1 -p0 -%patch2 -p1 +%patch1 -p1 %build %{set_build_flags} @@ -145,6 +143,10 @@ rm -f %{buildroot}%{_libdir}/*.a %endif %changelog +* Tue Oct 29 2019 Honggang Li - 11.2.86-1 +- Rebase to latest upstream release 11.2.86 +- Resolves: bz1719681 + * Mon Sep 24 2018 Honggang Li - 10.3.58-2 - Fix corrupted libpsm2 debuginfo file - Resolves: bz1630766