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 2023-07-26 13:24:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opa-fm (Old) and /work/SRC/openSUSE:Factory/.opa-fm.new.15225 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opa-fm" Wed Jul 26 13:24:08 2023 rev:19 rq:1100647 version:10.12.1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/opa-fm/opa-fm.changes 2022-09-30 17:59:22.777451926 +0200 +++ /work/SRC/openSUSE:Factory/.opa-fm.new.15225/opa-fm.changes 2023-07-26 13:25:15.492475559 +0200 @@ -1,0 +2,6 @@ +Tue Jul 25 13:00:25 UTC 2023 - Nicolas Morey <[email protected]> + +- Update to 10.12.1.0.6 + - No changelog available + +------------------------------------------------------------------- Old: ---- opa-fm-10.11.2.0.3.0.3bee63ead16a.tar.gz New: ---- opa-fm-10.12.1.0.6.0.6f1eb4579fc9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opa-fm.spec ++++++ --- /var/tmp/diff_new_pack.fJ6kJw/_old 2023-07-26 13:25:16.164479614 +0200 +++ /var/tmp/diff_new_pack.fJ6kJw/_new 2023-07-26 13:25:16.168479637 +0200 @@ -1,7 +1,7 @@ # # spec file for package opa-fm # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 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.3bee63ead16a +%define git_ver .0.6f1eb4579fc9 %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.2.0.3 +Version: 10.12.1.0.6 Release: 0 Summary: Intel Omni-Path Fabric Management Software License: BSD-3-Clause ++++++ _service ++++++ --- /var/tmp/diff_new_pack.fJ6kJw/_old 2023-07-26 13:25:16.212479903 +0200 +++ /var/tmp/diff_new_pack.fJ6kJw/_new 2023-07-26 13:25:16.216479928 +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">3bee63ead16ac385e00c671636ebd787d35e7358</param> + <param name="revision">6f1eb4579fc975a1e9e7f669a8afbf6569d09dd3</param> </service> <service name="recompress" mode="disabled"> <param name="file">opa-fm*.tar</param> ++++++ opa-fm-10.11.2.0.3.0.3bee63ead16a.tar.gz -> opa-fm-10.12.1.0.6.0.6f1eb4579fc9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/Makefile new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/Makefile --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/Makefile 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/Makefile 2023-03-03 17:38:07.000000000 +0100 @@ -106,6 +106,7 @@ comp_ff_of_prereq_RHEL84.pl \ comp_ff_of_prereq_RHEL85.pl \ comp_ff_of_prereq_RHEL86.pl \ + comp_ff_of_prereq_RHEL9.pl \ comp_ff_of_prereq_SLES123.pl \ comp_ff_of_prereq_SLES124.pl \ comp_ff_of_prereq_SLES15.pl \ @@ -121,6 +122,7 @@ comp_fm_prereq_RHEL84.pl \ comp_fm_prereq_RHEL85.pl \ comp_fm_prereq_RHEL86.pl \ + comp_fm_prereq_RHEL9.pl \ comp_fm_prereq_SLES123.pl \ comp_fm_prereq_SLES124.pl \ comp_fm_prereq_SLES15.pl \ @@ -162,6 +164,7 @@ comp_ff_of_prereq_RHEL84.pl \ comp_ff_of_prereq_RHEL85.pl \ comp_ff_of_prereq_RHEL86.pl \ + comp_ff_of_prereq_RHEL9.pl \ comp_ff_of_prereq_SLES123.pl \ comp_ff_of_prereq_SLES124.pl \ comp_ff_of_prereq_SLES15.pl \ @@ -178,6 +181,7 @@ comp_fm_prereq_RHEL84.pl \ comp_fm_prereq_RHEL85.pl \ comp_fm_prereq_RHEL86.pl \ + comp_fm_prereq_RHEL9.pl \ comp_fm_prereq_SLES123.pl \ comp_fm_prereq_SLES124.pl \ comp_fm_prereq_SLES15.pl \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/comp_delta.pl new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/comp_delta.pl --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/comp_delta.pl 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/comp_delta.pl 2023-03-03 17:38:07.000000000 +0100 @@ -93,6 +93,7 @@ my @delta_kernel_srpms_rhel84 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel85 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel86 = ( 'kmod-ifs-kernel-updates' ); +my @delta_kernel_srpms_rhel9 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms = ( ); # This provides information for all kernel srpms @@ -184,6 +185,8 @@ } } elsif ( "$CUR_VENDOR_VER" eq "ES86" ) { @delta_kernel_srpms = ( @delta_kernel_srpms_rhel86 ); + } elsif ( "$CUR_VENDOR_VER" eq "ES9" ) { + @delta_kernel_srpms = ( @delta_kernel_srpms_rhel9 ); } elsif ( "$CUR_VENDOR_VER" eq "ES85" ) { @delta_kernel_srpms = ( @delta_kernel_srpms_rhel85 ); } elsif ( "$CUR_VENDOR_VER" eq "ES84" ) { @@ -830,6 +833,9 @@ } elsif ( "$CUR_VENDOR_VER" eq "ES86" ) { return ( has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq "ES9" ) { + return ( has_version_delta() + && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); } elsif ( "$CUR_VENDOR_VER" eq "ES85" ) { return ( has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); @@ -1202,6 +1208,9 @@ } elsif ( "$CUR_VENDOR_VER" eq "ES86" ) { return (has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq "ES9" ) { + return (has_version_delta() + && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); } elsif ( "$CUR_VENDOR_VER" eq "ES123" ) { return (has_version_delta() && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/comp_delta_prereq_RHEL9.pl new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/comp_delta_prereq_RHEL9.pl --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/comp_delta_prereq_RHEL9.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/comp_delta_prereq_RHEL9.pl 2023-03-03 17:38:07.000000000 +0100 @@ -0,0 +1,138 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of Intel Corporation nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +## END_ICS_COPYRIGHT8 **************************************** +# +## [ICS VERSION STRING: unknown] +#use strict; +##use Term::ANSIColor; +##use Term::ANSIColor qw(:constants); +##use File::Basename; +##use Math::BigInt; +# +## ========================================================================== +# +#Installation Prequisites array for delta components +my @opa_stack_prereq = ( + "bash", + "kernel", + "kmod", + "rdma-core", + "systemd", + "glibc", + "pciutils", + "opensm-libs", + "libibumad", + "rdma-core-devel", +); +$comp_prereq_hash{'opa_stack_prereq'} = \@opa_stack_prereq; + +my @mpi_selector_prereq = ( + "bash", + "coreutils", + "perl", + "perl-Getopt-Long", + "tcsh", +); +$comp_prereq_hash{'mpi_selector_prereq'} = \@mpi_selector_prereq; + +my @intel_hfi_prereq = ( + "bash", + "glibc", + "libgcc", + "python3", + "systemd", + "numactl-libs", + "irqbalance", + "libatomic", +); +$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq; + +my @mvapich2_prereq = ( + "bash", + "libibverbs", + "librdmacm", + "glibc", + "zlib", + "sysfsutils", +); +$comp_prereq_hash{'mvapich2_prereq'} = \@mvapich2_prereq; + +my @openmpi_prereq = ( + "bash", + "glibc", + "libgcc", + "libgfortran", + "gcc-gfortran", + "libgomp", + "libibverbs", + "libquadmath", + "librdmacm", + "libstdc++", + "libstdc++-devel", + "opensm-libs", + "pkgconf", + "zlib", +); +$comp_prereq_hash{'openmpi_prereq'} = \@openmpi_prereq; + +my @mvapich2_gcc_hfi_prereq = ( + "bash", + "zlib", + "glibc", +); +$comp_prereq_hash{'mvapich2_gcc_hfi_prereq'} = \@mvapich2_gcc_hfi_prereq; + +my @mvapich2_intel_hfi_prereq = ( + "bash", +); +$comp_prereq_hash{'mvapich2_intel_hfi_prereq'} = \@mvapich2_intel_hfi_prereq; + +my @openmpi_gcc_hfi_prereq = ( + "bash", + "glibc", + "libgcc", + "libgfortran", + "gcc-gfortran", + "libgomp", + "libibverbs", + "libquadmath", + "librdmacm", + "libstdc++", + "libstdc++-devel", + "opensm-libs", + "pkgconf", + "zlib", +); +$comp_prereq_hash{'openmpi_gcc_hfi_prereq'} = \@openmpi_gcc_hfi_prereq; + +my @openmpi_intel_hfi_prereq = ( + "bash", +); +$comp_prereq_hash{'openmpi_intel_hfi_prereq'} = \@openmpi_intel_hfi_prereq; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/comp_ff_of_prereq_RHEL9.pl new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/comp_ff_of_prereq_RHEL9.pl --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/comp_ff_of_prereq_RHEL9.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/comp_ff_of_prereq_RHEL9.pl 2023-03-03 17:38:07.000000000 +0100 @@ -0,0 +1,88 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of Intel Corporation nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +## END_ICS_COPYRIGHT8 **************************************** +# +## [ICS VERSION STRING: unknown] +#use strict; +##use Term::ANSIColor; +##use Term::ANSIColor qw(:constants); +##use File::Basename; +##use Math::BigInt; +# +## ========================================================================== +# +#Installation Prequisites array for fast fabric +#and of tools component +my @oftools_prereq = ( + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "ibacm", + "rdma-core", +); +$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq; + +my @fastfabric_prereq = ( + "atlas", + "bash", + "bc", + "expat", + "expect", + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "ncurses-libs", + "openssl-libs", + "perl", + "perl-Getopt-Long", + "perl-Socket", + "rdma-core", + "tcl", + "zlib", +); +$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq; + +my @opamgt_sdk_prereq = ( + "bash", + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "openssl", + "openssl-devel", + "openssl-libs", + "rdma-core-devel", +); +$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/comp_ff_of_prereq_RHEL9.pl.base new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/comp_ff_of_prereq_RHEL9.pl.base --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/comp_ff_of_prereq_RHEL9.pl.base 1970-01-01 01:00:00.000000000 +0100 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/comp_ff_of_prereq_RHEL9.pl.base 2023-03-03 17:38:07.000000000 +0100 @@ -0,0 +1,88 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of Intel Corporation nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +## END_ICS_COPYRIGHT8 **************************************** +# +## [ICS VERSION STRING: unknown] +#use strict; +##use Term::ANSIColor; +##use Term::ANSIColor qw(:constants); +##use File::Basename; +##use Math::BigInt; +# +## ========================================================================== +# +#Installation Prequisites array for fast fabric +#and of tools component +my @oftools_prereq = ( + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "ibacm", + "rdma-core", +); +$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq; + +my @fastfabric_prereq = ( + "atlas", + "bash", + "bc", + "expat", + "expect", + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "ncurses-libs", + "openssl-libs", + "perl", + "perl-Getopt-Long", + "perl-Socket", + "rdma-core", + "tcl", + "zlib", +); +$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq; + +my @opamgt_sdk_prereq = ( + "bash", + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "openssl", + "openssl-devel", + "openssl-libs", + "rdma-core-devel", +); +$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/comp_fm_prereq_RHEL9.pl new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/comp_fm_prereq_RHEL9.pl --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/comp_fm_prereq_RHEL9.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/comp_fm_prereq_RHEL9.pl 2023-03-03 17:38:07.000000000 +0100 @@ -0,0 +1,53 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of Intel Corporation nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +## END_ICS_COPYRIGHT8 **************************************** +# +## [ICS VERSION STRING: unknown] +#use strict; +##use Term::ANSIColor; +##use Term::ANSIColor qw(:constants); +##use File::Basename; +##use Math::BigInt; +# +## ========================================================================== +# +#Installation Prequisites array for opafm +my @opafm_prereq = ( + "bash", + "expat", + "glibc", + "libibumad", + "libibverbs", + "openssl-libs", + "rdma-core", + "systemd", + "zlib", +); +$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/comp_fm_prereq_RHEL9.pl.base new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/comp_fm_prereq_RHEL9.pl.base --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/comp_fm_prereq_RHEL9.pl.base 1970-01-01 01:00:00.000000000 +0100 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/comp_fm_prereq_RHEL9.pl.base 2023-03-03 17:38:07.000000000 +0100 @@ -0,0 +1,53 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of Intel Corporation nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +## END_ICS_COPYRIGHT8 **************************************** +# +## [ICS VERSION STRING: unknown] +#use strict; +##use Term::ANSIColor; +##use Term::ANSIColor qw(:constants); +##use File::Basename; +##use Math::BigInt; +# +## ========================================================================== +# +#Installation Prequisites array for opafm +my @opafm_prereq = ( + "bash", + "expat", + "glibc", + "libibumad", + "libibverbs", + "openssl-libs", + "rdma-core", + "systemd", + "zlib", +); +$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/do_mvapich2_build.sh new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/do_mvapich2_build.sh --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/do_mvapich2_build.sh 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/do_mvapich2_build.sh 2023-03-03 17:38:07.000000000 +0100 @@ -28,7 +28,7 @@ # # END_ICS_COPYRIGHT8 **************************************** -# This file incorporates work covered by the following copyright and permission notice +# This file incorporates work covered by the following copyright and permission notice #[ICS VERSION STRING: unknown] @@ -73,7 +73,8 @@ fi if [[ ( "$ID" == "rhel" && $(echo "$VERSION_ID > 7.3" | bc -l) == 1 ) || \ - ( "$ID" == "sles" && $(echo "$VERSION_ID > 12.2" | bc -l) == 1 ) ]]; then + ( "$ID" == "sles" && $(echo "$VERSION_ID > 12.2" | bc -l) == 1 ) || \ + ( "$ID" == "rocky") ]]; then PREREQ=("rdma-core-devel" "mpi-selector") else PREREQ=("libibverbs-devel" "librdmacm-devel" "mpi-selector") @@ -103,7 +104,7 @@ fi echo exit 2 - fi + fi } Usage() @@ -324,7 +325,7 @@ choices+=("opa-psm2") PS3="Select MVAPICH2 Transport: " fi - if [ ${#choices[@]} -gt 0 ] + if [ ${#choices[@]} -gt 0 ] then select mvapich2_conf_impl in ${choices[*]} do @@ -426,16 +427,21 @@ export CFLAGS="-m64 -g -O2" export CPPFLAGS="-m64 -g -O2" export CXXFLAGS="-m64 -g -O2" - export FFLAGS="-m64 -g -O2" export FCFLAGS="-m64 -g -O2" export LDLIBS="-m64 -g -O2 -L/usr/lib64 -L/usr/X11R6/lib64" else + if [[ ( "$ID" == "rocky" && $(echo "$VERSION_ID >= 9.0" | bc -l) == 1 ) || \ + ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 9.0" | bc -l) == 1 ) ]]; then + export CFLAGS="-fcommon" + export FFLAGS="-fallow-argument-mismatch" + else + unset CFLAGS + unset FFLAGS + fi # just to be safe - unset LDFLAGS - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset FFLAGS + unset LDFLAGS + unset CPPFLAGS + unset CXXFLAGS unset FCFLAGS unset LDLIBS fi @@ -514,8 +520,12 @@ mvapich2_comp_env='CC="gcc -m64" CXX="g++ -m64" F77="gfortran -m64" FC="gfortran -m64"' else mvapich2_comp_env='CC=gcc CXX=g++ F77=gfortran FC=gfortran' - if [[ ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 8.0" | bc -l) == 1 ) ]]; then - mvapich2_comp_env="$mvapich2_comp_env CFLAGS='-fPIC'" + if [[ ( "$ID" == "rocky" ) || ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 8.0" | bc -l) == 1 ) ]]; then + if [[ ( $(echo "$VERSION_ID >= 9.0" | bc -l) == 1 ) ]]; then + mvapich2_comp_env="$mvapich2_comp_env CFLAGS=\"-fPIC -fcommon\"" + else + mvapich2_comp_env="$mvapich2_comp_env CFLAGS=\"-fPIC\"" + fi fi fi else @@ -524,9 +534,13 @@ mvapich2_comp_env='CC="gcc -m64" CXX="g++ -m64" F77="g77 -m64" FC="/bin/false"' else mvapich2_comp_env='CC=gcc CXX=g++ F77=g77 FC=/bin/false' - if [[ ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 8.0" | bc -l) == 1 ) ]]; then - mvapich2_comp_env="$mvapich2_comp_env CFLAGS='-fPIC'" - fi + if [[ ( "$ID" == "rocky" ) || ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 8.0" | bc -l) == 1 ) ]]; then + if [[ ( $(echo "$VERSION_ID >= 9.0" | bc -l) == 1 ) ]]; then + mvapich2_comp_env="$mvapich2_comp_env CFLAGS=\"-fPIC -fcommon\"" + else + mvapich2_comp_env="$mvapich2_comp_env CFLAGS=\"-fPIC\"" + fi + fi fi fi;; @@ -545,7 +559,7 @@ intel) disable_auto_requires="--define 'disable_auto_requires 1'" - if [ "$mvapich2_conf_shared_libs" = 1 ] + if [ "$mvapich2_conf_shared_libs" = 1 ] then mvapich2_comp_env='CC=icc CXX=icpc F77=ifort FC=ifort' else @@ -667,7 +681,7 @@ echo "error: mpitests_mvapich2_$compiler$mvapich2_rpm_suffix Build ERROR: bad exit code" exit 1 fi - + if [ "$iflag" = n ] then mv $RPM_DIR/RPMS/$target_cpu/mpitests_mvapich2_$compiler$mvapich2_rpm_suffix-$mpitests_fullversion.$target_cpu.rpm $DESTDIR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/do_openmpi_build.sh new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/do_openmpi_build.sh --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/do_openmpi_build.sh 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/do_openmpi_build.sh 2023-03-03 17:38:07.000000000 +0100 @@ -2,6 +2,7 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2022, Cornelis Networks # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -63,6 +64,8 @@ ID="" VERSION_ID="" +DEF_CONFIG_OPTIONS='--with-hwloc=internal --with-libevent=internal --with-pmix=internal' + if [ -e /etc/os-release ]; then . /etc/os-release if [[ "$ID" == "sle_hpc" ]]; then @@ -124,7 +127,7 @@ echo " VERSION is openmpi version (eg. 1.0.0)" >&2 echo " CONFIG_OPTIONS - additional OpenMPI configuration options to be" >&2 echo " specified via configure_options parameter to srpm" >&2 - echo " Default is ''" >&2 + echo " Default is '$DEF_CONFIG_OPTIONS'" >&2 echo " INSTALL_ROOT - location of system image in which to install." >&2 echo " Default is '/'" >&2 echo "" >&2 @@ -308,7 +311,7 @@ # if -d (skip_prompt) the only option provided, ./configure will run with # no paramters and build what is auto-detected -openmpi_conf_psm='' +openmpi_conf='' # we no longer supports verbs. openmpi_verbs='--enable-mca-no-build=btl-openib --without-verbs' @@ -316,7 +319,7 @@ if [ "$Qflag" = y ] then PREREQ+=('infinipath-psm-devel') - openmpi_conf_psm='--with-psm=/usr ' + openmpi_conf='--with-psm=/usr ' # PSM indicated by qlc suffix so user can ID PSM vs OFI or PSM2 MPIs openmpi_path_suffix="-qlc" openmpi_rpm_suffix="_qlc" @@ -326,7 +329,7 @@ if [ "$Oflag" = y ] then PREREQ+=('libpsm2-devel' 'libfabric-devel') - openmpi_conf_psm=" $openmpi_conf_psm --with-psm2=/usr --with-libfabric=/usr " + openmpi_conf=" $openmpi_conf --with-psm2=/usr --with-libfabric=/usr " # PSM2 indicated by hfi suffix so user can ID from PSM or OFI MPIs openmpi_path_suffix="-hfi" openmpi_rpm_suffix="_hfi" @@ -336,7 +339,7 @@ if [ "$Cflag" = y ] then PREREQ+=('libpsm2-devel' 'cuda-cudart-dev') - openmpi_conf_psm=" $openmpi_conf_psm --with-psm2=/usr --with-cuda=/usr/local/cuda " + openmpi_conf=" $openmpi_conf --with-psm2=/usr --with-cuda=/usr/local/cuda " # CUDA indicated by -cuda suffix so user can ID from PSM2 without cuda, PSM or OFI MPIs openmpi_path_suffix="-cuda-hfi" openmpi_rpm_suffix="_cuda_hfi" @@ -377,7 +380,7 @@ mpitests_version=$(ls $mpitests_srpm 2>/dev/null|head -1|cut -f2 -d-) mpitests_fullversion=$(ls $mpitests_srpm 2>/dev/null|head -1|cut -f2- -d-|sed -e 's/.src.rpm//') MPICH_PREFIX=${MPICH_PREFIX:-$STACK_PREFIX/mpi/$compiler/openmpi-$openmpi_version$openmpi_path_suffix} - CONFIG_OPTIONS=${CONFIG_OPTIONS:-""} + CONFIG_OPTIONS=${CONFIG_OPTIONS:-${DEF_CONFIG_OPTIONS}} if [ x"$openmpi_version" = x"" ] then @@ -437,7 +440,7 @@ case "$compiler" in gcc) - if [[ ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 8.0" | bc -l) == 1 ) ]]; then + if [[ ( "$ID" == "rocky" ) || ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 8.0" | bc -l) == 1 ) ]]; then openmpi_comp_env="$openmpi_comp_env CC=gcc CFLAGS=\"-O3 -fPIC\"" else openmpi_comp_env="$openmpi_comp_env CC=gcc CFLAGS=-O3" @@ -453,9 +456,9 @@ openmpi_comp_env="$openmpi_comp_env F77=gfortran FC=gfortran" elif have_comp g77 then - openmpi_comp_env="$openmpi_comp_env F77=g77 --disable-mpi-f90" + openmpi_comp_env="$openmpi_comp_env F77=g77 " else - openmpi_comp_env="$openmpi_comp_env --disable-mpi-f77 --disable-mpi-f90" + openmpi_comp_env="$openmpi_comp_env --disable-mpi-fortran" fi;; pathscale) @@ -471,7 +474,7 @@ then openmpi_comp_env="$openmpi_comp_env F77=pathf90 FC=pathf90" else - openmpi_comp_env="$openmpi_comp_env --disable-mpi-f77 --disable-mpi-f90" + openmpi_comp_env="$openmpi_comp_env --disable-mpi-fortran" fi # test for fedora core 6 or redhat EL5 if { [ -f /etc/fedora-release ] && { uname -r|grep fc6; }; } \ @@ -496,13 +499,13 @@ then openmpi_comp_env="$openmpi_comp_env F77=pgf77" else - openmpi_comp_env="$openmpi_comp_env --disable-mpi-f77" + openmpi_comp_env="$openmpi_comp_env --disable-mpi-fortran" fi if have_comp pgf90 then openmpi_comp_env="$openmpi_comp_env FC=pgf90 FCFLAGS=-O2" else - openmpi_comp_env="$openmpi_comp_env --disable-mpi-f90" + openmpi_comp_env="$openmpi_comp_env --disable-mpi-fortran" fi;; intel) @@ -518,7 +521,7 @@ then openmpi_comp_env="$openmpi_comp_env F77=ifort FC=ifort" else - openmpi_comp_env="$openmpi_comp_env --disable-mpi-f77 --disable-mpi-f90" + openmpi_comp_env="$openmpi_comp_env --disable-mpi-fortran" fi;; *) @@ -565,7 +568,7 @@ --define '_defaultdocdir $MPICH_PREFIX/doc/..' \ --define '_mandir %{_prefix}/share/man' \ --define 'mflags -j 4' \ - --define 'configure_options $CONFIG_OPTIONS $openmpi_ldflags $openmpi_comp_env $openmpi_conf_psm --with-devel-headers --disable-oshmem $openmpi_verbs' \ + --define 'configure_options $CONFIG_OPTIONS $openmpi_ldflags $openmpi_comp_env $openmpi_conf --with-devel-headers --disable-oshmem $openmpi_verbs' \ --define 'use_default_rpm_opt_flags $use_default_rpm_opt_flags' \ $disable_auto_requires" cmd="$cmd \ @@ -604,6 +607,7 @@ echo "Building test programs $mpitests_version for OpenMPI MPI $openmpi_version..." # mpitests uses buildroot instead of build_root, play it safe for future # and define both + export LD_LIBRARY_PATH=$MPICH_PREFIX/lib64:$LD_LIBRARY_PATH cmd="$pref_env rpmbuild --rebuild \ --define '_topdir $RPM_DIR' \ --buildroot '$BUILD_ROOT' \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/main_omnipathwrap_delta.pl new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/main_omnipathwrap_delta.pl --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/main_omnipathwrap_delta.pl 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/main_omnipathwrap_delta.pl 2023-03-03 17:38:07.000000000 +0100 @@ -108,6 +108,8 @@ @OmniPathAllComponents ); my @Components_rhel86 = ( "opa_stack", "mpi_selector", @OmniPathAllComponents ); +my @Components_rhel9 = ( "opa_stack", "mpi_selector", + @OmniPathAllComponents ); @Components = ( ); @@ -224,7 +226,7 @@ Hidden => 0, Disabled => 0, IsOFA => 0, KernelRpms => [ ], FirmwareRpms => [ ], - UserRpms => [ "opa-basic-tools", "opa-address-resolution" ], + UserRpms => [ "opa-basic-tools", "opa-address-resolution", "opa-address-resolution-devel" ], DebugRpms => [ ], HasStart => 1, HasFirmware => 0, DefaultStart => 0, StartPreReq => " opa_stack ", # TBD @@ -254,7 +256,7 @@ Hidden => 0, Disabled => 0, IsOFA => 0, KernelRpms => [ ], FirmwareRpms => [ ], - UserRpms => [ "opa-fastfabric", "opa-mpi-apps" ], + UserRpms => [ "opa-fastfabric", "opa-mpi-apps", "opa-snapconfig" ], DebugRpms => [ ], HasStart => 0, HasFirmware => 0, DefaultStart => 0, StartPreReq => " opa_stack ", @@ -1075,6 +1077,36 @@ }, ); +my %intel_hfi_rhel9_comp_info = ( + "intel_hfi" => { Name => "Cornelis HFI Components", + DefaultInstall => $State_Install, + SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"), + PreReq => " opa_stack ", CoReq => " oftools ", + # TBD - HasFirmware - FW update + Hidden => 0, Disabled => 0, IsOFA => 1, + KernelRpms => [ ], + FirmwareRpms => [ + "hfi1-firmware", "hfi1-firmware_debug" + ], + UserRpms => [ #"libhfi1", "libhfi1-static", + "libpsm2", + "libpsm2-devel", "libpsm2-compat", + "libfabric", "libfabric-devel", + "libfabric-psm2", "libfabric-verbs", + "hfi1-diagtools-sw", "hfidiags", + ], + DebugRpms => [ #"hfi1_debuginfo", + "hfi1-diagtools-sw-debuginfo", + "libpsm2-debuginfo", #"libhfi1-debuginfo" + ], + HasStart => 1, HasFirmware => 0, DefaultStart => 1, + StartPreReq => " opa_stack ", + StartComponents => [ "intel_hfi" ], + StartupScript => "", + StartupParams => [ ] + }, +); + # For SLES12sp3 that has different name for libpsm2 my %intel_hfi_sles123_comp_info = ( "intel_hfi" => { Name => "Cornelis HFI Components", @@ -1477,6 +1509,14 @@ %opa_stack_dev_comp_info, %opa_stack_rhel_comp_info, ); + } elsif ( "$CUR_VENDOR_VER" eq "ES9" ) { + @Components = ( @Components_rhel9 ); + @SubComponents = ( @SubComponents_newer ); + %ComponentInfo = ( %ComponentInfo, %ibacm_comp_info, + %intel_hfi_rhel85_comp_info, + %opa_stack_dev_comp_info, + %opa_stack_rhel_comp_info, + ); } elsif ( "$CUR_VENDOR_VER" eq "ES15" ) { @Components = ( @Components_sles15 ); @SubComponents = ( @SubComponents_newer ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/overrides_delta.pl new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/overrides_delta.pl --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/CommonInstall/overrides_delta.pl 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/CommonInstall/overrides_delta.pl 2023-03-03 17:38:07.000000000 +0100 @@ -111,6 +111,10 @@ "opa_stack_dev", "delta_ipoib", "delta_debug", ); +my @delta_Components_rhel9 = ( "opa_stack", "mpi_selector", "intel_hfi", + "opa_stack_dev", + "delta_ipoib", + "delta_debug", ); my @delta_Components_sles15 = ( "opa_stack", "intel_hfi", "opa_stack_dev", "delta_ipoib", @@ -179,6 +183,8 @@ @Components = ( @delta_Components_rhel85 ); } elsif ( "$CUR_VENDOR_VER" eq "ES86" ) { @Components = ( @delta_Components_rhel86 ); + } elsif ( "$CUR_VENDOR_VER" eq "ES9" ) { + @Components = ( @delta_Components_rhel9 ); } elsif ( "$CUR_VENDOR_VER" eq "ES15" ) { @Components = ( @delta_Components_sles15 ); } elsif ( "$CUR_VENDOR_VER" eq "ES151" ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/Esm/Makefile.linux new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/Esm/Makefile.linux --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/Esm/Makefile.linux 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/Esm/Makefile.linux 2023-03-03 17:38:07.000000000 +0100 @@ -143,6 +143,9 @@ ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES86" PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL86.pl endif +ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES9" + PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL9.pl +endif ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES123" PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_SLES123.pl endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/Esm/build.env new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/Esm/build.env --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/Esm/build.env 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/Esm/build.env 2023-03-03 17:38:07.000000000 +0100 @@ -1,6 +1,6 @@ # Adjust the environment variables if necessary export PRODUCT=VIEO_HOST -export RELEASE_TAG=10_11_2_0_3 +export RELEASE_TAG=10_12_1_0_6 export BUILD_CONFIG=${BUILD_CONFIG:-"release"} export BUILD_WITH_STACK=OPENIB export LDENVFS= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/Esm/build_label new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/Esm/build_label --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/Esm/build_label 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/Esm/build_label 2023-03-03 17:38:07.000000000 +0100 @@ -1 +1 @@ -Build of VIEO_HOST 08/29/22 12:13 Tag: VIEO_HOST_LINUX_opa-10_11_10_11_2_0_3 +Build of VIEO_HOST 12/01/22 16:53 Tag: VIEO_HOST_LINUX_opa-10_12_10_12_1_0_6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/Esm/ib/src/config/fm_xml.c new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/Esm/ib/src/config/fm_xml.c --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/Esm/ib/src/config/fm_xml.c 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/Esm/ib/src/config/fm_xml.c 2023-03-03 17:38:07.000000000 +0100 @@ -4685,13 +4685,6 @@ "or PA Service ID configured in an Application", cfgtype, vfip->name); goto fail; } - // make sure that either All or AllMgmtAllowed is included in Admin fabric - this rule was added - // to make sure IBTA works for PR112665 - if (!is_all_or_allmgmt_full) { - RENDER_VF_LOGGER(printError, "%s: VF(%s) must have <Select>All</Select> or <Select>AllMgmtAllowed</Select> configured in a Member", - cfgtype, vfip->name); - goto fail; - } } else if (vfip->apps.select_sa || checkVFSID(vfip, STL_PM_SERVICE_ID) || vfip->apps.select_pm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/Esm/ib/src/smi/sa/sa_McMemberRecord.c new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/Esm/ib/src/smi/sa/sa_McMemberRecord.c --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/Esm/ib/src/smi/sa/sa_McMemberRecord.c 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/Esm/ib/src/smi/sa/sa_McMemberRecord.c 2023-03-03 17:38:07.000000000 +0100 @@ -1119,17 +1119,6 @@ goto done; } - if (VirtualFabrics != NULL && VirtualFabrics->securityEnabled && - bitset_test_intersection(&mcGroup->vfMembers, &req_portp->portData->fullPKeyMember) == 0) { - maip->base.status = MAD_STATUS_SA_REQ_INVALID; - IB_LOG_ERROR_FMT_VF( vfp, __func__, "Failing group join request for PortGUID "FMT_U64 - " from %s Port %d, PortGUID "FMT_U64", LID 0x%08X because it is not a full member of virtual fabric with MGid "FMT_GID, - portp->portData->guid, - req_nodeName, req_portp->index, req_portp->portData->guid, - maip->addrInfo.slid, mGid[0], mGid[1]); - goto done; - } - mcmp->MLID = mcGroup->mLid; mcmp->MtuSelector = IB_SELECTOR_EQ; mcmp->Mtu = mcGroup->mtu; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/Esm/ib/src/smi/sm/sm_partMgr.c new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/Esm/ib/src/smi/sm/sm_partMgr.c --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/Esm/ib/src/smi/sm/sm_partMgr.c 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/Esm/ib/src/smi/sm/sm_partMgr.c 2023-03-03 17:38:07.000000000 +0100 @@ -418,6 +418,17 @@ SmpAddr_t addr = SMP_ADDR_CREATE_LR(sm_lid, lidportp->portData->lid); + /* Sanity Check, Make sure at least Default Pkey(s) are present */ + if (nodep->nodeInfo.NodeType == STL_NODE_SW) { + if (portp->portData->pPKey[STL_DEFAULT_CLIENT_PKEY_IDX].AsReg16 == 0) + portp->portData->pPKey[STL_DEFAULT_CLIENT_PKEY_IDX].AsReg16 = STL_DEFAULT_CLIENT_PKEY; + if (portp->portData->pPKey[STL_DEFAULT_FM_PKEY_IDX].AsReg16 == 0) + portp->portData->pPKey[STL_DEFAULT_FM_PKEY_IDX].AsReg16 = STL_DEFAULT_FM_PKEY; + } else if (portp->portData->pPKey[STL_DEFAULT_CLIENT_PKEY_IDX].AsReg16 == 0 && + portp->portData->pPKey[STL_DEFAULT_FM_PKEY_IDX].AsReg16 == 0) { + portp->portData->pPKey[STL_DEFAULT_CLIENT_PKEY_IDX].AsReg16 = STL_DEFAULT_CLIENT_PKEY; + } + status = SM_Set_PKeyTable_Dispatch(fd_topology, amod, &addr, (STL_PARTITION_TABLE *)portp->portData->pPKey, sm_config.mkey, nodep, &sm_asyncDispatch, sm_set_delayed_pkeys_callback, ctx); @@ -612,8 +623,14 @@ } if (SendUpdateNow) { - /* Sanity Check, Make sure at least one Default Pkey is present */ - if (pkeyTable[STL_DEFAULT_CLIENT_PKEY_IDX].AsReg16 == 0 && pkeyTable[STL_DEFAULT_FM_PKEY_IDX].AsReg16 == 0) { + /* Sanity Check, Make sure at least Default Pkey(s) are present */ + if (nodep->nodeInfo.NodeType == STL_NODE_SW) { + if (pkeyTable[STL_DEFAULT_CLIENT_PKEY_IDX].AsReg16 == 0) + pkeyTable[STL_DEFAULT_CLIENT_PKEY_IDX].AsReg16 = STL_DEFAULT_CLIENT_PKEY; + if (pkeyTable[STL_DEFAULT_FM_PKEY_IDX].AsReg16 == 0) + pkeyTable[STL_DEFAULT_FM_PKEY_IDX].AsReg16 = STL_DEFAULT_FM_PKEY; + } else if (pkeyTable[STL_DEFAULT_CLIENT_PKEY_IDX].AsReg16 == 0 && + pkeyTable[STL_DEFAULT_FM_PKEY_IDX].AsReg16 == 0) { pkeyTable[STL_DEFAULT_CLIENT_PKEY_IDX].AsReg16 = STL_DEFAULT_CLIENT_PKEY; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/MakeTools/patch_version/README.md new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/MakeTools/patch_version/README.md --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/MakeTools/patch_version/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/MakeTools/patch_version/README.md 2023-03-03 17:38:07.000000000 +0100 @@ -0,0 +1,60 @@ +# Building and modifying patch_brand tool + +## Where patch_brand normally exists: +``` +$ which patch_brand +/usr/local/ics/bin/patch_brand +``` + +## Usage for patch_brand: +``` +$ patch_brand -h +patch_brand: invalid option -- 'h' +Usage: patch_brand [-m marker] brand [file ...] +``` + +## How embedded build runs patch_brand: +This line in Makerules/Maketargets.bsp is run: +`$(PATCH_BRAND) "$(BUILD_BRAND)" $(EXECUTABLE)` +It will appear as follows in the capture build output for embedded: +`$ patch_brand "" build.STL1.q7.release/STL1.q7` +Note: The empty brand string tells patch_brand, aka, patch_version.c, to use DEFAULT_BRAND. + +## How to tell if the file has the default brand of Intel: +``` +grep Intel <ifs-all-dir>/STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 +Binary file ../STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 matches +``` + +## How to build patch_version by itself (make your changes in opa-dev branch only): +``` +cd MakeTools/patch_version/ +target linux +setrel +setver ##choose 1 (which is probably the default Linux that was booted) +export PROJ_FILE_DIR=OpenIb_Host +make +``` +You will find patch_brand executable in your current directory. + +## How to run patch_version to test your change: +`./patch_brand ââ <ifs-all-dir>/STL1_Firmware/Firmware/build.release*/STL1.q7` +For example: +``` +./patch_brand "" ~/HEAD-10_8/ifs-all/STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 +Patching /home/usrinivasan/HEAD-10_8/ifs-all/STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 with brand 'Cornelis' +``` + +## How to tell if the file has the default brand of Cornelis: +`grep Cornelis <ifs-all-dir>/STL1_Firmware/Firmware/build.release*/STL1.q7` +For example: +``` +grep "THIS_IS_THE_ICS_BRAND:Cornelis" /home/usrinivasan/HEAD-10_8/ifs-all/STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 +Binary file /home/usrinivasan/HEAD-10_8/ifs-all/STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 matches +``` +## Finally, verify that a grep for Intel yields nothing. +`grep "THIS_IS_THE_ICS_BRAND:Intel" <ifs-all-dir>/STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 + + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/MakeTools/patch_version/patch_version.c new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/MakeTools/patch_version/patch_version.c --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/MakeTools/patch_version/patch_version.c 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/MakeTools/patch_version/patch_version.c 2023-03-03 17:38:07.000000000 +0100 @@ -8,6 +8,7 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** Copyright (c) 2015-2020, Intel Corporation +Copyright (c) 2021, Cornelis Networks, Inc. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -67,7 +68,7 @@ patch_brand brand [file ...] @param release_tag - version tag of the form R#_#M#P#I# or R#_#A#I# or R#_#B#I# -@param brand - a branding string such as "Intel" +@param brand - a branding string such as "Cornelis Networks" @param file - object/exe file(s) to place the #.#.#.# style version string in If no files are specified, the program merely performs the simpler behaviour of outputing the #.#.#.# @@ -107,7 +108,7 @@ return(version); } - #define ICS_BUILD_BRAND "THIS_IS_THE_ICS_BRAND:Intel\000 " + #define ICS_BUILD_BRAND "THIS_IS_THE_ICS_BRAND:Cornelis Networks\000 " const char* GetCodeBrand(void) { static const char* BuildBrand=ICS_BUILD_BRAND; @@ -142,8 +143,8 @@ #define ICS_BUILD_VERSION "THIS_IS_THE_ICS_VERSION_NUMBER:@(#)000.000.000.000B000" #define ICS_BUILD_INTERNAL_VERSION "THIS_IS_THE_ICS_INTERNAL_VERSION_NUMBER:@(#)000.000.000.000B000I0000" -#define ICS_BUILD_BRAND "THIS_IS_THE_ICS_BRAND:Intel\000 " -#define DEFAULT_BRAND "Intel" +#define ICS_BUILD_BRAND "THIS_IS_THE_ICS_BRAND:Cornelis\000 " +#define DEFAULT_BRAND "Cornelis" typedef enum { B_FALSE=0, B_TRUE } boolean; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/opa-fm-10.11.2.0.3.0.3bee63ead16a/opa-fm.spec.in new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/opa-fm.spec.in --- old/opa-fm-10.11.2.0.3.0.3bee63ead16a/opa-fm.spec.in 2022-09-09 21:45:42.000000000 +0200 +++ new/opa-fm-10.12.1.0.6.0.6f1eb4579fc9/opa-fm.spec.in 2023-03-03 17:38:07.000000000 +0100 @@ -29,7 +29,7 @@ #[ICS VERSION STRING: unknown] Name: opa-fm -Version: 10.11.2.0 +Version: 10.12.1.0 Release: 3%{?dist} %if 0%{?rhel} Epoch: 1 @@ -62,7 +62,7 @@ The %{name} contains Intel Omni-Path fabric management applications. This includes: the Subnet Manager, Baseboard Manager, Performance Manager, Fabric Executive, and some fabric management tools. -IFSComponent: FM 10.11.2.0.3%{?dist} +IFSComponent: FM 10.12.1.0.6%{?dist} %prep %setup -q -c
