5 changed files with 5 additions and 127 deletions
--- a/0000-extend-fdesc-array.patch
+++ b/0000-extend-fdesc-array.patch
@ -1,5 +1,5 @@
--- a/psm_utils.c	2018-03-14 21:12:33.678607767 -0400
-+++ b/psm_utils.c	2018-03-14 21:11:04.696909162 -0400
+--- 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];
--- a/Fix-missing-extern.patch
+++ b/Fix-missing-extern.patch
@ -1,13 +0,0 @@
-diff --git a/psm_utils.c b/psm_utils.c
-index 87e522b..6b7c0d1 100644
--- a/psm_utils.c
-+++ b/psm_utils.c
-@@ -57,6 +57,8 @@
- #include "psm_mq_internal.h"
- #include "psm_am_internal.h"
- 
-+uint32_t psmi_cpu_model;
-+
- int psmi_ep_device_is_enabled(const psm2_ep_t ep, int devid);
- 
- struct psmi_epid_table psmi_epid_table;
--- a/Fix-opa-psm2-gcc10.patch
+++ b/Fix-opa-psm2-gcc10.patch
@ -1,74 +0,0 @@
-diff --git a/psm_error.h b/psm_error.h
-index f335382..cb1b4ba 100644
--- a/psm_error.h
-+++ b/psm_error.h
-@@ -65,7 +65,7 @@
- #define PSMI_EP_NORETURN	    ((psm2_ep_t) -2)
- #define PSMI_EP_LOGEVENT	    ((psm2_ep_t) -3)
- 
-psm2_ep_errhandler_t psmi_errhandler_global;
-+extern psm2_ep_errhandler_t psmi_errhandler_global;
- 
- psm2_error_t MOCKABLE(psmi_handle_error)(psm2_ep_t ep, psm2_error_t error,
- 			      const char *buf, ...)
-diff --git a/psm_utils.h b/psm_utils.h
-index 3358704..5c02a2f 100644
--- a/psm_utils.h
-+++ b/psm_utils.h
-@@ -325,7 +325,7 @@ uint32_t psmi_get_hfi_type(const psmi_context_t *context);
- /*
-  * Global model so we can tune defaults better for specific cpu's
-  */
-uint32_t psmi_cpu_model;
-+extern uint32_t psmi_cpu_model;
- 
- /*
-  * Diagnostics, all in psm_diags.c
-@@ -342,7 +342,7 @@ void psmi_multi_ep_init();
-  * Fault injection
-  */
- struct psmi_faultinj_spec;
-int psmi_faultinj_enabled;	/* use macro to test */
-+extern int psmi_faultinj_enabled;	/* use macro to test */
- #if 1				/* possible to disable at compile time */
- #define PSMI_FAULTINJ_ENABLED()	(!!psmi_faultinj_enabled)
- #else
-diff --git a/ptl_am/ptl_fwd.h b/ptl_am/ptl_fwd.h
-index e1bd064..1d0fec4 100644
--- a/ptl_am/ptl_fwd.h
-+++ b/ptl_am/ptl_fwd.h
-@@ -57,7 +57,7 @@
- #define _PTL_FWD_AMSH_H
- 
- /* Symbol in am ptl */
-struct ptl_ctl_init psmi_ptl_amsh;
-+extern struct ptl_ctl_init psmi_ptl_amsh;
- 
- extern int psmi_shm_mq_rv_thresh;
- 
-diff --git a/ptl_ips/ptl_fwd.h b/ptl_ips/ptl_fwd.h
-index 3702fba..b774260 100644
--- a/ptl_ips/ptl_fwd.h
-+++ b/ptl_ips/ptl_fwd.h
-@@ -61,7 +61,7 @@ typedef struct ips_epaddr ips_epaddr_t;
- typedef struct ips_msgctl ips_msgctl_t;
- 
- /* Symbol in ips ptl */
-struct ptl_ctl_init psmi_ptl_ips;
-+extern struct ptl_ctl_init psmi_ptl_ips;
- 
-struct ptl_ctl_rcvthread psmi_ptl_ips_rcvthread;
-+extern struct ptl_ctl_rcvthread psmi_ptl_ips_rcvthread;
- #endif /* _PTL_FWD_IPS_H */
-diff --git a/ptl_self/ptl_fwd.h b/ptl_self/ptl_fwd.h
-index 77ee7f9..7ee6b73 100644
--- a/ptl_self/ptl_fwd.h
-+++ b/ptl_self/ptl_fwd.h
-@@ -57,6 +57,6 @@
- #define _PTL_FWD_SELF_H
- 
- /* Symbol in am ptl */
-struct ptl_ctl_init psmi_ptl_self;
-+extern struct ptl_ctl_init psmi_ptl_self;
- 
- #endif
--- a/fix-stringop-truncation-build-error.patch
+++ b/fix-stringop-truncation-build-error.patch
@ -1,13 +0,0 @@
-diff -Naur opa-psm2-PSM2_10.3.58/psm_ep.c opa-psm2-PSM2_10.3.58_new/psm_ep.c
--- opa-psm2-PSM2_10.3.58/psm_ep.c	2018-05-08 03:44:29.000000000 +0800
-+++ opa-psm2-PSM2_10.3.58_new/psm_ep.c	2020-07-01 17:09:40.229405374 +0800
-@@ -1495,8 +1495,7 @@
- 
- 	b_new = (char *)devstr;
- 	e = b_new + len;
-	strncpy(e, devstring, len - 1);
-	e[len - 1] = '\0';
-+	strncpy(e, devstring, len);
- 	ee = e + len;
- 	i = 0;
- 	while (e < ee && *e && i < PTL_MAX_INIT) {
--- a/libpsm2.spec
+++ b/libpsm2.spec
@ -1,6 +1,6 @@
 Name:          libpsm2
 Version:       10.3.58
-Release:       9
+Release:       4
 Summary:       Intel PSM Libraries
 License:       BSD or GPLv2
 URL:           https://github.com/01org/opa-psm2/
@ -8,12 +8,9 @@ URL:           https://github.com/01org/opa-psm2/
 Source0:       https://github.com/intel/opa-psm2/archive/PSM2_10.3.58.tar.gz
 #extend fdesc array
 Patch0:        0000-extend-fdesc-array.patch
-Patch1:        fix-stringop-truncation-build-error.patch
-Patch2:        Fix-opa-psm2-gcc10.patch
-Patch3:        Fix-missing-extern.patch

 ExclusiveArch: x86_64
-BuildRequires: libuuid-devel numactl-devel gcc systemd-udev
+BuildRequires: libuuid-devel numactl-devel
 Obsoletes:     hfi1-psm < 1.0.0

 %package       devel
@ -24,10 +21,6 @@ Requires:      libpsm2 = %{version}-%{release} libuuid-devel
 Summary:       Compat library for Intel PSM
 Requires:      libpsm2 = %{version}-%{release} systemd-udev

-%global _privatelibs libpsm_infinipath[.]so[.]1.*
-%global __provides_exclude ^(%{_privatelibs})$
-%global __requires_exclude ^(%{_privatelibs})$
-
 %description
 The PSM Messaging API, or PSM API, is the low-level user-level communications interface for the Intel OPA
 family of products. PSM users are enabled with mechanisms necessary to implement higher level communications
@ -40,7 +33,7 @@ Development package for the Intel PSM library
 Support for MPIs linked with PSM versions less than 2

 %prep
-%autosetup -n opa-psm2-PSM2_10.3.58 -p1
+%autosetup -n opa-psm2-PSM2_10.3.58 -p0

 %build
 %make_build
@ -75,21 +68,6 @@ rm -f %{buildroot}%{_libdir}/*.a
 %{_sysconfdir}/modprobe.d/libpsm2-compat.conf

 %changelog
-* Fri Aug 06 2021 wangyong <wangyong187@huawei.com> - 10.3.58-9
- Fix downstream missing lib problem
-
-* Mon Aug 02 2021 wangyong <wangyong187@huawei.com> - 10.3.58-8
- Fix build error caused by GCC upgrade to GCC-10
-
-* Wed Jun 16 2021 wulei <wulei80@huawei.com> - 10.3.58-7
- Fix build error
-
-* Thu Jul 02 2020 senlin <xiasenlin1@huawei.com> - 10.3.58-6
- Fix stringop-truncation build error
-
-* Tue Mar 17 2020 yanglijin<yanglijin@huawei.com> - 10.3.58-5
- fix provides
-
 * Mon Mar 16 2020 gulining<gulining1@huawei.com> - 10.3.58-4
 - fix install error with wrong release