Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package opa-fm for openSUSE:Factory checked in at 2022-09-30 17:58:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opa-fm (Old) and /work/SRC/openSUSE:Factory/.opa-fm.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opa-fm" Fri Sep 30 17:58:59 2022 rev:18 rq:1007279 version:10.11.2.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/opa-fm/opa-fm.changes 2021-11-17 01:14:49.102184809 +0100 +++ /work/SRC/openSUSE:Factory/.opa-fm.new.2275/opa-fm.changes 2022-09-30 17:59:22.777451926 +0200 @@ -1,0 +2,8 @@ +Fri Sep 30 13:28:47 UTC 2022 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> + +- Update to 10.11.2.0.3 + - No changelog available +- Refresh opa-fm-Fallback-to-custom-vendor-if-os_vendor-fails.patch against latest sources +- Add opa-fm-force-code-symbols-to-be-loaded.patch to fix issues with LTO + +------------------------------------------------------------------- Old: ---- opa-fm-10.11.0.2.1.0.5d1f7ee32920.tar.gz New: ---- opa-fm-10.11.2.0.3.0.3bee63ead16a.tar.gz opa-fm-force-code-symbols-to-be-loaded.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opa-fm.spec ++++++ --- /var/tmp/diff_new_pack.Clz4XB/_old 2022-09-30 17:59:23.305453055 +0200 +++ /var/tmp/diff_new_pack.Clz4XB/_new 2022-09-30 17:59:23.309453063 +0200 @@ -1,7 +1,7 @@ # # spec file for package opa-fm # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,13 @@ # -%define git_ver .0.5d1f7ee32920 +%define git_ver .0.3bee63ead16a %define pseudo_opt %{_prefix}/lib/opa-fm %define opasysconfdir %{_sysconfdir}/opa-fm/ %define opavarlibdir %{_localstatedir}/usr/lib/opa-fm/ Name: opa-fm -Version: 10.11.0.2.1 +Version: 10.11.2.0.3 Release: 0 Summary: Intel Omni-Path Fabric Management Software License: BSD-3-Clause @@ -32,6 +32,7 @@ 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 Patch5: opa-fm-harden-systemd-service.patch BuildRequires: gcc-c++ BuildRequires: infiniband-diags-devel @@ -56,6 +57,7 @@ %setup -q -n %{name}-%{version}%{git_ver} %patch1 %patch2 +%patch3 %patch5 %build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Clz4XB/_old 2022-09-30 17:59:23.345453140 +0200 +++ /var/tmp/diff_new_pack.Clz4XB/_new 2022-09-30 17:59:23.349453149 +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">5d1f7ee32920b1b429e2f7699762514af47d9717</param> + <param name="revision">3bee63ead16ac385e00c671636ebd787d35e7358</param> </service> <service name="recompress" mode="disabled"> <param name="file">opa-fm*.tar</param> ++++++ opa-fm-10.11.0.2.1.0.5d1f7ee32920.tar.gz -> opa-fm-10.11.2.0.3.0.3bee63ead16a.tar.gz ++++++ ++++ 6474 lines of diff (skipped) ++++++ opa-fm-Fallback-to-custom-vendor-if-os_vendor-fails.patch ++++++ --- /var/tmp/diff_new_pack.Clz4XB/_old 2022-09-30 17:59:23.833454184 +0200 +++ /var/tmp/diff_new_pack.Clz4XB/_new 2022-09-30 17:59:23.837454192 +0200 @@ -1,73 +1,33 @@ -commit 27eef417f53ce83fa313f1e7f668a56d2dd764e1 -Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com> -Date: Mon Aug 28 14:07:34 2017 +0200 +commit 59fad9979cb0a07959f1eb2b5302c5c1748481c0 +Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> +Date: Fri Sep 30 15:34:28 2022 +0200 opa-fm Fallback to custom vendor if os_vendor fails - Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com> + Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> diff --git MakeTools/funcs-ext.sh MakeTools/funcs-ext.sh -index 9aa4cd25e410..2f9689586caf 100755 +index 16683d80bfa9..5cdd9021bc2d 100755 --- MakeTools/funcs-ext.sh +++ MakeTools/funcs-ext.sh -@@ -734,31 +734,36 @@ function os_vendor() - # Apple Mac - rval=apple - else -- filelist=($('ls' /etc/*-release | egrep -v lsb | egrep -v os)) -- rval="" -- if [ ${#filelist[@]} -eq 0 ] && [ -f /etc/lsb-release ]; then -- rval=$(cat /etc/lsb-release | egrep DISTRIB_ID | cut -d'=' -f2 | tr '[:upper:]' '[:lower:]') -- fi -- for file in $filelist -- do -- if [ -f $file ] -- then -- rval=$(basename $file -release) -- if [ $rval = 'SuSE' ] -- then -- if [ -f /etc/UnitedLinux-release ] -- then -- rval=UnitedLinux -+ if [ $? == 1 ] -+ then -+ rval="custom" -+ else -+ filelist=($('ls' /etc/*-release | egrep -v lsb | egrep -v os)) -+ rval="" -+ if [ ${#filelist[@]} -eq 0 ] && [ -f /etc/lsb-release ]; then -+ rval=$(cat /etc/lsb-release | egrep DISTRIB_ID | cut -d'=' -f2 | tr '[:upper:]' '[:lower:]') - fi -- elif [ $rval = 'centos' ] -- then -- rval=redhat -- elif [ $rval != 'os' ] -- then -- break -+ for file in $filelist -+ do -+ if [ -f $file ] -+ then -+ rval=$(basename $file -release) -+ if [ $rval = 'SuSE' ] -+ then -+ if [ -f /etc/UnitedLinux-release ] -+ then -+ rval=UnitedLinux -+ fi -+ elif [ $rval = 'centos' ] -+ then -+ rval=redhat -+ elif [ $rval != 'os' ] -+ then -+ break -+ fi -+ fi -+ done - fi -- fi -- done - fi - echo $rval - } +@@ -716,6 +716,9 @@ function os_vendor() + rhel) + rval=redhat + ;; ++ opensuse-*) ++ rval=SuSE ++ ;; + sles) + rval=SuSE + ;; +@@ -745,6 +748,9 @@ function os_vendor() + if [ ${#filelist[@]} -eq 0 ] && [ -f /etc/lsb-release ]; then + rval=$(cat /etc/lsb-release | egrep DISTRIB_ID | cut -d'=' -f2 | tr '[:upper:]' '[:lower:]') + fi ++ if [ "$rval" == "" ]; then ++ rval="custom" ++ fi + for file in $filelist + do + if [ -f $file ] ++++++ opa-fm-force-code-symbols-to-be-loaded.patch ++++++ commit b869788ff034572e7059192ec1378cb567817827 Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> Date: Fri Sep 6 15:36:15 2019 +0200 opa-fm: force code symbols to be loaded When compiling with LTO, function like GetCodeInternalVersion might be dropped from the binary causing patch_version and the whole build to fail. Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> diff --git CodeVersion/code_version.c CodeVersion/code_version.c index c8b77b41e86b..5cb90edd484a 100644 --- CodeVersion/code_version.c +++ CodeVersion/code_version.c @@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // or the internal whatversion tool // #define ICS_BUILD_VERSION "THIS_IS_THE_ICS_VERSION_NUMBER:@(#)000.000.000.000B000" -const char* GetCodeVersion(void) +const char* __attribute__((used)) GetCodeVersion(void) { static const char* BuildVersion=ICS_BUILD_VERSION; static char* version; @@ -83,7 +83,7 @@ const char* GetCodeVersion(void) // or the internal whatversion tool // #define ICS_BUILD_INTERNAL_VERSION "THIS_IS_THE_ICS_INTERNAL_VERSION_NUMBER:@(#)000.000.000.000B000I0000" -const char* GetCodeInternalVersion(void) +const char* __attribute__((used)) GetCodeInternalVersion(void) { static const char* BuildVersion=ICS_BUILD_INTERNAL_VERSION; static char* version; @@ -112,7 +112,7 @@ const char* GetCodeInternalVersion(void) // or the internal whatversion tool // #define ICS_BUILD_BRAND "THIS_IS_THE_ICS_BRAND:Intel\000 " -const char* GetCodeBrand(void) +const char* __attribute__((used)) GetCodeBrand(void) { static const char* BuildBrand=ICS_BUILD_BRAND; static char* brand;