Hello community, here is the log from the commit of package opa-fm for openSUSE:Factory checked in at 2020-06-07 21:40:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opa-fm (Old) and /work/SRC/openSUSE:Factory/.opa-fm.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opa-fm" Sun Jun 7 21:40:08 2020 rev:14 rq:812247 version:10.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/opa-fm/opa-fm.changes 2019-10-18 14:31:22.776560328 +0200 +++ /work/SRC/openSUSE:Factory/.opa-fm.new.3606/opa-fm.changes 2020-06-07 21:40:16.881823462 +0200 @@ -1,0 +2,7 @@ +Sun Jun 7 14:48:12 UTC 2020 - Nicolas Morey-Chaisemartin <[email protected]> + +- Update to v10.10.1 + - No changelog available + - Add opa-fm-fix-multiple-definitions.patch to fix compatibility with GCC10 + +------------------------------------------------------------------- Old: ---- opa-fm-10.9.3.1.1.0.0236727e70cb.tar.gz New: ---- opa-fm-10.10.1.0.35.0.317bb9f13773.tar.gz opa-fm-fix-multiple-definitions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opa-fm.spec ++++++ --- /var/tmp/diff_new_pack.bVeAZU/_old 2020-06-07 21:40:20.053833518 +0200 +++ /var/tmp/diff_new_pack.bVeAZU/_new 2020-06-07 21:40:20.057833531 +0200 @@ -1,7 +1,7 @@ # # spec file for package opa-fm # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,24 @@ # -%define git_ver .1.1.0.0236727e70cb +%define git_ver .0.35.0.317bb9f13773 %define pseudo_opt %{_prefix}/lib/opa-fm %define opasysconfdir %{_sysconfdir}/opa-fm/ %define opavarlibdir %{_localstatedir}/usr/lib/opa-fm/ Name: opa-fm -Version: 10.9.3 +Version: 10.10.1 Release: 0 Summary: Intel Omni-Path Fabric Management Software License: BSD-3-Clause Group: Development/Libraries/C and C++ -Url: http://www.intel.com/ +URL: http://www.intel.com/ Source0: %{name}-%{version}%{git_ver}.tar.gz Source1: %{name}-rpmlintrc Patch1: opa-fm-Fallback-to-custom-vendor-if-os_vendor-fails.patch Patch2: opa-fm-use-RPM_OPT_FLAGS.patch Patch3: opa-fm-force-code-symbols-to-be-loaded.patch +Patch4: opa-fm-fix-multiple-definitions.patch BuildRequires: gcc-c++ BuildRequires: infiniband-diags-devel BuildRequires: libexpat-devel @@ -57,6 +58,7 @@ %patch1 %patch2 %patch3 +%patch4 %build export RPM_OPT_FLAGS ++++++ _service ++++++ --- /var/tmp/diff_new_pack.bVeAZU/_old 2020-06-07 21:40:20.089833632 +0200 +++ /var/tmp/diff_new_pack.bVeAZU/_new 2020-06-07 21:40:20.089833632 +0200 @@ -8,7 +8,7 @@ <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param> - <param name="revision">0236727e70cbec41b5700d2cca25e998015fa278</param> + <param name="revision">317bb9f137735388b121b5fd6e7be28dde48b0a3</param> </service> <service name="recompress" mode="disabled"> <param name="file">opa-fm*.tar</param> ++++++ opa-fm-10.9.3.1.1.0.0236727e70cb.tar.gz -> opa-fm-10.10.1.0.35.0.317bb9f13773.tar.gz ++++++ ++++ 29085 lines of diff (skipped) ++++++ opa-fm-fix-multiple-definitions.patch ++++++ commit 0b6df10765e358e2ced979edb000c7d0c12b276f Author: Nicolas Morey-Chaisemartin <[email protected]> Date: Sun Jun 7 16:21:22 2020 +0200 opa-fm: fix multiple definitions Fix compilation errors due to multiple definitions with GCC10 Signed-off-by: Nicolas Morey-Chaisemartin <[email protected]> diff --git Esm/ib/src/pm/include/pm_topology.h Esm/ib/src/pm/include/pm_topology.h index 1564174bfc7e..b7ce456c3029 100644 --- Esm/ib/src/pm/include/pm_topology.h +++ Esm/ib/src/pm/include/pm_topology.h @@ -1551,7 +1551,7 @@ extern FSTATUS PmClearPortRunningVFCounters(Pm_t *pm, PmPort_t *pmportp, STLVlCo // compute theoretical limits for each rate //extern void PM_InitLswfToMBps(void); // ideally should be static, extern due to split of sweep.c and calc.c -uint32 s_StaticRateToMBps[IB_STATIC_RATE_MAX+1]; +extern uint32 s_StaticRateToMBps[IB_STATIC_RATE_MAX+1]; // This group of functions accept an index into the pmportp->Groups[] // caller should search for appropriate entry in array to act on diff --git Esm/ib/src/pm/pm/pm.c Esm/ib/src/pm/pm/pm.c index afab7736b7d7..c4e49c3ea383 100644 --- Esm/ib/src/pm/pm/pm.c +++ Esm/ib/src/pm/pm/pm.c @@ -126,10 +126,6 @@ extern Status_t vfi_GetPortGuid(ManagerInfo_t * fp, uint32_t gididx); #define SID_ASCII_FORMAT "%02x%02x%02x%02x%02x%02x%02x%02x" static IB_SERVICE_RECORD pmServRer; -#ifndef __VXWORKS__ -static char msgbuf[256]; -#endif - #if 0 /* diff --git Esm/ib/src/smi/include/sa_l.h Esm/ib/src/smi/include/sa_l.h index 1e2e0afc2587..d83aeaa0a887 100644 --- Esm/ib/src/smi/include/sa_l.h +++ Esm/ib/src/smi/include/sa_l.h @@ -314,7 +314,7 @@ Status_t sa_Authenticate_Path(STL_LID, STL_LID); Status_t sa_Authenticate_Access(uint32_t, STL_LID, STL_LID, STL_LID); Status_t sa_Compare_Node_Port_PKeys(Node_t*, Port_t*); Status_t sa_Compare_Port_PKeys(Port_t*, Port_t*); -uint32_t saDebugPerf; // control SA performance messages; default is off +extern uint32_t saDebugPerf; // control SA performance messages; default is off Status_t sa_data_offset(uint16_t class, uint16_t type); Status_t sa_create_template_mask(uint16_t, uint64_t); diff --git Esm/ib/src/smi/sm/sm_main.c Esm/ib/src/smi/sm/sm_main.c index 0f34e78608f6..5de2d4d16007 100644 --- Esm/ib/src/smi/sm/sm_main.c +++ Esm/ib/src/smi/sm/sm_main.c @@ -223,7 +223,7 @@ SMMcastConfig_t sm_mc_config; SmMcastMlidShare_t sm_mls_config; SMMcastDefGrpCfg_t sm_mdg_config; -uint32_t xml_trace = 0; +static uint32_t xml_trace = 0; extern uint32_t pm_conf_start; extern uint32_t bm_conf_start; diff --git Esm/ib/src/smi/sm/sm_utility.c Esm/ib/src/smi/sm/sm_utility.c index 3f0abcf35cca..47a8ca569575 100644 --- Esm/ib/src/smi/sm/sm_utility.c +++ Esm/ib/src/smi/sm/sm_utility.c @@ -86,7 +86,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif extern Lock_t tid_lock; -uint32_t sm_instance; +extern uint32_t sm_instance; //#define TRACK_SEARCHES uint32_t sm_node_guid_cnt = 0;
